xerces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From knoa...@apache.org
Subject svn commit: r695572 - in /xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs: models/CMBuilder.java models/XS11AllCM.java traversers/XSDAbstractParticleTraverser.java traversers/XSDAbstractTraverser.java
Date Mon, 15 Sep 2008 18:29:29 GMT
Author: knoaman
Date: Mon Sep 15 11:29:28 2008
New Revision: 695572

URL: http://svn.apache.org/viewvc?rev=695572&view=rev
Log:
<all> model group changes:
- Allow wildcard as a member
- Allow maxOccurs > 1 on members 
- Apply open content during validation

Added:
    xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XS11AllCM.java
  (with props)
Modified:
    xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/CMBuilder.java
    xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractParticleTraverser.java
    xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java

Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/CMBuilder.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/CMBuilder.java?rev=695572&r1=695571&r2=695572&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/CMBuilder.java
(original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/CMBuilder.java
Mon Sep 15 11:29:28 2008
@@ -98,7 +98,12 @@
         XSCMValidator cmValidator = null;
         if (particle.fType == XSParticleDecl.PARTICLE_MODELGROUP &&
             ((XSModelGroupImpl)particle.fValue).fCompositor == XSModelGroupImpl.MODELGROUP_ALL)
{
-            cmValidator = createAllCM(particle);
+            if (fSchemaVersion < Constants.SCHEMA_VERSION_1_1) {
+                cmValidator = createAllCM(particle);
+            }
+            else {
+                cmValidator = createAll11CM(particle, (XSOpenContentDecl) typeDecl.getOpenContent());
+            }
         }
         else {
             cmValidator = createDFACM(particle, forUPA, (XSOpenContentDecl) typeDecl.getOpenContent());
@@ -133,6 +138,24 @@
         return allContent;
     }
 
+    XSCMValidator createAll11CM(XSParticleDecl particle, XSOpenContentDecl openContent) {
+        if (particle.fMaxOccurs == 0)
+            return null;
+
+        // get the model group, and add all children of it to the content model
+        XSModelGroupImpl group = (XSModelGroupImpl)particle.fValue;
+        // create an all content model. the parameter indicates whether
+        // the <all> itself is optional
+        XS11AllCM allContent = new XS11AllCM(particle.fMinOccurs == 0, group.fParticleCount,
openContent);
+        for (int i = 0; i < group.fParticleCount; i++) {
+            // add the element/wildcard decl to the all content model
+            XSParticleDecl groupParticle = group.fParticles[i];
+            allContent.addElement(groupParticle.fValue, groupParticle.fType,
+                group.fParticles[i].fMinOccurs, group.fParticles[i].fMaxOccurs);
+        }
+        return allContent;
+    }
+
     XSCMValidator createDFACM(XSParticleDecl particle, boolean forUPA, XSOpenContentDecl
openContent) {
         fLeafCount = 0;
         fParticleCount = 0;

Added: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XS11AllCM.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XS11AllCM.java?rev=695572&view=auto
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XS11AllCM.java
(added)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XS11AllCM.java
Mon Sep 15 11:29:28 2008
@@ -0,0 +1,326 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+
+package org.apache.xerces.impl.xs.models;
+
+import org.apache.xerces.xni.QName;
+import org.apache.xerces.impl.xs.XSElementDecl;
+import org.apache.xerces.impl.xs.SubstitutionGroupHandler;
+import org.apache.xerces.impl.xs.XMLSchemaException;
+import org.apache.xerces.impl.xs.XSConstraints;
+import org.apache.xerces.impl.xs.XSParticleDecl;
+import org.apache.xerces.impl.xs.XSWildcardDecl;
+import org.apache.xerces.impl.xs.XSOpenContentDecl;
+
+import java.util.Vector;
+
+/**
+ * XSAll11CM implements XSCMValidator and handles &lt;all&gt;.
+ *
+ * @xerces.internal
+ *
+ * @author Khaled Noaman, IBM
+ * @version $Id$
+ */
+public class XS11AllCM implements XSCMValidator {
+
+    //
+    // Constants
+    //
+
+    // start the content model: did not see any children
+    private static final short STATE_START = 0;
+    private static final short STATE_CHILD = 1;
+    private static final short STATE_SUFFIX = 2;
+
+    //
+    // Data
+    //
+    private boolean fHasOptionalContent = false;
+
+    private Object fAllDecls[];
+    private int fDeclsOccurs[];
+    private int fNumDecls = 0;
+    private int fNumElements = 0;
+
+    private XSOpenContentDecl fOpenContent = null;
+
+    //
+    // Constructors
+    //
+
+    public XS11AllCM (boolean hasOptionalContent, int size, XSOpenContentDecl openContent)
{
+        fHasOptionalContent = hasOptionalContent;
+        fAllDecls = new Object[size];
+        fDeclsOccurs = new int[size << 1];
+        fOpenContent = openContent;
+    }
+
+    public void addElement(Object element, int elementType, int minOccurs, int maxOccurs)
{
+        int occurenceStart;
+        if (elementType == XSParticleDecl.PARTICLE_ELEMENT) {
+            if (fNumDecls > fNumElements) {
+                for (int i = fNumDecls, j = i << 1; i > fNumElements; i--, j -=
2) {
+                    fAllDecls[i] = fAllDecls[i-1];
+                    fDeclsOccurs[j] = fDeclsOccurs[j - 2];
+                    fDeclsOccurs[j + 1] = fDeclsOccurs[j - 1];
+                }
+            }
+            occurenceStart = fNumElements << 1;
+            fAllDecls[fNumElements] = element;
+            fNumElements++;
+        }
+        else {
+            occurenceStart = fNumDecls << 1;
+            fAllDecls[fNumDecls] = element;
+        }
+
+        fDeclsOccurs[occurenceStart] = minOccurs;
+        fDeclsOccurs[occurenceStart + 1] = maxOccurs;
+        fNumDecls++;
+    }
+
+    //
+    // XSCMValidator methods
+    //
+
+    /**
+     * This methods to be called on entering a first element whose type
+     * has this content model. It will return the initial state of the
+     * content model
+     *
+     * @return Start state of the content model
+     */
+    public int[] startContentModel() {
+        int[] state = new int[fNumDecls + 1];
+        for (int i = 0; i <= fNumDecls; i++) {
+            state[i] = STATE_START;
+        }
+        return state;
+    }
+
+    // convinient method: when error occurs, to find a matching decl
+    // from the candidate elements.
+    Object findMatchingDecl(QName elementName, SubstitutionGroupHandler subGroupHandler)
{
+        Object matchingDecl = null;
+
+        for (int i = 0; i < fNumElements; i++) {
+            matchingDecl = subGroupHandler.getMatchingElemDecl(elementName, (XSElementDecl)fAllDecls[i]);
+            if (matchingDecl != null)
+                return matchingDecl;
+        }
+
+        for (int i = fNumElements; i < fNumDecls; i++) {
+            if (((XSWildcardDecl)fAllDecls[i]).allowQName(elementName)) {
+                matchingDecl = fAllDecls[i];
+                break;
+            }
+        }
+
+        return matchingDecl;
+    }
+
+    /**
+     * The method corresponds to one transition in the content model.
+     *
+     * @param elementName
+     * @param currentState  Current state
+     * @return an element decl object
+     */
+    public Object oneTransition (QName elementName, int[] currentState, SubstitutionGroupHandler
subGroupHandler) {
+        // error state
+        if (currentState[0] < 0) {
+            currentState[0] = XSCMValidator.SUBSEQUENT_ERROR;
+            return findMatchingDecl(elementName, subGroupHandler);
+        }
+
+        // open content - suffix mode
+        if (currentState[0] == STATE_SUFFIX) {
+            if (fOpenContent.fWildcard.allowQName(elementName)) {
+                return fOpenContent;
+            }
+            else { // error
+                currentState[0] = XSCMValidator.FIRST_ERROR;
+                return findMatchingDecl(elementName, subGroupHandler);
+            }
+        }
+
+        // seen child
+        currentState[0] = STATE_CHILD;
+
+        for (int i = 0; i < fNumElements; i++) {
+            int declMaxOccurs  = (i << 1) + 1;
+            if (currentState[i + 1] == fDeclsOccurs[declMaxOccurs]) {
+                continue;
+            }
+            Object matchingDecl = subGroupHandler.getMatchingElemDecl(elementName, (XSElementDecl)fAllDecls[i]);
+            if (matchingDecl != null) {
+                // found the decl, mark this element as "seen".
+                ++currentState[i + 1];
+                return matchingDecl;
+            }
+        }
+
+        for (int i = fNumElements; i < fNumDecls; i++) {
+            int declMaxOccurs = (i << 1) + 1;
+            if (currentState[i + 1] == fDeclsOccurs[declMaxOccurs]) {
+                continue;
+            }
+            if (((XSWildcardDecl)fAllDecls[i]).allowQName(elementName)) {
+                // found the decl, mark this element as "seen".
+                ++currentState[i + 1];
+                return fAllDecls[i];
+            }
+        }
+
+        // apply open content, if present
+        if (fOpenContent != null) {
+            if (fOpenContent.fMode == XSOpenContentDecl.MODE_SUFFIX) {
+                if (isFinal(currentState)) {
+                    currentState[0] = STATE_SUFFIX;
+                }
+                else {
+                    currentState[0] = XSCMValidator.FIRST_ERROR;
+                    return findMatchingDecl(elementName, subGroupHandler);
+                }
+            }
+            if (fOpenContent.fWildcard.allowQName(elementName)) {
+                return fOpenContent;
+            }
+        }
+
+        // couldn't find the decl, change to error state.
+        currentState[0] = XSCMValidator.FIRST_ERROR;
+        return findMatchingDecl(elementName, subGroupHandler);
+    }
+
+    /**
+     * The method indicates the end of list of children
+     *
+     * @param currentState  Current state of the content model
+     * @return true if the last state was a valid final state
+     */
+    public boolean endContentModel (int[] currentState) {
+        int state = currentState[0];
+
+        if (state == XSCMValidator.FIRST_ERROR || state == XSCMValidator.SUBSEQUENT_ERROR)
{
+            return false;
+        }
+
+        // If <all> has minOccurs of zero and there are
+        // no children to validate, it is trivially valid
+        //
+        // XML Schema 1.1
+        // reached final state and doing suffix validation against open content
+        if ((fHasOptionalContent && state == STATE_START) || state == STATE_SUFFIX)
{
+            return true;
+        }
+
+        for (int i = 0; i < fNumDecls; i++) {
+            // if one element is required, but not present, then error
+            if (currentState[i+1] < fDeclsOccurs[i << 1]) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * check whether this content violates UPA constraint.
+     *
+     * @param subGroupHandler the substitution group handler
+     * @return true if this content model contains other or list wildcard
+     */
+    public boolean checkUniqueParticleAttribution(SubstitutionGroupHandler subGroupHandler)
throws XMLSchemaException {
+        // check whether there is conflict between any two leaves
+        for (int i = 0; i < fNumElements; i++) {
+            for (int j = i+1; j < fNumElements; j++) {
+                // TODO: apply 1.1 rules
+                if (XSConstraints.overlapUPA((XSElementDecl)fAllDecls[i], (XSElementDecl)fAllDecls[j],
subGroupHandler)) {
+                    // REVISIT: do we want to report all errors? or just one?
+                    throw new XMLSchemaException("cos-nonambig", new Object[]{fAllDecls[i].toString(),
+                                                                              fAllDecls[j].toString()});
+                }
+            }
+        }
+        for (int i = fNumElements; i < fNumDecls; i++) {
+            for (int j = i+1; j < fNumDecls; j++) {
+                // TODO: apply 1.1 rules
+                if (XSConstraints.overlapUPA((XSWildcardDecl)fAllDecls[i], (XSWildcardDecl)fAllDecls[j]))
{
+                    // REVISIT: do we want to report all errors? or just one?
+                    throw new XMLSchemaException("cos-nonambig", new Object[]{fAllDecls[i].toString(),
+                                                                              fAllDecls[j].toString()});
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Check which elements are valid to appear at this point. This method also
+     * works if the state is in error, in which case it returns what should
+     * have been seen.
+     *
+     * @param state  the current state
+     * @return       a Vector whose entries are instances of
+     *               either XSWildcardDecl or XSElementDecl.
+     */
+    public Vector whatCanGoHere(int[] state) {
+        Vector ret = new Vector();
+
+        // handle element declarations
+        for (int i = 0; i < fNumElements; i++) {
+            // we only try to look for a matching decl if we have not seen
+            // this element yet or we have seen it less times than its maxOccurs.
+            if (state[i+1] == 0 || state[i+1] < fDeclsOccurs[(i << 1) + 1]) {
+                ret.addElement(fAllDecls[i]);
+            }
+        }
+
+        // only add wildcards if no element can be matched
+        if (ret.size() == 0) {
+            for (int i = fNumElements; i < fNumDecls; i++) {
+                if (state[i+1] == 0 || state[i+1] < fDeclsOccurs[(i << 1) + 1])
{
+                    ret.addElement(fAllDecls[i]);
+                }
+            }
+        }
+
+        // if 'ret' is empty and we have an open content, add the open content to 'ret'
+        if (ret.size() == 0 && fOpenContent != null) {
+            ret.add(fOpenContent);
+        }
+        return ret;
+    }
+
+    public boolean isCompactedForUPA() {
+        return false;
+    }
+
+    private boolean isFinal(int[] currentState) {
+        for (int i = 0; i < fNumDecls; i++) {
+            // if one element is required, but not present, then error
+            if (currentState[i+1] < fDeclsOccurs[i << 1]) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+} // class XSAll11CM

Propchange: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XS11AllCM.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XS11AllCM.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractParticleTraverser.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractParticleTraverser.java?rev=695572&r1=695571&r2=695572&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractParticleTraverser.java
(original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractParticleTraverser.java
Mon Sep 15 11:29:28 2008
@@ -17,6 +17,7 @@
 
 package org.apache.xerces.impl.xs.traversers;
 
+import org.apache.xerces.impl.Constants;
 import org.apache.xerces.impl.xs.SchemaGrammar;
 import org.apache.xerces.impl.xs.SchemaSymbols;
 import org.apache.xerces.impl.xs.XSAnnotationImpl;
@@ -91,8 +92,15 @@
                 particle = fSchemaHandler.fElementTraverser.traverseLocal(child, schemaDoc,
grammar, PROCESSING_ALL_EL, parent);
             }
             else {
-                Object[] args = {"all", "(annotation?, element*)", DOMUtil.getLocalName(child)};
-                reportSchemaError("s4s-elt-must-match.1", args, child);
+            	// XML Schema 1.1 - allow wildcard
+                if (fSchemaHandler.fSchemaVersion == Constants.SCHEMA_VERSION_1_1 &&
+                    childName.equals(SchemaSymbols.ELT_ANY)) {
+                    particle = fSchemaHandler.fWildCardTraverser.traverseAny(child, schemaDoc,
grammar);
+                }
+                else {
+                    Object[] args = {"all", "(annotation?, element*)", DOMUtil.getLocalName(child)};
+                    reportSchemaError("s4s-elt-must-match.1", args, child);
+                }
             }
             
             if (particle != null)

Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java?rev=695572&r1=695571&r2=695572&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java
(original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java
Mon Sep 15 11:29:28 2008
@@ -19,6 +19,7 @@
 
 import java.util.Vector;
 
+import org.apache.xerces.impl.Constants;
 import org.apache.xerces.impl.dv.InvalidDatatypeValueException;
 import org.apache.xerces.impl.dv.XSFacets;
 import org.apache.xerces.impl.dv.XSSimpleType;
@@ -791,7 +792,8 @@
         // reference a <group> whose model group is an all model group,
         // minOccurs and maxOccurs must be one.
         if (processingAllEl) {
-            if (max != 1) {
+        	// XML Schema 1.1 - maxOccurs can have a value > 1
+            if (max != 1 && fSchemaHandler.fSchemaVersion != Constants.SCHEMA_VERSION_1_1)
{
                 reportSchemaError("cos-all-limited.2", new Object[]{new Integer(max),
                         ((XSElementDecl)particle.fValue).getName()}, parent);
                 max = 1;



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org


Mime
View raw message