Index: xmlregexp.c
===================================================================
RCS file: /cvs/gnome/gnome-xml/xmlregexp.c,v
retrieving revision 1.6
diff -c -r1.6 xmlregexp.c
*** xmlregexp.c	22 Apr 2002 16:01:17 -0000	1.6
--- xmlregexp.c	12 Sep 2002 15:59:55 -0000
***************
*** 740,746 ****
      }
  }
  
- #if 0
  static void
  xmlRegPrintCtxt(FILE *output, xmlRegParserCtxtPtr ctxt) {
      int i;
--- 740,745 ----
***************
*** 780,786 ****
  		                                ctxt->counters[i].max);
      }
  }
- #endif
  
  /************************************************************************
   * 									*
--- 779,784 ----
***************
*** 927,933 ****
      printf("Add trans from %d to %d ", state->no, target->no);
      if (count == REGEXP_ALL_COUNTER)
  	printf("all transition");
!     else (count >= 0)
  	printf("count based %d", count);
      else if (counter >= 0)
  	printf("counted %d", counter);
--- 925,931 ----
      printf("Add trans from %d to %d ", state->no, target->no);
      if (count == REGEXP_ALL_COUNTER)
  	printf("all transition");
!     else if (count >= 0)
  	printf("count based %d", count);
      else if (counter >= 0)
  	printf("counted %d", counter);
***************
*** 1389,1394 ****
--- 1387,1396 ----
      int i;
      int ret = 1;
  
+ #ifdef DEBUG_REGEXP_GRAPH
+     printf("xmlFAComputesDeterminism\n");
+     xmlRegPrintCtxt(stdout, ctxt);
+ #endif
      if (ctxt->determinist != -1)
  	return(ctxt->determinist);
  
Index: xmlschemas.c
===================================================================
RCS file: /cvs/gnome/gnome-xml/xmlschemas.c,v
retrieving revision 1.15
diff -c -r1.15 xmlschemas.c
*** xmlschemas.c	1 Jul 2002 21:52:01 -0000	1.15
--- xmlschemas.c	12 Sep 2002 15:59:56 -0000
***************
*** 3262,3281 ****
      start = ctxt->state = xmlAutomataGetInitState(ctxt->am);
      xmlSchemaBuildAContentModel(elem->subtypes, ctxt, name);
      xmlAutomataSetFinalState(ctxt->am, ctxt->state);
      if (!xmlAutomataIsDeterminist(ctxt->am)) {
  	xmlGenericError(xmlGenericErrorContext,
  			"Content model of %s is not determinist:\n", name);
- 	elem->contModel = xmlAutomataCompile(ctxt->am);
  	ctxt->err = XML_SCHEMAS_ERR_NOTDETERMINIST;
      } else {
- 	elem->contModel = xmlAutomataCompile(ctxt->am);
  #ifdef DEBUG_CONTENT
  	xmlGenericError(xmlGenericErrorContext,
  			"Content model of %s:\n", name);
  	xmlRegexpPrint(stderr, elem->contModel);
  #endif
      }
-     ctxt->state = NULL;
      xmlFreeAutomata(ctxt->am);
      ctxt->am = NULL;
  }
--- 3262,3281 ----
      start = ctxt->state = xmlAutomataGetInitState(ctxt->am);
      xmlSchemaBuildAContentModel(elem->subtypes, ctxt, name);
      xmlAutomataSetFinalState(ctxt->am, ctxt->state);
+     elem->contModel = xmlAutomataCompile(ctxt->am);
      if (!xmlAutomataIsDeterminist(ctxt->am)) {
  	xmlGenericError(xmlGenericErrorContext,
  			"Content model of %s is not determinist:\n", name);
  	ctxt->err = XML_SCHEMAS_ERR_NOTDETERMINIST;
+ 	ctxt->state = NULL;
      } else {
  #ifdef DEBUG_CONTENT
  	xmlGenericError(xmlGenericErrorContext,
  			"Content model of %s:\n", name);
  	xmlRegexpPrint(stderr, elem->contModel);
  #endif
+ 	ctxt->state = NULL;
      }
      xmlFreeAutomata(ctxt->am);
      ctxt->am = NULL;
  }