diff --git a/lib/gfortran/libxmlparse.a b/lib/gfortran/libxmlparse.a
index cfca15b4b1..50253851db 100644
Binary files a/lib/gfortran/libxmlparse.a and b/lib/gfortran/libxmlparse.a differ
diff --git a/lib/gfortran/read_xml_primitives.mod b/lib/gfortran/read_xml_primitives.mod
index 7c1db22bdf..687f88ce7a 100644
--- a/lib/gfortran/read_xml_primitives.mod
+++ b/lib/gfortran/read_xml_primitives.mod
@@ -1,5 +1,5 @@
-GFORTRAN module version '4' created from read_xml_primitives.f90 on Mon Aug 29 09:02:14 2011
-MD5:235b0d14c80f92b943d08f5cd7a2fcd9 -- If you edit this, you'll get what you deserve.
+GFORTRAN module version '4' created from read_xml_primitives.f90 on Sun Sep 11 13:20:50 2011
+MD5:3e005ad2b49de84dd8e5e80665ca0d86 -- If you edit this, you'll get what you deserve.
 
 (() () () () () () () () () () () () () () () () () () () () () () ()
 () () () ())
@@ -213,163 +213,163 @@ ASSUMED_SHAPE (CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () ()
 DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
 64 'has_var' '' 'has_var' 55 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN
 UNKNOWN 0 0 DUMMY) (LOGICAL 4 0 0 LOGICAL ()) 0 0 () () 0 () () () 0 0)
-234 'info' '' 'info' 233 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
+237 'info' '' 'info' 236 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
 DUMMY) (DERIVED 269 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
-231 'info' '' 'info' 230 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0
-0 DUMMY) (DERIVED 269 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
-242 'name' '' 'name' 239 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () ()
-0 0)
-243 'value' '' 'value' 239 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN UNKNOWN 0 0 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0
-() () () 0 0)
-248 'endtag' '' 'endtag' 245 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-0 0 DUMMY) (LOGICAL 4 0 0 LOGICAL ()) 0 0 () () 0 () () () 0 0)
 249 'attribs' '' 'attribs' 245 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN
 UNKNOWN 0 0 DIMENSION DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () (2
 ASSUMED_SHAPE (CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') () (CONSTANT (
 INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-247 'tag' '' 'tag' 245 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
+248 'endtag' '' 'endtag' 245 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
+0 0 DUMMY) (LOGICAL 4 0 0 LOGICAL ()) 0 0 () () 0 () () () 0 0)
 251 'data' '' 'data' 245 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
 DIMENSION DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () (1
 ASSUMED_SHAPE (CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () ()
 0 0)
 252 'no_data' '' 'no_data' 245 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN
 UNKNOWN 0 0 DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-265 'no_data_truncation' '' 'no_data_truncation' 262 ((VARIABLE IN
-UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 OPTIONAL DUMMY) (LOGICAL 4 0 0 LOGICAL
-()) 0 0 () () 0 () () () 0 0)
-267 'report_errors' '' 'report_errors' 262 ((VARIABLE IN UNKNOWN-PROC
-UNKNOWN UNKNOWN 0 0 OPTIONAL DUMMY) (LOGICAL 4 0 0 LOGICAL ()) 0 0 () ()
-0 () () () 0 0)
-266 'report_lun' '' 'report_lun' 262 ((VARIABLE IN UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0 OPTIONAL DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () ()
-() 0 0)
-268 'report_details' '' 'report_details' 262 ((VARIABLE IN UNKNOWN-PROC
-UNKNOWN UNKNOWN 0 0 OPTIONAL DUMMY) (LOGICAL 4 0 0 LOGICAL ()) 0 0 () ()
-0 () () () 0 0)
-264 'ignore_whitespace' '' 'ignore_whitespace' 262 ((VARIABLE IN
-UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 OPTIONAL DUMMY) (LOGICAL 4 0 0 LOGICAL
-()) 0 0 () () 0 () () () 0 0)
 260 'mustread' '' 'mustread' 257 ((VARIABLE IN UNKNOWN-PROC UNKNOWN
 UNKNOWN 0 0 DUMMY) (LOGICAL 4 0 0 LOGICAL ()) 0 0 () () 0 () () () 0 0)
 259 'fname' '' 'fname' 257 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0
 0 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
+258 'info' '' 'info' 257 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
+DUMMY) (DERIVED 269 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
 250 'no_attribs' '' 'no_attribs' 245 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN
 UNKNOWN 0 0 DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-241 'no_attribs' '' 'no_attribs' 239 ((VARIABLE UNKNOWN-INTENT
-UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 ()
-() 0 () () () 0 0)
-286 'datafunc' '' 'datafunc' 281 ((PROCEDURE UNKNOWN-INTENT DUMMY-PROC
-BODY UNKNOWN 0 0 DUMMY SUBROUTINE RECURSIVE ALWAYS_EXPLICIT) (UNKNOWN 0
-0 0 UNKNOWN ()) 304 0 (305 306 307) () 0 () () () 0 0)
-285 'startfunc' '' 'startfunc' 281 ((PROCEDURE UNKNOWN-INTENT DUMMY-PROC
-BODY UNKNOWN 0 0 DUMMY SUBROUTINE RECURSIVE ALWAYS_EXPLICIT) (UNKNOWN 0
-0 0 UNKNOWN ()) 308 0 (309 310 311) () 0 () () () 0 0)
-287 'endfunc' '' 'endfunc' 281 ((PROCEDURE UNKNOWN-INTENT DUMMY-PROC
-BODY UNKNOWN 0 0 DUMMY SUBROUTINE RECURSIVE) (UNKNOWN 0 0 0 UNKNOWN ())
-312 0 (313 314) () 0 () () () 0 0)
-288 'lunrep' '' 'lunrep' 281 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN UNKNOWN 0 0 DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () ()
-() 0 0)
-284 'data' '' 'data' 281 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0 DIMENSION DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () (1
-ASSUMED_SHAPE (CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () ()
-0 0)
-289 'error' '' 'error' 281 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN UNKNOWN 0 0 DUMMY) (LOGICAL 4 0 0 LOGICAL ()) 0 0 () () 0 () ()
+243 'value' '' 'value' 239 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
+UNKNOWN UNKNOWN 0 0 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0
+() () () 0 0)
+266 'report_lun' '' 'report_lun' 262 ((VARIABLE IN UNKNOWN-PROC UNKNOWN
+UNKNOWN 0 0 OPTIONAL DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () ()
 () 0 0)
+267 'report_errors' '' 'report_errors' 262 ((VARIABLE IN UNKNOWN-PROC
+UNKNOWN UNKNOWN 0 0 OPTIONAL DUMMY) (LOGICAL 4 0 0 LOGICAL ()) 0 0 () ()
+0 () () () 0 0)
+265 'no_data_truncation' '' 'no_data_truncation' 262 ((VARIABLE IN
+UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 OPTIONAL DUMMY) (LOGICAL 4 0 0 LOGICAL
+()) 0 0 () () 0 () () () 0 0)
+264 'ignore_whitespace' '' 'ignore_whitespace' 262 ((VARIABLE IN
+UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 OPTIONAL DUMMY) (LOGICAL 4 0 0 LOGICAL
+()) 0 0 () () 0 () () () 0 0)
 283 'attribs' '' 'attribs' 281 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
 UNKNOWN UNKNOWN 0 0 DIMENSION DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0
 0 () (2 ASSUMED_SHAPE (CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') () (
 CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-293 'tag' '' 'tag' 291 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
+282 'filename' '' 'filename' 281 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
+UNKNOWN UNKNOWN 0 0 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0
+() () () 0 0)
+268 'report_details' '' 'report_details' 262 ((VARIABLE IN UNKNOWN-PROC
+UNKNOWN UNKNOWN 0 0 OPTIONAL DUMMY) (LOGICAL 4 0 0 LOGICAL ()) 0 0 () ()
+0 () () () 0 0)
+285 'startfunc' '' 'startfunc' 281 ((PROCEDURE UNKNOWN-INTENT DUMMY-PROC
+BODY UNKNOWN 0 0 DUMMY SUBROUTINE RECURSIVE ALWAYS_EXPLICIT) (UNKNOWN 0
+0 0 UNKNOWN ()) 304 0 (305 306 307) () 0 () () () 0 0)
+284 'data' '' 'data' 281 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
+UNKNOWN 0 0 DIMENSION DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () (1
+ASSUMED_SHAPE (CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () ()
+0 0)
+287 'endfunc' '' 'endfunc' 281 ((PROCEDURE UNKNOWN-INTENT DUMMY-PROC
+BODY UNKNOWN 0 0 DUMMY SUBROUTINE RECURSIVE) (UNKNOWN 0 0 0 UNKNOWN ())
+308 0 (309 310) () 0 () () () 0 0)
+289 'error' '' 'error' 281 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
+UNKNOWN UNKNOWN 0 0 DUMMY) (LOGICAL 4 0 0 LOGICAL ()) 0 0 () () 0 () ()
+() 0 0)
 292 'info' '' 'info' 291 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0
 0 DUMMY) (DERIVED 269 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
-297 'no_data' '' 'no_data' 291 ((VARIABLE IN UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0 DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
+288 'lunrep' '' 'lunrep' 281 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
+UNKNOWN UNKNOWN 0 0 DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () ()
+() 0 0)
+286 'datafunc' '' 'datafunc' 281 ((PROCEDURE UNKNOWN-INTENT DUMMY-PROC
+BODY UNKNOWN 0 0 DUMMY SUBROUTINE RECURSIVE ALWAYS_EXPLICIT) (UNKNOWN 0
+0 0 UNKNOWN ()) 311 0 (312 313 314) () 0 () () () 0 0)
+263 'info' '' 'info' 262 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0
+0 DUMMY) (DERIVED 269 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
 296 'data' '' 'data' 291 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
 DIMENSION DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () (1
 ASSUMED_SHAPE (CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () ()
 0 0)
+295 'no_attribs' '' 'no_attribs' 291 ((VARIABLE IN UNKNOWN-PROC UNKNOWN
+UNKNOWN 0 0 DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
+297 'no_data' '' 'no_data' 291 ((VARIABLE IN UNKNOWN-PROC UNKNOWN
+UNKNOWN 0 0 DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
 298 'type' '' 'type' 291 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
 UNKNOWN 0 0 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () ()
 0 0)
-295 'no_attribs' '' 'no_attribs' 291 ((VARIABLE IN UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0 DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
+301 'text' '' 'text' 299 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
+DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
+300 'info' '' 'info' 299 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
+DUMMY) (DERIVED 269 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
 9 'int' '' 'int' 7 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
 (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
 8 'text' '' 'text' 7 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
-301 'text' '' 'text' 299 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
+294 'attribs' '' 'attribs' 291 ((VARIABLE IN UNKNOWN-PROC UNKNOWN
+UNKNOWN 0 0 DIMENSION DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () (2
+ASSUMED_SHAPE (CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') () (CONSTANT (
+INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
 11 'text' '' 'text' 10 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
-14 'text' '' 'text' 13 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
+12 'string' '' 'string' 10 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0
+0 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
+293 'tag' '' 'tag' 291 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
-18 'text' '' 'text' 17 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
-16 'lineno' '' 'lineno' 13 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0
-0 OPTIONAL DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
 15 'int' '' 'int' 13 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
 DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
+14 'text' '' 'text' 13 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
+DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
 20 'lineno' '' 'lineno' 17 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0
 0 OPTIONAL DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
 19 'string' '' 'string' 17 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0
 0 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
-309 'tag' '' 'tag' 308 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
+18 'text' '' 'text' 17 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
+DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
+305 'tag' '' 'tag' 304 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
 UNKNOWN 0 0 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () ()
 0 0)
-12 'string' '' 'string' 10 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0
-0 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
-311 'error' '' 'error' 308 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN UNKNOWN 0 0 DUMMY) (LOGICAL 4 0 0 LOGICAL ()) 0 0 () () 0 () ()
-() 0 0)
-310 'attribs' '' 'attribs' 308 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN UNKNOWN 0 0 DIMENSION DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0
-0 () (2 ASSUMED_SHAPE (CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') () (
-CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-305 'tag' '' 'tag' 304 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
+312 'tag' '' 'tag' 311 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
 UNKNOWN 0 0 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () ()
 0 0)
 307 'error' '' 'error' 304 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
 UNKNOWN UNKNOWN 0 0 DUMMY) (LOGICAL 4 0 0 LOGICAL ()) 0 0 () () 0 () ()
 () 0 0)
-306 'data' '' 'data' 304 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
+314 'error' '' 'error' 311 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
+UNKNOWN UNKNOWN 0 0 DUMMY) (LOGICAL 4 0 0 LOGICAL ()) 0 0 () () 0 () ()
+() 0 0)
+310 'error' '' 'error' 308 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
+UNKNOWN UNKNOWN 0 0 DUMMY) (LOGICAL 4 0 0 LOGICAL ()) 0 0 () () 0 () ()
+() 0 0)
+309 'tag' '' 'tag' 308 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
+UNKNOWN 0 0 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () ()
+0 0)
+313 'data' '' 'data' 311 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
 UNKNOWN 0 0 DIMENSION DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () (1
 ASSUMED_SHAPE (CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () ()
 0 0)
-314 'error' '' 'error' 312 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN UNKNOWN 0 0 DUMMY) (LOGICAL 4 0 0 LOGICAL ()) 0 0 () () 0 () ()
-() 0 0)
-313 'tag' '' 'tag' 312 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () ()
-0 0)
-300 'info' '' 'info' 299 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (DERIVED 269 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
-294 'attribs' '' 'attribs' 291 ((VARIABLE IN UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0 DIMENSION DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () (2
-ASSUMED_SHAPE (CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') () (CONSTANT (
-INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-237 'info' '' 'info' 236 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
+306 'attribs' '' 'attribs' 304 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
+UNKNOWN UNKNOWN 0 0 DIMENSION DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0
+0 () (2 ASSUMED_SHAPE (CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') () (
+CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
+16 'lineno' '' 'lineno' 13 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0
+0 OPTIONAL DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
+231 'info' '' 'info' 230 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0
+0 DUMMY) (DERIVED 269 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
+234 'info' '' 'info' 233 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
 DUMMY) (DERIVED 269 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
 240 'attribs' '' 'attribs' 239 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
 UNKNOWN UNKNOWN 0 0 DIMENSION DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0
 0 () (2 ASSUMED_SHAPE (CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') () (
 CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
+242 'name' '' 'name' 239 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
+UNKNOWN 0 0 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () ()
+0 0)
+241 'no_attribs' '' 'no_attribs' 239 ((VARIABLE UNKNOWN-INTENT
+UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 ()
+() 0 () () () 0 0)
 246 'info' '' 'info' 245 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0
 0 DUMMY) (DERIVED 269 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
+247 'tag' '' 'tag' 245 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
+DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
 255 'info' '' 'info' 254 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
 DUMMY) (DERIVED 269 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
-258 'info' '' 'info' 257 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (DERIVED 269 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
-263 'info' '' 'info' 262 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0
-0 DUMMY) (DERIVED 269 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
-282 'filename' '' 'filename' 281 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN UNKNOWN 0 0 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0
-() () () 0 0)
 89 'info' '' 'info' 88 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
 DUMMY) (DERIVED 269 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
 90 'tag' '' 'tag' 88 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
diff --git a/lib/gfortran/write_xml_primitives.mod b/lib/gfortran/write_xml_primitives.mod
index 84f8f8c6e1..738008e258 100644
--- a/lib/gfortran/write_xml_primitives.mod
+++ b/lib/gfortran/write_xml_primitives.mod
@@ -1,5 +1,5 @@
-GFORTRAN module version '4' created from write_xml_primitives.f90 on Mon Aug 29 09:02:15 2011
-MD5:48dd6f881d713a003c12a48e5069f15b -- If you edit this, you'll get what you deserve.
+GFORTRAN module version '4' created from write_xml_primitives.f90 on Sun Sep 11 13:20:51 2011
+MD5:37de84621905a4407a25775206b414e5 -- If you edit this, you'll get what you deserve.
 
 (() () () () () () () () () () () () () () () () () () () () () () ()
 () () () ())
@@ -190,134 +190,163 @@ DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
 0 DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
 88 'value' '' 'value' 84 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
 DUMMY) (REAL 4 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-131 'info' '' 'info' 130 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
+134 'info' '' 'info' 133 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
 DUMMY) (DERIVED 166 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
-128 'info' '' 'info' 127 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0
-0 DUMMY) (DERIVED 166 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
-139 'name' '' 'name' 136 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () ()
-0 0)
-140 'value' '' 'value' 136 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN UNKNOWN 0 0 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0
-() () () 0 0)
-145 'endtag' '' 'endtag' 142 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-0 0 DUMMY) (LOGICAL 4 0 0 LOGICAL ()) 0 0 () () 0 () () () 0 0)
 146 'attribs' '' 'attribs' 142 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN
 UNKNOWN 0 0 DIMENSION DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () (2
 ASSUMED_SHAPE (CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') () (CONSTANT (
 INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-144 'tag' '' 'tag' 142 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
+145 'endtag' '' 'endtag' 142 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
+0 0 DUMMY) (LOGICAL 4 0 0 LOGICAL ()) 0 0 () () 0 () () () 0 0)
 148 'data' '' 'data' 142 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
 DIMENSION DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () (1
 ASSUMED_SHAPE (CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () ()
 0 0)
 149 'no_data' '' 'no_data' 142 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN
 UNKNOWN 0 0 DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-162 'no_data_truncation' '' 'no_data_truncation' 159 ((VARIABLE IN
-UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 OPTIONAL DUMMY) (LOGICAL 4 0 0 LOGICAL
-()) 0 0 () () 0 () () () 0 0)
-164 'report_errors' '' 'report_errors' 159 ((VARIABLE IN UNKNOWN-PROC
-UNKNOWN UNKNOWN 0 0 OPTIONAL DUMMY) (LOGICAL 4 0 0 LOGICAL ()) 0 0 () ()
-0 () () () 0 0)
-163 'report_lun' '' 'report_lun' 159 ((VARIABLE IN UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0 OPTIONAL DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () ()
-() 0 0)
-165 'report_details' '' 'report_details' 159 ((VARIABLE IN UNKNOWN-PROC
-UNKNOWN UNKNOWN 0 0 OPTIONAL DUMMY) (LOGICAL 4 0 0 LOGICAL ()) 0 0 () ()
-0 () () () 0 0)
-161 'ignore_whitespace' '' 'ignore_whitespace' 159 ((VARIABLE IN
-UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 OPTIONAL DUMMY) (LOGICAL 4 0 0 LOGICAL
-()) 0 0 () () 0 () () () 0 0)
 157 'mustread' '' 'mustread' 154 ((VARIABLE IN UNKNOWN-PROC UNKNOWN
 UNKNOWN 0 0 DUMMY) (LOGICAL 4 0 0 LOGICAL ()) 0 0 () () 0 () () () 0 0)
 156 'fname' '' 'fname' 154 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0
 0 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
+155 'info' '' 'info' 154 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
+DUMMY) (DERIVED 166 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
 147 'no_attribs' '' 'no_attribs' 142 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN
 UNKNOWN 0 0 DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-138 'no_attribs' '' 'no_attribs' 136 ((VARIABLE UNKNOWN-INTENT
-UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 ()
-() 0 () () () 0 0)
-183 'datafunc' '' 'datafunc' 178 ((PROCEDURE UNKNOWN-INTENT DUMMY-PROC
-BODY UNKNOWN 0 0 DUMMY SUBROUTINE RECURSIVE ALWAYS_EXPLICIT) (UNKNOWN 0
-0 0 UNKNOWN ()) 201 0 (202 203 204) () 0 () () () 0 0)
-182 'startfunc' '' 'startfunc' 178 ((PROCEDURE UNKNOWN-INTENT DUMMY-PROC
-BODY UNKNOWN 0 0 DUMMY SUBROUTINE RECURSIVE ALWAYS_EXPLICIT) (UNKNOWN 0
-0 0 UNKNOWN ()) 205 0 (206 207 208) () 0 () () () 0 0)
-184 'endfunc' '' 'endfunc' 178 ((PROCEDURE UNKNOWN-INTENT DUMMY-PROC
-BODY UNKNOWN 0 0 DUMMY SUBROUTINE RECURSIVE) (UNKNOWN 0 0 0 UNKNOWN ())
-209 0 (210 211) () 0 () () () 0 0)
-185 'lunrep' '' 'lunrep' 178 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN UNKNOWN 0 0 DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () ()
-() 0 0)
-181 'data' '' 'data' 178 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0 DIMENSION DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () (1
-ASSUMED_SHAPE (CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () ()
-0 0)
-186 'error' '' 'error' 178 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN UNKNOWN 0 0 DUMMY) (LOGICAL 4 0 0 LOGICAL ()) 0 0 () () 0 () ()
+140 'value' '' 'value' 136 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
+UNKNOWN UNKNOWN 0 0 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0
+() () () 0 0)
+163 'report_lun' '' 'report_lun' 159 ((VARIABLE IN UNKNOWN-PROC UNKNOWN
+UNKNOWN 0 0 OPTIONAL DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () ()
 () 0 0)
+164 'report_errors' '' 'report_errors' 159 ((VARIABLE IN UNKNOWN-PROC
+UNKNOWN UNKNOWN 0 0 OPTIONAL DUMMY) (LOGICAL 4 0 0 LOGICAL ()) 0 0 () ()
+0 () () () 0 0)
+162 'no_data_truncation' '' 'no_data_truncation' 159 ((VARIABLE IN
+UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 OPTIONAL DUMMY) (LOGICAL 4 0 0 LOGICAL
+()) 0 0 () () 0 () () () 0 0)
+161 'ignore_whitespace' '' 'ignore_whitespace' 159 ((VARIABLE IN
+UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 OPTIONAL DUMMY) (LOGICAL 4 0 0 LOGICAL
+()) 0 0 () () 0 () () () 0 0)
 180 'attribs' '' 'attribs' 178 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
 UNKNOWN UNKNOWN 0 0 DIMENSION DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0
 0 () (2 ASSUMED_SHAPE (CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') () (
 CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-190 'tag' '' 'tag' 188 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
+179 'filename' '' 'filename' 178 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
+UNKNOWN UNKNOWN 0 0 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0
+() () () 0 0)
+165 'report_details' '' 'report_details' 159 ((VARIABLE IN UNKNOWN-PROC
+UNKNOWN UNKNOWN 0 0 OPTIONAL DUMMY) (LOGICAL 4 0 0 LOGICAL ()) 0 0 () ()
+0 () () () 0 0)
+182 'startfunc' '' 'startfunc' 178 ((PROCEDURE UNKNOWN-INTENT DUMMY-PROC
+BODY UNKNOWN 0 0 DUMMY SUBROUTINE RECURSIVE ALWAYS_EXPLICIT) (UNKNOWN 0
+0 0 UNKNOWN ()) 201 0 (202 203 204) () 0 () () () 0 0)
+184 'endfunc' '' 'endfunc' 178 ((PROCEDURE UNKNOWN-INTENT DUMMY-PROC
+BODY UNKNOWN 0 0 DUMMY SUBROUTINE RECURSIVE) (UNKNOWN 0 0 0 UNKNOWN ())
+205 0 (206 207) () 0 () () () 0 0)
+186 'error' '' 'error' 178 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
+UNKNOWN UNKNOWN 0 0 DUMMY) (LOGICAL 4 0 0 LOGICAL ()) 0 0 () () 0 () ()
+() 0 0)
 189 'info' '' 'info' 188 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0
 0 DUMMY) (DERIVED 166 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
-194 'no_data' '' 'no_data' 188 ((VARIABLE IN UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0 DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
+185 'lunrep' '' 'lunrep' 178 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
+UNKNOWN UNKNOWN 0 0 DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () ()
+() 0 0)
+183 'datafunc' '' 'datafunc' 178 ((PROCEDURE UNKNOWN-INTENT DUMMY-PROC
+BODY UNKNOWN 0 0 DUMMY SUBROUTINE RECURSIVE ALWAYS_EXPLICIT) (UNKNOWN 0
+0 0 UNKNOWN ()) 208 0 (209 210 211) () 0 () () () 0 0)
+160 'info' '' 'info' 159 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0
+0 DUMMY) (DERIVED 166 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
 193 'data' '' 'data' 188 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
 DIMENSION DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () (1
 ASSUMED_SHAPE (CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () ()
 0 0)
+192 'no_attribs' '' 'no_attribs' 188 ((VARIABLE IN UNKNOWN-PROC UNKNOWN
+UNKNOWN 0 0 DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
+194 'no_data' '' 'no_data' 188 ((VARIABLE IN UNKNOWN-PROC UNKNOWN
+UNKNOWN 0 0 DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
 195 'type' '' 'type' 188 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
 UNKNOWN 0 0 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () ()
 0 0)
-192 'no_attribs' '' 'no_attribs' 188 ((VARIABLE IN UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0 DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
+198 'text' '' 'text' 196 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
+DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
+197 'info' '' 'info' 196 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
+DUMMY) (DERIVED 166 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
 10 'int' '' 'int' 8 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY)
 (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
 9 'text' '' 'text' 8 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
-198 'text' '' 'text' 196 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
+191 'attribs' '' 'attribs' 188 ((VARIABLE IN UNKNOWN-PROC UNKNOWN
+UNKNOWN 0 0 DIMENSION DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () (2
+ASSUMED_SHAPE (CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') () (CONSTANT (
+INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
 12 'text' '' 'text' 11 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
-15 'text' '' 'text' 14 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
+13 'string' '' 'string' 11 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0
+0 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
+190 'tag' '' 'tag' 188 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
-19 'text' '' 'text' 18 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
-17 'lineno' '' 'lineno' 14 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0
-0 OPTIONAL DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
 16 'int' '' 'int' 14 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
 DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
+15 'text' '' 'text' 14 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
+DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
 21 'lineno' '' 'lineno' 18 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0
 0 OPTIONAL DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
 20 'string' '' 'string' 18 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0
 0 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
-206 'tag' '' 'tag' 205 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
+19 'text' '' 'text' 18 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
+DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
+202 'tag' '' 'tag' 201 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
 UNKNOWN 0 0 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () ()
 0 0)
-13 'string' '' 'string' 11 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0
-0 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
-208 'error' '' 'error' 205 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN UNKNOWN 0 0 DUMMY) (LOGICAL 4 0 0 LOGICAL ()) 0 0 () () 0 () ()
-() 0 0)
-207 'attribs' '' 'attribs' 205 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN UNKNOWN 0 0 DIMENSION DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0
-0 () (2 ASSUMED_SHAPE (CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') () (
-CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-202 'tag' '' 'tag' 201 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
+209 'tag' '' 'tag' 208 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
 UNKNOWN 0 0 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () ()
 0 0)
 204 'error' '' 'error' 201 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
 UNKNOWN UNKNOWN 0 0 DUMMY) (LOGICAL 4 0 0 LOGICAL ()) 0 0 () () 0 () ()
 () 0 0)
-203 'data' '' 'data' 201 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0 DIMENSION DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () (1
-ASSUMED_SHAPE (CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () ()
-0 0)
+138 'no_attribs' '' 'no_attribs' 136 ((VARIABLE UNKNOWN-INTENT
+UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 ()
+() 0 () () () 0 0)
+143 'info' '' 'info' 142 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0
+0 DUMMY) (DERIVED 166 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
+144 'tag' '' 'tag' 142 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
+DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
+152 'info' '' 'info' 151 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
+DUMMY) (DERIVED 166 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
+91 'info' '' 'info' 90 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
+DUMMY) (DERIVED 166 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
+92 'tag' '' 'tag' 90 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
+DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
+93 'indent' '' 'indent' 90 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0
+0 DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
+94 'values' '' 'values' 90 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0
+0 DIMENSION DUMMY) (REAL 4 0 0 REAL ()) 0 0 () (1 ASSUMED_SHAPE (
+CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
+25 'info' '' 'info' 24 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
+DUMMY) (DERIVED 166 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
+26 'tag' '' 'tag' 24 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
+DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
+27 'indent' '' 'indent' 24 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0
+0 DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
+28 'value' '' 'value' 24 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
+DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
+31 'info' '' 'info' 30 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
+DUMMY) (DERIVED 166 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
+32 'tag' '' 'tag' 30 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
+DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
+33 'indent' '' 'indent' 30 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0
+0 DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
+34 'values' '' 'values' 30 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0
+0 DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 ASSUMED_SHAPE (
+CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
+102 'info' '' 'info' 101 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
+DUMMY) (DERIVED 166 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
+103 'tag' '' 'tag' 101 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
+DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
+104 'indent' '' 'indent' 101 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
+0 0 DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
+105 'value' '' 'value' 101 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0
+0 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
 114 'info' '' 'info' 113 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
 DUMMY) (DERIVED 166 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
 115 'tag' '' 'tag' 113 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
@@ -410,69 +439,40 @@ DUMMY) (DERIVED 166 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
 64 'array' '' 'array' 60 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
 DIMENSION DUMMY) (LOGICAL 4 0 0 LOGICAL ()) 0 0 () (1 ASSUMED_SHAPE (
 CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-211 'error' '' 'error' 209 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
+181 'data' '' 'data' 178 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
+UNKNOWN 0 0 DIMENSION DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () (1
+ASSUMED_SHAPE (CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () ()
+0 0)
+211 'error' '' 'error' 208 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
 UNKNOWN UNKNOWN 0 0 DUMMY) (LOGICAL 4 0 0 LOGICAL ()) 0 0 () () 0 () ()
 () 0 0)
-210 'tag' '' 'tag' 209 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
+207 'error' '' 'error' 205 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
+UNKNOWN UNKNOWN 0 0 DUMMY) (LOGICAL 4 0 0 LOGICAL ()) 0 0 () () 0 () ()
+() 0 0)
+206 'tag' '' 'tag' 205 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
 UNKNOWN 0 0 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () ()
 0 0)
-197 'info' '' 'info' 196 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (DERIVED 166 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
-191 'attribs' '' 'attribs' 188 ((VARIABLE IN UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0 DIMENSION DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () (2
-ASSUMED_SHAPE (CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') () (CONSTANT (
-INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-134 'info' '' 'info' 133 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
+210 'data' '' 'data' 208 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
+UNKNOWN 0 0 DIMENSION DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () (1
+ASSUMED_SHAPE (CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () ()
+0 0)
+203 'attribs' '' 'attribs' 201 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
+UNKNOWN UNKNOWN 0 0 DIMENSION DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0
+0 () (2 ASSUMED_SHAPE (CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') () (
+CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
+17 'lineno' '' 'lineno' 14 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0
+0 OPTIONAL DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
+128 'info' '' 'info' 127 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0
+0 DUMMY) (DERIVED 166 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
+131 'info' '' 'info' 130 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
 DUMMY) (DERIVED 166 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
 137 'attribs' '' 'attribs' 136 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
 UNKNOWN UNKNOWN 0 0 DIMENSION DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0
 0 () (2 ASSUMED_SHAPE (CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') () (
 CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-143 'info' '' 'info' 142 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0
-0 DUMMY) (DERIVED 166 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
-152 'info' '' 'info' 151 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (DERIVED 166 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
-155 'info' '' 'info' 154 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (DERIVED 166 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
-160 'info' '' 'info' 159 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0
-0 DUMMY) (DERIVED 166 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
-179 'filename' '' 'filename' 178 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN UNKNOWN 0 0 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0
-() () () 0 0)
-91 'info' '' 'info' 90 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (DERIVED 166 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
-92 'tag' '' 'tag' 90 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
-93 'indent' '' 'indent' 90 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0
-0 DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-94 'values' '' 'values' 90 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0
-0 DIMENSION DUMMY) (REAL 4 0 0 REAL ()) 0 0 () (1 ASSUMED_SHAPE (
-CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-25 'info' '' 'info' 24 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (DERIVED 166 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
-26 'tag' '' 'tag' 24 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
-27 'indent' '' 'indent' 24 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0
-0 DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-28 'value' '' 'value' 24 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (REAL 8 0 0 REAL ()) 0 0 () () 0 () () () 0 0)
-31 'info' '' 'info' 30 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (DERIVED 166 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
-32 'tag' '' 'tag' 30 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
-33 'indent' '' 'indent' 30 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0
-0 DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-34 'values' '' 'values' 30 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0
-0 DIMENSION DUMMY) (REAL 8 0 0 REAL ()) 0 0 () (1 ASSUMED_SHAPE (
-CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-102 'info' '' 'info' 101 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (DERIVED 166 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
-103 'tag' '' 'tag' 101 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
-104 'indent' '' 'indent' 101 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-0 0 DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-105 'value' '' 'value' 101 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0
-0 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
+139 'name' '' 'name' 136 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
+UNKNOWN 0 0 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () ()
+0 0)
 )
 
 ('reshape' 0 22 'write_to_xml_double' 0 23 'write_to_xml_double_1dim' 0
diff --git a/lib/gfortran/xmlparse.mod b/lib/gfortran/xmlparse.mod
index c2b67a6330..eed1dab200 100644
--- a/lib/gfortran/xmlparse.mod
+++ b/lib/gfortran/xmlparse.mod
@@ -1,5 +1,5 @@
-GFORTRAN module version '4' created from xmlparse.f90 on Mon Aug 29 09:02:13 2011
-MD5:392e8ac05d894165a1260dd33194e88b -- If you edit this, you'll get what you deserve.
+GFORTRAN module version '4' created from xmlparse.f90 on Sun Sep 11 13:20:49 2011
+MD5:655e28c1e6643240ddb018161f15a54a -- If you edit this, you'll get what you deserve.
 
 (() () () () () () () () () () () () () () () () () () () () () () () ()
 () () ())
@@ -98,6 +98,55 @@ ALWAYS_EXPLICIT) (UNKNOWN 0 0 0 UNKNOWN ()) 90 0 (91 92 93) () 0 () () ()
 (PROCEDURE UNKNOWN-INTENT MODULE-PROC DECL UNKNOWN 0 0 SUBROUTINE
 ALWAYS_EXPLICIT) (UNKNOWN 0 0 0 UNKNOWN ()) 94 0 (95 96 97) () 0 () () ()
 0 0)
+85 'text' '' 'text' 84 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
+DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
+86 'int' '' 'int' 84 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
+DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
+39 'fname' '' 'fname' 37 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
+DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
+40 'mustread' '' 'mustread' 37 ((VARIABLE IN UNKNOWN-PROC UNKNOWN
+UNKNOWN 0 0 DUMMY) (LOGICAL 4 0 0 LOGICAL ()) 0 0 () () 0 () () () 0 0)
+11 'info' '' 'info' 10 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
+DUMMY) (DERIVED 49 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
+26 'info' '' 'info' 25 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
+DUMMY) (DERIVED 49 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
+27 'tag' '' 'tag' 25 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
+DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
+28 'endtag' '' 'endtag' 25 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0
+0 DUMMY) (LOGICAL 4 0 0 LOGICAL ()) 0 0 () () 0 () () () 0 0)
+29 'attribs' '' 'attribs' 25 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
+0 0 DIMENSION DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () (2
+ASSUMED_SHAPE (CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') () (CONSTANT (
+INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
+30 'no_attribs' '' 'no_attribs' 25 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN
+UNKNOWN 0 0 DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
+31 'data' '' 'data' 25 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
+DIMENSION DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () (1
+ASSUMED_SHAPE (CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () ()
+0 0)
+32 'no_data' '' 'no_data' 25 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
+0 0 DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
+72 'info' '' 'info' 71 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
+DUMMY) (DERIVED 49 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
+73 'tag' '' 'tag' 71 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
+DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
+74 'attribs' '' 'attribs' 71 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
+0 0 DIMENSION DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () (2
+ASSUMED_SHAPE (CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') () (CONSTANT (
+INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
+75 'no_attribs' '' 'no_attribs' 71 ((VARIABLE IN UNKNOWN-PROC UNKNOWN
+UNKNOWN 0 0 DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
+76 'data' '' 'data' 71 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
+DIMENSION DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () (1
+ASSUMED_SHAPE (CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () ()
+0 0)
+77 'no_data' '' 'no_data' 71 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
+0 0 DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
+78 'type' '' 'type' 71 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
+UNKNOWN 0 0 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () ()
+0 0)
+43 'info' '' 'info' 42 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
+DUMMY) (DERIVED 49 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
 44 'ignore_whitespace' '' 'ignore_whitespace' 42 ((VARIABLE IN
 UNKNOWN-PROC UNKNOWN UNKNOWN 0 0 OPTIONAL DUMMY) (LOGICAL 4 0 0 LOGICAL
 ()) 0 0 () () 0 () () () 0 0)
@@ -160,10 +209,10 @@ UNKNOWN 0 0 DUMMY) (LOGICAL 4 0 0 LOGICAL ()) 0 0 () () 0 () () () 0 0)
 99 'tag' '' 'tag' 98 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
 UNKNOWN 0 0 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () ()
 0 0)
-85 'text' '' 'text' 84 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
-86 'int' '' 'int' 84 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
+100 'attribs' '' 'attribs' 98 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
+UNKNOWN UNKNOWN 0 0 DIMENSION DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0
+0 () (2 ASSUMED_SHAPE (CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') () (
+CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
 88 'text' '' 'text' 87 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
 89 'string' '' 'string' 87 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0
@@ -186,55 +235,6 @@ DUMMY) (DERIVED 49 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
 38 'info' '' 'info' 37 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
 DUMMY) (DERIVED 49 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
-39 'fname' '' 'fname' 37 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
-40 'mustread' '' 'mustread' 37 ((VARIABLE IN UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0 DUMMY) (LOGICAL 4 0 0 LOGICAL ()) 0 0 () () 0 () () () 0 0)
-11 'info' '' 'info' 10 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (DERIVED 49 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
-26 'info' '' 'info' 25 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (DERIVED 49 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
-27 'tag' '' 'tag' 25 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
-28 'endtag' '' 'endtag' 25 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0
-0 DUMMY) (LOGICAL 4 0 0 LOGICAL ()) 0 0 () () 0 () () () 0 0)
-29 'attribs' '' 'attribs' 25 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-0 0 DIMENSION DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () (2
-ASSUMED_SHAPE (CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') () (CONSTANT (
-INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-30 'no_attribs' '' 'no_attribs' 25 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0 DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-31 'data' '' 'data' 25 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () (1
-ASSUMED_SHAPE (CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () ()
-0 0)
-32 'no_data' '' 'no_data' 25 ((VARIABLE OUT UNKNOWN-PROC UNKNOWN UNKNOWN
-0 0 DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-72 'info' '' 'info' 71 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (DERIVED 49 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
-73 'tag' '' 'tag' 71 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () () 0 0)
-74 'attribs' '' 'attribs' 71 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-0 0 DIMENSION DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () (2
-ASSUMED_SHAPE (CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') () (CONSTANT (
-INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
-75 'no_attribs' '' 'no_attribs' 71 ((VARIABLE IN UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0 DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-76 'data' '' 'data' 71 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DIMENSION DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () (1
-ASSUMED_SHAPE (CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () ()
-0 0)
-77 'no_data' '' 'no_data' 71 ((VARIABLE IN UNKNOWN-PROC UNKNOWN UNKNOWN
-0 0 DUMMY) (INTEGER 4 0 0 INTEGER ()) 0 0 () () 0 () () () 0 0)
-78 'type' '' 'type' 71 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
-UNKNOWN 0 0 DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0 0 () () 0 () () ()
-0 0)
-43 'info' '' 'info' 42 ((VARIABLE INOUT UNKNOWN-PROC UNKNOWN UNKNOWN 0 0
-DUMMY) (DERIVED 49 0 0 DERIVED ()) 0 0 () () 0 () () () 0 0)
-100 'attribs' '' 'attribs' 98 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC
-UNKNOWN UNKNOWN 0 0 DIMENSION DUMMY) (CHARACTER 1 0 0 CHARACTER (())) 0
-0 () (2 ASSUMED_SHAPE (CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') () (
-CONSTANT (INTEGER 4 0 0 INTEGER ()) 0 '1') ()) 0 () () () 0 0)
 101 'error' '' 'error' 98 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
 UNKNOWN 0 0 DUMMY) (LOGICAL 4 0 0 LOGICAL ()) 0 0 () () 0 () () () 0 0)
 103 'tag' '' 'tag' 102 ((VARIABLE UNKNOWN-INTENT UNKNOWN-PROC UNKNOWN
diff --git a/lib/intel/libxmlparse.a b/lib/intel/libxmlparse.a
index 5b7040359d..6025a8f656 100644
Binary files a/lib/intel/libxmlparse.a and b/lib/intel/libxmlparse.a differ
diff --git a/lib/intel/read_xml_primitives.mod b/lib/intel/read_xml_primitives.mod
index a20e738951..73af90dc2c 100644
Binary files a/lib/intel/read_xml_primitives.mod and b/lib/intel/read_xml_primitives.mod differ
diff --git a/lib/intel/write_xml_primitives.mod b/lib/intel/write_xml_primitives.mod
index b21f7cf1e6..3bba962372 100644
Binary files a/lib/intel/write_xml_primitives.mod and b/lib/intel/write_xml_primitives.mod differ
diff --git a/lib/intel/xmlparse.mod b/lib/intel/xmlparse.mod
index 3886401797..0467fec0e0 100644
Binary files a/lib/intel/xmlparse.mod and b/lib/intel/xmlparse.mod differ