zongaro 2002/12/17 11:06:28
Modified: java/src/org/apache/xalan/xsltc/compiler Tag: XSLTC_DTM
AbsolutePathPattern.java CastExpr.java Mode.java
ProcessingInstructionPattern.java StepPattern.java
java/src/org/apache/xalan/xsltc/dom Tag: XSLTC_DTM
AnyNodeCounter.java DOMAdapter.java DOMImpl.java
DOMWSFilter.java MultiDOM.java
MultipleNodeCounter.java NodeCounter.java
SAXImpl.java SingleNodeCounter.java
Log:
Renamed XSLTC DOM's getType method to getExpandedTypeID to be consistent with
DTM.
Revision Changes Path
No revision
No revision
1.5.6.4 +3 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/AbsolutePathPattern.java
Index: AbsolutePathPattern.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/AbsolutePathPattern.java,v
retrieving revision 1.5.6.3
retrieving revision 1.5.6.4
diff -u -r1.5.6.3 -r1.5.6.4
--- AbsolutePathPattern.java 5 Nov 2002 10:41:36 -0000 1.5.6.3
+++ AbsolutePathPattern.java 17 Dec 2002 19:06:26 -0000 1.5.6.4
@@ -131,7 +131,8 @@
GET_PARENT,
GET_PARENT_SIG);
final int getType = cpg.addInterfaceMethodref(DOM_INTF,
- "getType", "(I)I");
+ "getExpandedTypeID",
+ "(I)I");
InstructionHandle begin = il.append(methodGen.loadDOM());
il.append(SWAP);
1.10.6.5 +3 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/CastExpr.java
Index: CastExpr.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/CastExpr.java,v
retrieving revision 1.10.6.4
retrieving revision 1.10.6.5
diff -u -r1.10.6.4 -r1.10.6.5
--- CastExpr.java 5 Nov 2002 10:41:37 -0000 1.10.6.4
+++ CastExpr.java 17 Dec 2002 19:06:26 -0000 1.10.6.5
@@ -225,7 +225,8 @@
final InstructionList il = methodGen.getInstructionList();
final int idx = cpg.addInterfaceMethodref(DOM_INTF,
- "getType", "(I)I");
+ "getExpandedTypeID",
+ "(I)I");
il.append(new SIPUSH((short)((Step)_left).getNodeType()));
il.append(methodGen.loadDOM());
il.append(methodGen.loadContextNode());
1.19.6.6 +5 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Mode.java
Index: Mode.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Mode.java,v
retrieving revision 1.19.6.5
retrieving revision 1.19.6.6
diff -u -r1.19.6.5 -r1.19.6.6
--- Mode.java 5 Nov 2002 10:41:37 -0000 1.19.6.5
+++ Mode.java 17 Dec 2002 19:06:26 -0000 1.19.6.6
@@ -1037,7 +1037,8 @@
// Append first code in applyTemplates() - get type of current node
final int getType = cpg.addInterfaceMethodref(DOM_INTF,
- "getType", "(I)I");
+ "getExpandedTypeID",
+ "(I)I");
body.append(methodGen.loadDOM());
body.append(new ILOAD(_currentIndex));
body.append(new INVOKEINTERFACE(getType, 2));
@@ -1399,7 +1400,8 @@
// Append first code in applyTemplates() - get type of current node
final int getType = cpg.addInterfaceMethodref(DOM_INTF,
- "getType", "(I)I");
+ "getExpandedTypeID",
+ "(I)I");
body.append(methodGen.loadDOM());
body.append(new ILOAD(_currentIndex));
body.append(new INVOKEINTERFACE(getType, 2));
1.2.6.2 +3 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ProcessingInstructionPattern.java
Index: ProcessingInstructionPattern.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ProcessingInstructionPattern.java,v
retrieving revision 1.2.6.1
retrieving revision 1.2.6.2
diff -u -r1.2.6.1 -r1.2.6.2
--- ProcessingInstructionPattern.java 17 Apr 2002 18:13:41 -0000 1.2.6.1
+++ ProcessingInstructionPattern.java 17 Dec 2002 19:06:26 -0000 1.2.6.2
@@ -138,7 +138,8 @@
if (!_typeChecked) {
il.append(methodGen.loadCurrentNode());
final int getType = cpg.addInterfaceMethodref(DOM_INTF,
- "getType", "(I)I");
+ "getExpandedTypeID",
+ "(I)I");
il.append(methodGen.loadDOM());
il.append(methodGen.loadCurrentNode());
il.append(new INVOKEINTERFACE(getType, 2));
1.14.2.6 +5 -4
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/StepPattern.java
Index: StepPattern.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/StepPattern.java,v
retrieving revision 1.14.2.5
retrieving revision 1.14.2.6
diff -u -r1.14.2.5 -r1.14.2.6
--- StepPattern.java 5 Nov 2002 10:41:38 -0000 1.14.2.5
+++ StepPattern.java 17 Dec 2002 19:06:26 -0000 1.14.2.6
@@ -260,11 +260,12 @@
}
else {
// context node is on the stack
- final int getType = cpg.addInterfaceMethodref(DOM_INTF,
- "getType", "(I)I");
+ final int getEType = cpg.addInterfaceMethodref(DOM_INTF,
+ "getExpandedTypeID",
+ "(I)I");
il.append(methodGen.loadDOM());
il.append(SWAP);
- il.append(new INVOKEINTERFACE(getType, 2));
+ il.append(new INVOKEINTERFACE(getEType, 2));
il.append(new PUSH(cpg, _nodeType));
// Need to allow for long jumps here
No revision
No revision
1.1.14.4 +4 -4
xml-xalan/java/src/org/apache/xalan/xsltc/dom/AnyNodeCounter.java
Index: AnyNodeCounter.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/AnyNodeCounter.java,v
retrieving revision 1.1.14.3
retrieving revision 1.1.14.4
diff -u -r1.1.14.3 -r1.1.14.4
--- AnyNodeCounter.java 5 Nov 2002 10:41:44 -0000 1.1.14.3
+++ AnyNodeCounter.java 17 Dec 2002 19:06:27 -0000 1.1.14.4
@@ -78,7 +78,7 @@
public NodeCounter setStartNode(int node) {
_node = node;
- _nodeType = _document.getType(node);
+ _nodeType = _document.getExpandedTypeID(node);
return this;
}
@@ -128,10 +128,10 @@
else {
int next = _node;
result = 0;
- final int ntype = _document.getType(_node);
+ final int ntype = _document.getExpandedTypeID(_node);
final int root = _document.getDocument();
while (next >= 0) {
- if (ntype == _document.getType(next)) {
+ if (ntype == _document.getExpandedTypeID(next)) {
result++;
}
//%HZ%: Is this the best way of finding the root? Is it better to check
1.11.10.10 +10 -10
xml-xalan/java/src/org/apache/xalan/xsltc/dom/DOMAdapter.java
Index: DOMAdapter.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/DOMAdapter.java,v
retrieving revision 1.11.10.9
retrieving revision 1.11.10.10
diff -u -r1.11.10.9 -r1.11.10.10
--- DOMAdapter.java 14 Nov 2002 18:57:22 -0000 1.11.10.9
+++ DOMAdapter.java 17 Dec 2002 19:06:27 -0000 1.11.10.10
@@ -121,16 +121,16 @@
}
private short[] getMapping() {
- if (_mapping == null
- || (_saxImpl != null && _saxImpl.getNamesArray() == null)
- || (_domImpl != null && _domImpl.getNamesArray() == null)) {
+ if (_mapping == null
+ || (_saxImpl != null && _saxImpl.getNamesArray() == null)
+ || (_domImpl != null && _domImpl.getNamesArray() == null)) {
if (_domImpl != null) {
- _mapping = _domImpl.getMapping(_namesArray);
+ _mapping = _domImpl.getMapping(_namesArray);
} else {
- _mapping = _saxImpl.getMapping(_namesArray);
+ _mapping = _saxImpl.getMapping(_namesArray);
}
- }
- return _mapping;
+ }
+ return _mapping;
}
private int[] getReverse() {
@@ -287,8 +287,8 @@
return _dom.orderNodes(source, node);
}
- public int getType(final int node) {
- return getMapping()[_dom.getType(node)];
+ public int getExpandedTypeID(final int node) {
+ return getMapping()[_dom.getExpandedTypeID(node)];
}
public int getNamespaceType(final int node) {
1.68.2.19 +9 -14
xml-xalan/java/src/org/apache/xalan/xsltc/dom/DOMImpl.java
Index: DOMImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/DOMImpl.java,v
retrieving revision 1.68.2.18
retrieving revision 1.68.2.19
diff -u -r1.68.2.18 -r1.68.2.19
--- DOMImpl.java 10 Dec 2002 20:18:00 -0000 1.68.2.18
+++ DOMImpl.java 17 Dec 2002 19:06:27 -0000 1.68.2.19
@@ -342,7 +342,8 @@
*/
public boolean isElement(final int node)
{
- return (((node < _firstAttributeNode) && (getType(node) >= DTM.NTYPES))
+ return (((node < _firstAttributeNode)
+ && (getExpandedTypeID(node) >= DTM.NTYPES))
|| getNodeType(node) == DTM.ELEMENT_NODE);
}
@@ -351,7 +352,8 @@
*/
public boolean isAttribute(final int node)
{
- return ((node >= _firstAttributeNode) && (getType(node) >=
DTM.NTYPES));
+ return ((node >= _firstAttributeNode)
+ && (getExpandedTypeID(node) >= DTM.NTYPES));
}
/**
@@ -500,7 +502,7 @@
}
public boolean test(int node) {
- return getType(node) == _nodeType;
+ return getExpandedTypeID(node) == _nodeType;
}
}
@@ -591,7 +593,7 @@
public DTMAxisIterator setStartNode(int node) {
if (_children){
if (_filter.stripSpace((DOM)DOMImpl.this, node,
- _mapping[getType(node)])) {
+ _mapping[getExpandedTypeID(node)])) {
_action = STRIP_SPACE;
} else {
_action = PRESERVE_SPACE;
@@ -617,7 +619,7 @@
default:
if (isWhitespace(node)
&& _filter.stripSpace((DOM)DOMImpl.this, node,
-
_mapping[getType(getParent(node))])) {
+
_mapping[getExpandedTypeID(getParent(node))])) {
continue;
}
return returnNode(node);
@@ -670,7 +672,7 @@
default:
if (isWhitespace(node)
&& _filter.stripSpace((DOM)DOMImpl.this, node,
-
_mapping[getType(getParent(node))])) {
+
_mapping[getExpandedTypeID(getParent(node))])) {
continue;
} else {
count++;
@@ -853,13 +855,6 @@
return new SingletonIterator(getDocument()); //ROOTNODE);
}
- /**
- * Returns the type of a specific node
- */
- public int getType(final int node) {
- return getExpandedTypeID(node);
- }
-
/**
* Get mapping from DOM namespace types to external namespace types
*/
1.1.2.2 +3 -3
xml-xalan/java/src/org/apache/xalan/xsltc/dom/Attic/DOMWSFilter.java
Index: DOMWSFilter.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/Attic/DOMWSFilter.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- DOMWSFilter.java 14 Nov 2002 18:57:23 -0000 1.1.2.1
+++ DOMWSFilter.java 17 Dec 2002 19:06:27 -0000 1.1.2.2
@@ -117,12 +117,12 @@
SAXImpl saxImpl = (SAXImpl)dtm;
short[] mapping =
saxImpl.getMapping(m_translet.getNamesArray());
- type = mapping[saxImpl.getType(node)];
+ type = mapping[saxImpl.getExpandedTypeID(node)];
} else if (dtm instanceof DOMImpl) {
DOMImpl domImpl = (DOMImpl)dtm;
short[] mapping =
domImpl.getMapping(m_translet.getNamesArray());
- type = mapping[domImpl.getType(node)];
+ type = mapping[domImpl.getExpandedTypeID(node)];
} else {
return INHERIT;
}
1.16.10.9 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/dom/MultiDOM.java
Index: MultiDOM.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/MultiDOM.java,v
retrieving revision 1.16.10.8
retrieving revision 1.16.10.9
diff -u -r1.16.10.8 -r1.16.10.9
--- MultiDOM.java 13 Nov 2002 17:03:22 -0000 1.16.10.8
+++ MultiDOM.java 17 Dec 2002 19:06:27 -0000 1.16.10.9
@@ -405,8 +405,8 @@
return _adapters[getDTMId(node)].orderNodes(source, node & CLR);
}
- public int getType(final int node) {
- return _adapters[getDTMId(node)].getType(node & CLR);
+ public int getExpandedTypeID(final int node) {
+ return _adapters[getDTMId(node)].getExpandedTypeID(node & CLR);
}
public int getNamespaceType(final int node) {
1.1.14.2 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/dom/MultipleNodeCounter.java
Index: MultipleNodeCounter.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/MultipleNodeCounter.java,v
retrieving revision 1.1.14.1
retrieving revision 1.1.14.2
diff -u -r1.1.14.1 -r1.1.14.2
--- MultipleNodeCounter.java 17 Apr 2002 18:13:44 -0000 1.1.14.1
+++ MultipleNodeCounter.java 17 Dec 2002 19:06:27 -0000 1.1.14.2
@@ -80,7 +80,7 @@
public NodeCounter setStartNode(int node) {
_node = node;
- _nodeType = _document.getType(node);
+ _nodeType = _document.getExpandedTypeID(node);
_precSiblings = _document.getAxisIterator(PRECEDINGSIBLING);
return this;
}
1.6.10.4 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/dom/NodeCounter.java
Index: NodeCounter.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/NodeCounter.java,v
retrieving revision 1.6.10.3
retrieving revision 1.6.10.4
diff -u -r1.6.10.3 -r1.6.10.4
--- NodeCounter.java 5 Nov 2002 10:41:45 -0000 1.6.10.3
+++ NodeCounter.java 17 Dec 2002 19:06:27 -0000 1.6.10.4
@@ -228,7 +228,7 @@
* same type as the starting node.
*/
public boolean matchesCount(int node) {
- return _nodeType == _document.getType(node);
+ return _nodeType == _document.getExpandedTypeID(node);
}
/**
1.1.2.21 +12 -15
xml-xalan/java/src/org/apache/xalan/xsltc/dom/Attic/SAXImpl.java
Index: SAXImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/Attic/SAXImpl.java,v
retrieving revision 1.1.2.20
retrieving revision 1.1.2.21
diff -u -r1.1.2.20 -r1.1.2.21
--- SAXImpl.java 14 Nov 2002 18:57:23 -0000 1.1.2.20
+++ SAXImpl.java 17 Dec 2002 19:06:27 -0000 1.1.2.21
@@ -243,7 +243,8 @@
* Returns 'true' if a specific node is an element (of any type)
*/
public boolean isElement(final int node) {
- return (((node < _firstAttributeNode) && (getType(node) >=
DTM.NTYPES))
+ return (((node < _firstAttributeNode)
+ && (getExpandedTypeID(node) >= DTM.NTYPES))
|| getNodeType(node) == DTM.ELEMENT_NODE);
}
@@ -251,7 +252,8 @@
* Returns 'true' if a specific node is an attribute (of any type)
*/
public boolean isAttribute(final int node) {
- return (((node >= _firstAttributeNode) && (getType(node) >=
DTM.NTYPES))
+ return (((node >= _firstAttributeNode)
+ && (getExpandedTypeID(node) >= DTM.NTYPES))
|| getNodeType(node) == DTM.ATTRIBUTE_NODE);
}
@@ -389,7 +391,7 @@
}
public boolean test(int node) {
- return getType(node) == _nodeType;
+ return getExpandedTypeID(node) == _nodeType;
}
}
@@ -481,7 +483,7 @@
if (_children)
{
if (_filter.stripSpace((DOM)SAXImpl.this, node,
- _mapping[getType(node)]))
+ _mapping[getExpandedTypeID(node)]))
_action = STRIP_SPACE;
else
_action = PRESERVE_SPACE;
@@ -508,7 +510,7 @@
default:
if (_whitespace.getBit(getNodeIdent(node)) &&
_filter.stripSpace((DOM)SAXImpl.this, node,
- _mapping[getType(getParent(node))]))
+ _mapping[getExpandedTypeID(getParent(node))]))
continue;
return returnNode(node);
}
@@ -561,7 +563,7 @@
default:
if (_whitespace.getBit(getNodeIdent(node)) &&
_filter.stripSpace((DOM)SAXImpl.this, node,
- _mapping[getType(getParent(node))]))
+ _mapping[getExpandedTypeID(getParent(node))]))
continue;
else
count++;
@@ -801,14 +803,6 @@
return new SingletonIterator(getDocument());
}
- /**
- * Returns the type of a specific node
- */
- public int getType(final int node)
- {
- return getExpandedTypeID(node);
- }
-
/**
* Get mapping from DOM namespace types to external namespace types
*/
@@ -837,6 +831,7 @@
public String getStringValueX(final int node)
{
if (node == DTM.NULL) return EMPTYSTRING;
+/*
switch(getNodeType(node)) {
case DTM.ROOT_NODE:
case DTM.DOCUMENT_NODE:
@@ -851,6 +846,8 @@
default:
return getStringValue(node).toString();
}
+*/
+ return getStringValue(node).toString();
}
/**
1.2.10.2 +4 -4
xml-xalan/java/src/org/apache/xalan/xsltc/dom/SingleNodeCounter.java
Index: SingleNodeCounter.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/SingleNodeCounter.java,v
retrieving revision 1.2.10.1
retrieving revision 1.2.10.2
diff -u -r1.2.10.1 -r1.2.10.2
--- SingleNodeCounter.java 17 Apr 2002 18:13:44 -0000 1.2.10.1
+++ SingleNodeCounter.java 17 Dec 2002 19:06:27 -0000 1.2.10.2
@@ -81,7 +81,7 @@
public NodeCounter setStartNode(int node) {
_node = node;
- _nodeType = _document.getType(node);
+ _nodeType = _document.getExpandedTypeID(node);
_countSiblings = _document.getAxisIterator(PRECEDINGSIBLING);
return this;
}
@@ -134,10 +134,10 @@
public NodeCounter setStartNode(int node) {
_node = node;
- _nodeType = _document.getType(node);
+ _nodeType = _document.getExpandedTypeID(node);
_countSiblings =
_document.getTypedAxisIterator(PRECEDINGSIBLING,
- _document.getType(node));
+
_document.getExpandedTypeID(node));
return this;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
