Roll libxml to 8effcb578e0590cc01bbcab0f9dccefc6bdbcdbd

third_party/libxml/src/xmlregexp.c

 /*
  * regexp.c: generic and extensible Regular Expression engine
  *
  * Basically designed with the purpose of compiling regexps for
  * the variety of validation/shemas mechanisms now available in
  * XML related specifications these include:
  *    - XML-1.0 DTD validation
  *    - XML Schemas structure part 1
  *    - XML Schemas Datatypes part 2 especially Appendix F
  *    - RELAX-NG/TREX i.e. the counter proposal
@@ skipping 1526 matching lines @@
  * @from:  the from state
  * @to:  the target state or NULL for building a new one
  * @atom:  the atom generating the transition
  *
  * Returns 0 if success and -1 in case of error.
  */
 static int
 xmlFAGenerateTransitions(xmlRegParserCtxtPtr ctxt, xmlRegStatePtr from,
                          xmlRegStatePtr to, xmlRegAtomPtr atom) {
     xmlRegStatePtr end;
+    int nullable = 0;
 
     if (atom == NULL) {
         ERROR("genrate transition: atom == NULL");
         return(-1);
     }
     if (atom->type == XML_REGEXP_SUBREG) {
         /*
          * this is a subexpression handling one should not need to
          * create a new node except for XML_REGEXP_QUANT_RANGE.
          */
@@ skipping 166 matching lines @@
             xmlRegStatePush(ctxt, tmp);
         else {
             return(-1);
         }
         xmlFAGenerateEpsilonTransition(ctxt, tmp, to);
         to = tmp;
     }
     if (xmlRegAtomPush(ctxt, atom) < 0) {
         return(-1);
     }
+    if ((atom->quant == XML_REGEXP_QUANT_RANGE) &&
+        (atom->min == 0) && (atom->max > 0)) {
+        nullable = 1;
+        atom->min = 1;
+        if (atom->max == 1)
+            atom->quant = XML_REGEXP_QUANT_OPT;
+    }
     xmlRegStateAddTrans(ctxt, from, atom, to, -1, -1);
     ctxt->state = end;
     switch (atom->quant) {
         case XML_REGEXP_QUANT_OPT:
             atom->quant = XML_REGEXP_QUANT_ONCE;
             xmlFAGenerateEpsilonTransition(ctxt, from, to);
             break;
         case XML_REGEXP_QUANT_MULT:
             atom->quant = XML_REGEXP_QUANT_ONCE;
             xmlFAGenerateEpsilonTransition(ctxt, from, to);
             xmlRegStateAddTrans(ctxt, to, atom, to, -1, -1);
             break;
         case XML_REGEXP_QUANT_PLUS:
             atom->quant = XML_REGEXP_QUANT_ONCE;
             xmlRegStateAddTrans(ctxt, to, atom, to, -1, -1);
             break;
         case XML_REGEXP_QUANT_RANGE:
-#if DV_test
-            if (atom->min == 0) {
+            if (nullable)
                 xmlFAGenerateEpsilonTransition(ctxt, from, to);
-            }
-#endif
             break;
         default:
             break;
     }
     return(0);
 }
 
 /**
  * xmlFAReduceEpsilonTransitions:
  * @ctxt:  a regexp parser context
@@ skipping 4573 matching lines @@
     int maxNodes;
     const char *expr;
     const char *cur;
     int nb_cons;
     int tabSize;
 };
 
 /**
  * xmlExpNewCtxt:
  * @maxNodes:  the maximum number of nodes
- * @dict:  optional dictionnary to use internally
+ * @dict:  optional dictionary to use internally
  *
  * Creates a new context for manipulating expressions
  *
  * Returns the context or NULL in case of error
  */
 xmlExpCtxtPtr
 xmlExpNewCtxt(int maxNodes, xmlDictPtr dict) {
     xmlExpCtxtPtr ret;
     int size = 256;
 
@@ skipping 838 matching lines @@
  */
 xmlExpNodePtr
 xmlExpStringDerive(xmlExpCtxtPtr ctxt, xmlExpNodePtr exp,
                    const xmlChar *str, int len) {
     const xmlChar *input;
 
     if ((exp == NULL) || (ctxt == NULL) || (str == NULL)) {
         return(NULL);
     }
     /*
-     * check the string is in the dictionnary, if yes use an interned
+     * check the string is in the dictionary, if yes use an interned
      * copy, otherwise we know it's not an acceptable input
      */
     input = xmlDictExists(ctxt->dict, str, len);
     if (input == NULL) {
         return(forbiddenExp);
     }
     return(xmlExpStringDeriveInt(ctxt, exp, input));
 }
 
 static int
@@ skipping 940 matching lines @@
 xmlExpCtxtNbCons(xmlExpCtxtPtr ctxt) {
     if (ctxt == NULL)
         return(-1);
     return(ctxt->nb_cons);
 }
 
 #endif /* LIBXML_EXPR_ENABLED */
 #define bottom_xmlregexp
 #include "elfgcchack.h"
 #endif /* LIBXML_REGEXP_ENABLED */