You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by ne...@apache.org on 2001/10/04 18:06:09 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/impl/v2 XSAllCM.java CMBuilder.java
neilg 01/10/04 09:06:09
Modified: java/src/org/apache/xerces/impl/v2 CMBuilder.java
Added: java/src/org/apache/xerces/impl/v2 XSAllCM.java
Log:
implementation of allContentModel, largely thanks to Pavani Mukthipudi <pa...@sun.com>.
Revision Changes Path
1.8 +65 -8 xml-xerces/java/src/org/apache/xerces/impl/v2/CMBuilder.java
Index: CMBuilder.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/CMBuilder.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CMBuilder.java 2001/10/01 19:42:14 1.7
+++ CMBuilder.java 2001/10/04 16:06:09 1.8
@@ -64,7 +64,7 @@
* This class constructs content models for a given grammar.
*
* @author Elena Litani, IBM
- * @version $Id: CMBuilder.java,v 1.7 2001/10/01 19:42:14 elena Exp $
+ * @version $Id: CMBuilder.java,v 1.8 2001/10/04 16:06:09 neilg Exp $
*/
public class CMBuilder {
@@ -235,12 +235,14 @@
}
else if (isMixed) {
if (type ==XSParticleDecl.PARTICLE_ALL) {
- // REVISIT:
// All the nodes under an ALL must be additional ALL nodes and
// ELEMENTs (or ELEMENTs under ZERO_OR_ONE nodes.)
// We collapse the ELEMENTs into a single vector.
+ XSAllCM allContent = new XSAllCM(false);
+ gatherAllLeaves ((XSParticleDecl)(particle.fValue), allContent);
+ gatherAllLeaves ((XSParticleDecl)(particle.fOtherValue), allContent);
+ return allContent;
-
}
else if (type == XSParticleDecl.PARTICLE_ZERO_OR_ONE) {
XSParticleDecl left = (XSParticleDecl)particle.fValue;
@@ -248,10 +250,9 @@
// An ALL node can appear under a ZERO_OR_ONE node.
if (type ==XSParticleDecl.PARTICLE_ALL) {
- // REVISIT:
- //AllContentModel allContent = new AllContentModel(true,true);
- //gatherAllLeaves(zeroOrOneChildIndex, contentSpec,
- // allContent);
+ XSAllCM allContent = new XSAllCM(true);
+ gatherAllLeaves (left, allContent);
+ return allContent;
}
}
@@ -295,6 +296,16 @@
}
}
+ else if (type == XSParticleDecl.PARTICLE_ALL) {
+
+ XSParticleDecl left = (XSParticleDecl)particle.fValue;
+ XSParticleDecl right = (XSParticleDecl)particle.fOtherValue;
+
+ XSAllCM allContent = new XSAllCM(false);
+ gatherAllLeaves (left, allContent);
+ gatherAllLeaves (right, allContent);
+ return allContent;
+ }
else if ((type == XSParticleDecl.PARTICLE_ZERO_OR_ONE)
|| (type == XSParticleDecl.PARTICLE_ZERO_OR_MORE)
|| (type == XSParticleDecl.PARTICLE_ONE_OR_MORE)) {
@@ -313,7 +324,9 @@
return new XSSimpleCM(type, (XSElementDecl)left.fValue);
}
else if (left.fType==XSParticleDecl.PARTICLE_ALL) {
- // REVISIT: add ALL content model
+ XSAllCM allContent = new XSAllCM(true);
+ gatherAllLeaves (left, allContent);
+ return allContent;
}
@@ -410,6 +423,50 @@
}
return particle;
+ }
+
+ /**
+ * Recursively builds an AllContentModel based on a particle tree
+ * rooted at an ALL node.
+ */
+ private void gatherAllLeaves(XSParticleDecl particle,
+ XSAllCM allContent) {
+
+ XSParticleDecl left = (XSParticleDecl) particle.fValue;
+ XSParticleDecl right = (XSParticleDecl) particle.fOtherValue;
+ int type = particle.fType;
+
+ if (type == XSParticleDecl.PARTICLE_ALL) {
+
+ // At an all node, visit left and right subtrees
+
+ gatherAllLeaves (left, allContent);
+ gatherAllLeaves (right, allContent);
+ }
+ else if (type == XSParticleDecl.PARTICLE_ELEMENT) {
+
+ // At leaf, add the element to list of elements permitted in the all
+
+ allContent.addElement ((XSElementDecl)(particle.fValue), false);
+ }
+ else if (type == XSParticleDecl.PARTICLE_ZERO_OR_ONE) {
+
+ // At ZERO_OR_ONE node, subtree must be an element
+ // that was specified with minOccurs=0, maxOccurs=1
+ // Add the optional element to list of elements permitted in the all
+
+ if (left.fType == XSParticleDecl.PARTICLE_ELEMENT) {
+ allContent.addElement ((XSElementDecl)left.fValue, true);
+ }
+ else {
+ // report error
+ throw new RuntimeException("ImplementationMessages.VAL_CST");
+ }
+ }
+ else {
+ // report error
+ throw new RuntimeException("ImplementationMessages.VAL_CST");
+ }
}
private XSParticleDecl createParticle (short type,
1.1 xml-xerces/java/src/org/apache/xerces/impl/v2/XSAllCM.java
Index: XSAllCM.java
===================================================================
/*
* The Apache Software License, Version 1.1
*
*
* Copyright (c) 1999,2000 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
* software without prior written permission. For written
* permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation and was
* originally based on software copyright (c) 1999, International
* Business Machines, Inc., http://www.apache.org. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
package org.apache.xerces.impl.v2;
import org.apache.xerces.xni.QName;
/**
* XSAllCM implements XSCMValidator and handles <all>
*
* @author Pavani Mukthipudi, Sun Microsystems Inc.
* @version $Id: XSAllCM.java,v 1.1 2001/10/04 16:06:09 neilg Exp $
*/
public class XSAllCM implements XSCMValidator {
//
// Constants
//
// start the content model: did not see any children
private static final short STATE_START = 0;
private static final short STATE_VALID = 1;
//
// Data
//
private XSElementDecl fAllElements[] = new XSElementDecl[10];
private boolean fIsOptionalElement[] = new boolean[10];
private boolean fHasOptionalContent = false;
// private boolean fIsMixed = false;
private int fNumElements = 0;
private int fNumRequired = 0;
//
// Constructors
//
public XSAllCM (boolean hasOptionalContent) {
fHasOptionalContent = hasOptionalContent;
}
// REVISIT : do we need this ?
// public XSAllCM (boolean hasOptionalContent, boolean isMixed) {
// this(hasOptionalContent);
// fIsMixed = isMixed;
// }
public void addElement (XSElementDecl element, boolean isOptional) {
// resize arrays if necessary
if (fNumElements >= fAllElements.length) {
XSElementDecl newAllElements[] = new XSElementDecl [2*fAllElements.length];
boolean newIsOptionalElements[] =
new boolean[2*fIsOptionalElement.length];
System.arraycopy(fAllElements, 0, newAllElements, 0,
fAllElements.length);
System.arraycopy(fIsOptionalElement, 0, newIsOptionalElements, 0,
fIsOptionalElement.length);
fAllElements = newAllElements;
fIsOptionalElement = newIsOptionalElements;
}
fAllElements[fNumElements] = element;
fIsOptionalElement[fNumElements] = isOptional;
fNumElements++;
// keeping track of the number of elements that are required
if (!isOptional) {
fNumRequired++;
}
}
// REVISIT : to implement Unique Particle Attribution
// public void checkUniqueParticleAttribution()
//
// 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[fNumElements + 1];
for (int i = 0; i <= fNumElements; i++) {
state[i] = STATE_START;
}
return state;
}
/**
* The method corresponds to one transition in the content model.
*
* @param elementName
* @param state Current state
* @return an element decl object
*/
public Object oneTransition (QName elementName, int[] currentState) {
for (int i = 0; i < fNumElements; i++) {
if (fAllElements[i].fTargetNamespace == elementName.uri &&
fAllElements[i].fName == elementName.localpart) {
if (currentState[i+1] == STATE_START) {
currentState[i+1] = STATE_VALID;
}
else if (currentState[i+1] == STATE_VALID) {
// duplicate element
currentState[i+1] = XSCMValidator.FIRST_ERROR;
currentState[0] = XSCMValidator.FIRST_ERROR;
}
else if (currentState[i+1] == XSCMValidator.FIRST_ERROR) {
currentState[i+1] = XSCMValidator.SUBSEQUENT_ERROR;
currentState[0] = XSCMValidator.SUBSEQUENT_ERROR;
}
if (currentState[0] == STATE_START) {
currentState[0] = STATE_VALID;
}
return fAllElements[i];
}
}
if (currentState[0] == XSCMValidator.FIRST_ERROR)
currentState[0] = XSCMValidator.SUBSEQUENT_ERROR;
else if (currentState[0] == STATE_START || currentState[0] == STATE_VALID)
currentState[0] = XSCMValidator.FIRST_ERROR;
return null;
}
/**
* The method indicates the end of list of children
*
* @param state 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
if (fHasOptionalContent && fNumElements == 0) {
return true;
}
int numRequiredSeen = 0;
for (int i = 0; i < fNumElements; i++) {
if (!fIsOptionalElement[i] && currentState[i+1] != STATE_START)
numRequiredSeen++;
}
if (fNumRequired == numRequiredSeen ) {
return true;
}
return false;
}
} // class XSAllCM
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org