OK, I'm going to make a wild guess and assume that sboag's recent commit
of /NodeSet/NodeSetDTM/ got a little out of control and shouldn't have
gone down into org.apache.xalan.xsltc - undone to fix compile error
diff --git a/src/org/apache/xalan/xsltc/compiler/AbsoluteLocationPath.java b/src/org/apache/xalan/xsltc/compiler/AbsoluteLocationPath.java
index 6a380f1..f9ec1b0 100644
--- a/src/org/apache/xalan/xsltc/compiler/AbsoluteLocationPath.java
+++ b/src/org/apache/xalan/xsltc/compiler/AbsoluteLocationPath.java
@@ -101,10 +101,10 @@
if (_path != null) {
final Type ptype = _path.typeCheck(stable);
if (ptype instanceof NodeType) { // promote to node-set
- _path = new CastExpr(_path, Type.NodeSetDTM);
+ _path = new CastExpr(_path, Type.NodeSet);
}
}
- return _type = Type.NodeSetDTM;
+ return _type = Type.NodeSet;
}
public void translate(ClassGenerator classGen, MethodGenerator methodGen) {
diff --git a/src/org/apache/xalan/xsltc/compiler/ApplyImports.java b/src/org/apache/xalan/xsltc/compiler/ApplyImports.java
index efab9e1..a08f6a6 100644
--- a/src/org/apache/xalan/xsltc/compiler/ApplyImports.java
+++ b/src/org/apache/xalan/xsltc/compiler/ApplyImports.java
@@ -120,10 +120,10 @@
Type tselect = _select.typeCheck(stable);
if (tselect instanceof NodeType ||
tselect instanceof ReferenceType) {
- _select = new CastExpr(_select, Type.NodeSetDTM);
- tselect = Type.NodeSetDTM;
+ _select = new CastExpr(_select, Type.NodeSet);
+ tselect = Type.NodeSet;
}
- if (tselect instanceof NodeSetDTMType) {
+ if (tselect instanceof NodeSetType) {
typeCheckContents(stable); // with-params
return Type.Void;
}
diff --git a/src/org/apache/xalan/xsltc/compiler/ApplyTemplates.java b/src/org/apache/xalan/xsltc/compiler/ApplyTemplates.java
index b6eebdd..a81b8cf 100644
--- a/src/org/apache/xalan/xsltc/compiler/ApplyTemplates.java
+++ b/src/org/apache/xalan/xsltc/compiler/ApplyTemplates.java
@@ -119,10 +119,10 @@
Type tselect = _select.typeCheck(stable);
if (tselect instanceof NodeType ||
tselect instanceof ReferenceType) {
- _select = new CastExpr(_select, Type.NodeSetDTM);
- tselect = Type.NodeSetDTM;
+ _select = new CastExpr(_select, Type.NodeSet);
+ tselect = Type.NodeSet;
}
- if (tselect instanceof NodeSetDTMType) {
+ if (tselect instanceof NodeSetType) {
typeCheckContents(stable); // with-params
return Type.Void;
}
diff --git a/src/org/apache/xalan/xsltc/compiler/CastExpr.java b/src/org/apache/xalan/xsltc/compiler/CastExpr.java
index c83f4b7..89474d4 100644
--- a/src/org/apache/xalan/xsltc/compiler/CastExpr.java
+++ b/src/org/apache/xalan/xsltc/compiler/CastExpr.java
@@ -100,25 +100,25 @@
InternalTypeMap.put(Type.String, Type.Real);
InternalTypeMap.put(Type.String, Type.Reference);
- InternalTypeMap.put(Type.NodeSetDTM, Type.NodeSetDTM);
- InternalTypeMap.put(Type.NodeSetDTM, Type.Boolean);
- InternalTypeMap.put(Type.NodeSetDTM, Type.Real);
- InternalTypeMap.put(Type.NodeSetDTM, Type.String);
- InternalTypeMap.put(Type.NodeSetDTM, Type.Node);
- InternalTypeMap.put(Type.NodeSetDTM, Type.Reference);
+ InternalTypeMap.put(Type.NodeSet, Type.NodeSet);
+ InternalTypeMap.put(Type.NodeSet, Type.Boolean);
+ InternalTypeMap.put(Type.NodeSet, Type.Real);
+ InternalTypeMap.put(Type.NodeSet, Type.String);
+ InternalTypeMap.put(Type.NodeSet, Type.Node);
+ InternalTypeMap.put(Type.NodeSet, Type.Reference);
InternalTypeMap.put(Type.Node, Type.Node);
InternalTypeMap.put(Type.Node, Type.Boolean);
InternalTypeMap.put(Type.Node, Type.Real);
InternalTypeMap.put(Type.Node, Type.String);
- InternalTypeMap.put(Type.Node, Type.NodeSetDTM);
+ InternalTypeMap.put(Type.Node, Type.NodeSet);
InternalTypeMap.put(Type.Node, Type.Reference);
InternalTypeMap.put(Type.ResultTree, Type.ResultTree);
InternalTypeMap.put(Type.ResultTree, Type.Boolean);
InternalTypeMap.put(Type.ResultTree, Type.Real);
InternalTypeMap.put(Type.ResultTree, Type.String);
- InternalTypeMap.put(Type.ResultTree, Type.NodeSetDTM);
+ InternalTypeMap.put(Type.ResultTree, Type.NodeSet);
InternalTypeMap.put(Type.ResultTree, Type.Reference);
InternalTypeMap.put(Type.Reference, Type.Reference);
@@ -126,7 +126,7 @@
InternalTypeMap.put(Type.Reference, Type.Int);
InternalTypeMap.put(Type.Reference, Type.Real);
InternalTypeMap.put(Type.Reference, Type.String);
- InternalTypeMap.put(Type.Reference, Type.NodeSetDTM);
+ InternalTypeMap.put(Type.Reference, Type.NodeSet);
InternalTypeMap.put(Type.Void, Type.String);
}
diff --git a/src/org/apache/xalan/xsltc/compiler/CopyOf.java b/src/org/apache/xalan/xsltc/compiler/CopyOf.java
index a748bf9..9d558e3 100644
--- a/src/org/apache/xalan/xsltc/compiler/CopyOf.java
+++ b/src/org/apache/xalan/xsltc/compiler/CopyOf.java
@@ -94,7 +94,7 @@
public Type typeCheck(SymbolTable stable) throws TypeCheckError {
final Type tselect = _select.typeCheck(stable);
if (tselect instanceof NodeType ||
- tselect instanceof NodeSetDTMType ||
+ tselect instanceof NodeSetType ||
tselect instanceof ReferenceType ||
tselect instanceof ResultTreeType) {
// falls through
@@ -113,7 +113,7 @@
- if (tselect instanceof NodeSetDTMType) {
+ if (tselect instanceof NodeSetType) {
il.append(methodGen.loadDOM());
// push NodeIterator
diff --git a/src/org/apache/xalan/xsltc/compiler/DocumentCall.java b/src/org/apache/xalan/xsltc/compiler/DocumentCall.java
index 9a799f5..e6908a0 100644
--- a/src/org/apache/xalan/xsltc/compiler/DocumentCall.java
+++ b/src/org/apache/xalan/xsltc/compiler/DocumentCall.java
@@ -116,21 +116,21 @@
}
_uriType = _uri.typeCheck(stable);
- if ((_uriType != Type.NodeSetDTM) && (_uriType != Type.String)) {
+ if ((_uriType != Type.NodeSet) && (_uriType != Type.String)) {
_uri = new CastExpr(_uri, Type.String);
}
// Parse the second argument - the document URI base
if (ac == 2) {
_base = argument(1);
- if (!_base.typeCheck(stable).identicalTo(Type.NodeSetDTM)) {
+ if (!_base.typeCheck(stable).identicalTo(Type.NodeSet)) {
ErrorMsg msg = new ErrorMsg("Second argument to document() "+
"function must be a node-set.");
throw new TypeCheckError(msg);
}
}
- return _type = Type.NodeSetDTM;
+ return _type = Type.NodeSet;
}
/**
@@ -157,7 +157,7 @@
// The URI can be either a node-set or something else cast to a string
_uri.translate(classGen, methodGen);
- if (_uriType == Type.NodeSetDTM)
+ if (_uriType == Type.NodeSet)
_uri.startResetIterator(classGen, methodGen);
// The base of the URI may be given as a second argument (a node-set)
diff --git a/src/org/apache/xalan/xsltc/compiler/EqualityExpr.java b/src/org/apache/xalan/xsltc/compiler/EqualityExpr.java
index 2e6dffb..690f576 100644
--- a/src/org/apache/xalan/xsltc/compiler/EqualityExpr.java
+++ b/src/org/apache/xalan/xsltc/compiler/EqualityExpr.java
@@ -140,27 +140,27 @@
_left = new CastExpr(_left, Type.String);
_right = new CastExpr(_right, Type.String);
}
- else if (tleft instanceof NodeType && tright instanceof NodeSetDTMType) {
- // compare(Node, NodeSetDTM) will be invoked
+ else if (tleft instanceof NodeType && tright instanceof NodeSetType) {
+ // compare(Node, NodeSet) will be invoked
}
- else if (tleft instanceof NodeSetDTMType && tright instanceof NodeType) {
- swapArguments(); // for compare(Node, NodeSetDTM)
+ else if (tleft instanceof NodeSetType && tright instanceof NodeType) {
+ swapArguments(); // for compare(Node, NodeSet)
}
else {
// At least one argument is of type node, node-set or result-tree
// Promote an expression of type node to node-set
if (tleft instanceof NodeType) {
- _left = new CastExpr(_left, Type.NodeSetDTM);
+ _left = new CastExpr(_left, Type.NodeSet);
}
if (tright instanceof NodeType) {
- _right = new CastExpr(_right, Type.NodeSetDTM);
+ _right = new CastExpr(_right, Type.NodeSet);
}
// If one arg is a node-set then make it the left one
if (tleft.isSimple() ||
tleft instanceof ResultTreeType &&
- tright instanceof NodeSetDTMType) {
+ tright instanceof NodeSetType) {
swapArguments();
}
@@ -284,10 +284,10 @@
return;
}
- if (tleft instanceof NodeSetDTMType && tright instanceof BooleanType) {
+ if (tleft instanceof NodeSetType && tright instanceof BooleanType) {
_left.translate(classGen, methodGen);
_left.startResetIterator(classGen, methodGen);
- Type.NodeSetDTM.translateTo(classGen, methodGen, Type.Boolean);
+ Type.NodeSet.translateTo(classGen, methodGen, Type.Boolean);
_right.translate(classGen, methodGen);
il.append(IXOR); // x != y <-> x xor y
@@ -298,7 +298,7 @@
return;
}
- if (tleft instanceof NodeSetDTMType && tright instanceof StringType) {
+ if (tleft instanceof NodeSetType && tright instanceof StringType) {
_left.translate(classGen, methodGen);
_left.startResetIterator(classGen, methodGen); // needed ?
_right.translate(classGen, methodGen);
diff --git a/src/org/apache/xalan/xsltc/compiler/Expression.java b/src/org/apache/xalan/xsltc/compiler/Expression.java
index ee85664..a4eb784 100644
--- a/src/org/apache/xalan/xsltc/compiler/Expression.java
+++ b/src/org/apache/xalan/xsltc/compiler/Expression.java
@@ -155,7 +155,7 @@
}
_startReset = true;
- if (_type instanceof NodeSetDTMType == false) {
+ if (_type instanceof NodeSetType == false) {
return; // nothing to do
}
diff --git a/src/org/apache/xalan/xsltc/compiler/FilterExpr.java b/src/org/apache/xalan/xsltc/compiler/FilterExpr.java
index 95075c4..224909c 100644
--- a/src/org/apache/xalan/xsltc/compiler/FilterExpr.java
+++ b/src/org/apache/xalan/xsltc/compiler/FilterExpr.java
@@ -106,9 +106,9 @@
public Type typeCheck(SymbolTable stable) throws TypeCheckError {
Type ptype = _primary.typeCheck(stable);
- if (ptype instanceof NodeSetDTMType == false) {
+ if (ptype instanceof NodeSetType == false) {
if (ptype instanceof ReferenceType) {
- _primary = new CastExpr(_primary, Type.NodeSetDTM);
+ _primary = new CastExpr(_primary, Type.NodeSet);
}
else {
throw new TypeCheckError(this);
@@ -120,7 +120,7 @@
Expression pred = (Expression)_predicates.elementAt(i);
pred.typeCheck(stable);
}
- return _type = Type.NodeSetDTM;
+ return _type = Type.NodeSet;
}
/**
diff --git a/src/org/apache/xalan/xsltc/compiler/FilterParentPath.java b/src/org/apache/xalan/xsltc/compiler/FilterParentPath.java
index ee32a86..95bc4b0 100644
--- a/src/org/apache/xalan/xsltc/compiler/FilterParentPath.java
+++ b/src/org/apache/xalan/xsltc/compiler/FilterParentPath.java
@@ -94,12 +94,12 @@
*/
public Type typeCheck(SymbolTable stable) throws TypeCheckError {
final Type ftype = _filterExpr.typeCheck(stable);
- if (ftype instanceof NodeSetDTMType == false) {
+ if (ftype instanceof NodeSetType == false) {
if (ftype instanceof ReferenceType) {
- _filterExpr = new CastExpr(_filterExpr, Type.NodeSetDTM);
+ _filterExpr = new CastExpr(_filterExpr, Type.NodeSet);
}
else if (ftype instanceof NodeType) {
- _filterExpr = new CastExpr(_filterExpr, Type.NodeSetDTM);
+ _filterExpr = new CastExpr(_filterExpr, Type.NodeSet);
}
else {
throw new TypeCheckError(this);
@@ -108,11 +108,11 @@
// Wrap single node path in a node set
final Type ptype = _path.typeCheck(stable);
- if (!(ptype instanceof NodeSetDTMType)) {
- _path = new CastExpr(_path, Type.NodeSetDTM);
+ if (!(ptype instanceof NodeSetType)) {
+ _path = new CastExpr(_path, Type.NodeSet);
}
- return _type = Type.NodeSetDTM;
+ return _type = Type.NodeSet;
}
public void translate(ClassGenerator classGen, MethodGenerator methodGen) {
diff --git a/src/org/apache/xalan/xsltc/compiler/ForEach.java b/src/org/apache/xalan/xsltc/compiler/ForEach.java
index 86fee95..3d45df3 100644
--- a/src/org/apache/xalan/xsltc/compiler/ForEach.java
+++ b/src/org/apache/xalan/xsltc/compiler/ForEach.java
@@ -103,11 +103,11 @@
Type tselect = _select.typeCheck(stable);
if (tselect instanceof ReferenceType || tselect instanceof NodeType) {
- _select = new CastExpr(_select, Type.NodeSetDTM);
+ _select = new CastExpr(_select, Type.NodeSet);
typeCheckContents(stable);
return Type.Void;
}
- else if (tselect instanceof NodeSetDTMType) {
+ else if (tselect instanceof NodeSetType) {
typeCheckContents(stable);
return Type.Void;
}
diff --git a/src/org/apache/xalan/xsltc/compiler/FunctionCall.java b/src/org/apache/xalan/xsltc/compiler/FunctionCall.java
index 740acb0..4c2e4ef 100644
--- a/src/org/apache/xalan/xsltc/compiler/FunctionCall.java
+++ b/src/org/apache/xalan/xsltc/compiler/FunctionCall.java
@@ -128,8 +128,8 @@
InternalToJava.put(Type.Node, nodeClass);
InternalToJava.put(Type.Node, nodeListClass);
- InternalToJava.put(Type.NodeSetDTM, nodeClass);
- InternalToJava.put(Type.NodeSetDTM, nodeListClass);
+ InternalToJava.put(Type.NodeSet, nodeClass);
+ InternalToJava.put(Type.NodeSet, nodeListClass);
InternalToJava.put(Type.ResultTree, nodeClass);
InternalToJava.put(Type.ResultTree, nodeListClass);
diff --git a/src/org/apache/xalan/xsltc/compiler/IdKeyPattern.java b/src/org/apache/xalan/xsltc/compiler/IdKeyPattern.java
index 10a3486..dea87c8 100644
--- a/src/org/apache/xalan/xsltc/compiler/IdKeyPattern.java
+++ b/src/org/apache/xalan/xsltc/compiler/IdKeyPattern.java
@@ -84,7 +84,7 @@
}
public Type typeCheck(SymbolTable stable) throws TypeCheckError {
- return Type.NodeSetDTM;
+ return Type.NodeSet;
}
public boolean isWildcard() {
diff --git a/src/org/apache/xalan/xsltc/compiler/Key.java b/src/org/apache/xalan/xsltc/compiler/Key.java
index 0abe46a..3ab07b2 100644
--- a/src/org/apache/xalan/xsltc/compiler/Key.java
+++ b/src/org/apache/xalan/xsltc/compiler/Key.java
@@ -131,7 +131,7 @@
_use = new CastExpr(_use, Type.String);
}
// ...or a node-set.
- else if (!(_useType instanceof NodeSetDTMType)) {
+ else if (!(_useType instanceof NodeSetType)) {
throw new TypeCheckError(this);
}
}
@@ -143,7 +143,7 @@
* node set. In this case we must traverse all nodes in the set and
* create one entry in this key's index for each node in the set.
*/
- public void traverseNodeSetDTM(ClassGenerator classGen,
+ public void traverseNodeSet(ClassGenerator classGen,
MethodGenerator methodGen,
int buildKeyIndex) {
final ConstantPoolGen cpg = classGen.getConstantPool();
@@ -260,7 +260,7 @@
else {
// Pass current node as parameter (we're indexing on that node)
il.append(methodGen.loadCurrentNode());
- traverseNodeSetDTM(classGen,methodGen,key);
+ traverseNodeSet(classGen,methodGen,key);
}
// Get the next node from the iterator and do loop again...
diff --git a/src/org/apache/xalan/xsltc/compiler/KeyCall.java b/src/org/apache/xalan/xsltc/compiler/KeyCall.java
index 4e7180c..9c44688 100644
--- a/src/org/apache/xalan/xsltc/compiler/KeyCall.java
+++ b/src/org/apache/xalan/xsltc/compiler/KeyCall.java
@@ -77,7 +77,7 @@
/**
* Get the parameters passed to function:
* key(String name, String value)
- * key(String name, NodeSetDTM value)
+ * key(String name, NodeSet value)
*/
public KeyCall(QName fname, Vector arguments) {
super(fname, arguments);
@@ -118,7 +118,7 @@
// be added to the resulting node-set.
_valueType = _value.typeCheck(stable);
- if ((_valueType != Type.NodeSetDTM) &&
+ if ((_valueType != Type.NodeSet) &&
(_valueType != Type.ResultTree) &&
(_valueType != Type.String)) {
_value = new CastExpr(_value,Type.String);
@@ -180,7 +180,7 @@
// If the second paramter is a node-set we need to go through each
// node in the set, convert each one to a string and do a look up in
// the named index, and then merge all the resulting node sets.
- if (_valueType == Type.NodeSetDTM || _valueType == Type.ResultTree) {
+ if (_valueType == Type.NodeSet || _valueType == Type.ResultTree) {
// Save current node and current iterator on the stack
il.append(methodGen.loadCurrentNode());
il.append(methodGen.loadIterator());
diff --git a/src/org/apache/xalan/xsltc/compiler/NameBase.java b/src/org/apache/xalan/xsltc/compiler/NameBase.java
index 75c972f..1338188 100644
--- a/src/org/apache/xalan/xsltc/compiler/NameBase.java
+++ b/src/org/apache/xalan/xsltc/compiler/NameBase.java
@@ -107,7 +107,7 @@
throw new TypeCheckError(this);
}
- if ((_type != Type.NodeSetDTM) && (_type != Type.Node))
+ if ((_type != Type.NodeSet) && (_type != Type.Node))
throw new TypeCheckError(this);
return Type.String;
diff --git a/src/org/apache/xalan/xsltc/compiler/ParentLocationPath.java b/src/org/apache/xalan/xsltc/compiler/ParentLocationPath.java
index 4db8b05..052f727 100644
--- a/src/org/apache/xalan/xsltc/compiler/ParentLocationPath.java
+++ b/src/org/apache/xalan/xsltc/compiler/ParentLocationPath.java
@@ -110,7 +110,7 @@
if (descendantAxis() && _path.descendantAxis())
_orderNodes = true;
- return _type = Type.NodeSetDTM;
+ return _type = Type.NodeSet;
}
public boolean descendantAxis() {
diff --git a/src/org/apache/xalan/xsltc/compiler/Parser.java b/src/org/apache/xalan/xsltc/compiler/Parser.java
index 6df18d0..10c339c 100644
--- a/src/org/apache/xalan/xsltc/compiler/Parser.java
+++ b/src/org/apache/xalan/xsltc/compiler/Parser.java
@@ -584,25 +584,25 @@
MethodType I_V = new MethodType(Type.Int, Type.Void);
MethodType I_R = new MethodType(Type.Int, Type.Real);
MethodType I_S = new MethodType(Type.Int, Type.String);
- MethodType I_D = new MethodType(Type.Int, Type.NodeSetDTM);
+ MethodType I_D = new MethodType(Type.Int, Type.NodeSet);
MethodType R_I = new MethodType(Type.Real, Type.Int);
MethodType R_V = new MethodType(Type.Real, Type.Void);
MethodType R_R = new MethodType(Type.Real, Type.Real);
- MethodType R_D = new MethodType(Type.Real, Type.NodeSetDTM);
+ MethodType R_D = new MethodType(Type.Real, Type.NodeSet);
MethodType R_O = new MethodType(Type.Real, Type.Reference);
MethodType I_I = new MethodType(Type.Int, Type.Int);
- MethodType D_O = new MethodType(Type.NodeSetDTM, Type.Reference);
- MethodType D_SS = new MethodType(Type.NodeSetDTM,
+ MethodType D_O = new MethodType(Type.NodeSet, Type.Reference);
+ MethodType D_SS = new MethodType(Type.NodeSet,
Type.String, Type.String);
- MethodType D_SD = new MethodType(Type.NodeSetDTM,
- Type.String, Type.NodeSetDTM);
- MethodType D_S = new MethodType(Type.NodeSetDTM, Type.String);
- MethodType D_D = new MethodType(Type.NodeSetDTM, Type.NodeSetDTM);
+ MethodType D_SD = new MethodType(Type.NodeSet,
+ Type.String, Type.NodeSet);
+ MethodType D_S = new MethodType(Type.NodeSet, Type.String);
+ MethodType D_D = new MethodType(Type.NodeSet, Type.NodeSet);
MethodType A_V = new MethodType(Type.Node, Type.Void);
MethodType S_V = new MethodType(Type.String, Type.Void);
MethodType S_S = new MethodType(Type.String, Type.String);
MethodType S_A = new MethodType(Type.String, Type.Node);
- MethodType S_D = new MethodType(Type.String, Type.NodeSetDTM);
+ MethodType S_D = new MethodType(Type.String, Type.NodeSet);
MethodType S_O = new MethodType(Type.String, Type.Reference);
MethodType B_O = new MethodType(Type.Boolean, Type.Reference);
MethodType B_V = new MethodType(Type.Boolean, Type.Void);
@@ -619,7 +619,7 @@
MethodType S_SS = new MethodType(Type.String, Type.String,
Type.String);
MethodType S_SD = new MethodType(Type.String, Type.String,
- Type.NodeSetDTM);
+ Type.NodeSet);
MethodType S_DS = new MethodType(Type.String, Type.Real, Type.String);
MethodType S_DSS = new MethodType(Type.String, Type.Real, Type.String,
Type.String);
diff --git a/src/org/apache/xalan/xsltc/compiler/Predicate.java b/src/org/apache/xalan/xsltc/compiler/Predicate.java
index c9783b7..dcb0f20 100644
--- a/src/org/apache/xalan/xsltc/compiler/Predicate.java
+++ b/src/org/apache/xalan/xsltc/compiler/Predicate.java
@@ -190,11 +190,11 @@
(parent instanceof AbsoluteLocationPath)) {
// TODO: Special case for "//*[n]" pattern....
_nthDescendant = true;
- return _type = Type.NodeSetDTM;
+ return _type = Type.NodeSet;
}
}
_nthPositionFilter = true;
- return _type = Type.NodeSetDTM;
+ return _type = Type.NodeSet;
}
}
else if (texp instanceof BooleanType == false) {
diff --git a/src/org/apache/xalan/xsltc/compiler/RelationalExpr.java b/src/org/apache/xalan/xsltc/compiler/RelationalExpr.java
index 7f66480..dd934be 100644
--- a/src/org/apache/xalan/xsltc/compiler/RelationalExpr.java
+++ b/src/org/apache/xalan/xsltc/compiler/RelationalExpr.java
@@ -95,9 +95,9 @@
_right.getType() instanceof NodeType;
}
- public boolean hasNodeSetDTMArgs() {
- return _left.getType() instanceof NodeSetDTMType ||
- _right.getType() instanceof NodeSetDTMType;
+ public boolean hasNodeSetArgs() {
+ return _left.getType() instanceof NodeSetType ||
+ _right.getType() instanceof NodeSetType;
}
public Type typeCheck(SymbolTable stable) throws TypeCheckError {
@@ -116,9 +116,9 @@
return _type = Type.Boolean;
}
- if (hasNodeSetDTMArgs()) {
+ if (hasNodeSetArgs()) {
// Ensure that the node-set is the left argument
- if (tright instanceof NodeSetDTMType) {
+ if (tright instanceof NodeSetType) {
final Expression temp = _right; _right = _left; _left = temp;
_op = (_op == Operators.GT) ? Operators.LT :
(_op == Operators.LT) ? Operators.GT :
@@ -128,7 +128,7 @@
// Promote nodes to node sets
if (tright instanceof NodeType) {
- _right = new CastExpr(_right, Type.NodeSetDTM);
+ _right = new CastExpr(_right, Type.NodeSet);
}
// Promote integer to doubles to have fewer compares
@@ -170,7 +170,7 @@
}
public void translate(ClassGenerator classGen, MethodGenerator methodGen) {
- if (hasNodeSetDTMArgs() || hasReferenceArgs()) {
+ if (hasNodeSetArgs() || hasReferenceArgs()) {
final ConstantPoolGen cpg = classGen.getConstantPool();
final InstructionList il = methodGen.getInstructionList();
@@ -202,7 +202,7 @@
public void translateDesynthesized(ClassGenerator classGen,
MethodGenerator methodGen) {
- if (hasNodeSetDTMArgs() || hasReferenceArgs()) {
+ if (hasNodeSetArgs() || hasReferenceArgs()) {
translate(classGen, methodGen);
desynthesize(classGen, methodGen);
}
diff --git a/src/org/apache/xalan/xsltc/compiler/Step.java b/src/org/apache/xalan/xsltc/compiler/Step.java
index 172c41e..1c7bb10 100644
--- a/src/org/apache/xalan/xsltc/compiler/Step.java
+++ b/src/org/apache/xalan/xsltc/compiler/Step.java
@@ -202,7 +202,7 @@
_type = Type.Node;
}
else if (isAbbreviatedDDot()) {
- _type = Type.NodeSetDTM;
+ _type = Type.NodeSet;
}
else {
// Special case for '@attr' with no parent or predicates
@@ -213,7 +213,7 @@
_type = Type.Node;
}
else {
- _type = Type.NodeSetDTM;
+ _type = Type.NodeSet;
}
}
if (_predicates != null) {
@@ -254,7 +254,7 @@
il.append(new INVOKEVIRTUAL(gattr));
// If it is the case '@attr[P_1]...[P_k]'
- if (_type instanceof NodeSetDTMType) {
+ if (_type instanceof NodeSetType) {
Type.Node.translateTo(classGen, methodGen, _type);
}
return;
diff --git a/src/org/apache/xalan/xsltc/compiler/UnionPathExpr.java b/src/org/apache/xalan/xsltc/compiler/UnionPathExpr.java
index 49558ff..008de01 100644
--- a/src/org/apache/xalan/xsltc/compiler/UnionPathExpr.java
+++ b/src/org/apache/xalan/xsltc/compiler/UnionPathExpr.java
@@ -98,11 +98,11 @@
public Type typeCheck(SymbolTable stable) throws TypeCheckError {
final int length = _components.length;
for (int i = 0; i < length; i++) {
- if (_components[i].typeCheck(stable) != Type.NodeSetDTM) {
- _components[i] = new CastExpr(_components[i], Type.NodeSetDTM);
+ if (_components[i].typeCheck(stable) != Type.NodeSet) {
+ _components[i] = new CastExpr(_components[i], Type.NodeSet);
}
}
- return _type = Type.NodeSetDTM;
+ return _type = Type.NodeSet;
}
public String toString() {
diff --git a/src/org/apache/xalan/xsltc/compiler/util/NodeSetType.java b/src/org/apache/xalan/xsltc/compiler/util/NodeSetType.java
index 5680bd5..1f6ed4a 100644
--- a/src/org/apache/xalan/xsltc/compiler/util/NodeSetType.java
+++ b/src/org/apache/xalan/xsltc/compiler/util/NodeSetType.java
@@ -68,8 +68,8 @@
import org.apache.xalan.xsltc.compiler.Parser;
import org.apache.xalan.xsltc.compiler.FlowList;
-public final class NodeSetDTMType extends Type {
- protected NodeSetDTMType() {}
+public final class NodeSetType extends Type {
+ protected NodeSetType() {}
public String toString() {
return "node-set";
diff --git a/src/org/apache/xalan/xsltc/compiler/util/NodeType.java b/src/org/apache/xalan/xsltc/compiler/util/NodeType.java
index 09dab79..bd9ca8a 100644
--- a/src/org/apache/xalan/xsltc/compiler/util/NodeType.java
+++ b/src/org/apache/xalan/xsltc/compiler/util/NodeType.java
@@ -122,8 +122,8 @@
else if (type == Type.Real) {
translateTo(classGen, methodGen, (RealType) type);
}
- else if (type == Type.NodeSetDTM) {
- translateTo(classGen, methodGen, (NodeSetDTMType) type);
+ else if (type == Type.NodeSet) {
+ translateTo(classGen, methodGen, (NodeSetType) type);
}
else if (type == Type.Reference) {
translateTo(classGen, methodGen, (ReferenceType) type);
@@ -210,7 +210,7 @@
* @see org.apache.xalan.xsltc.compiler.util.Type#translateTo
*/
public void translateTo(ClassGenerator classGen, MethodGenerator methodGen,
- NodeSetDTMType type) {
+ NodeSetType type) {
ConstantPoolGen cpg = classGen.getConstantPool();
InstructionList il = methodGen.getInstructionList();
diff --git a/src/org/apache/xalan/xsltc/compiler/util/ReferenceType.java b/src/org/apache/xalan/xsltc/compiler/util/ReferenceType.java
index 219e37a..1234836 100644
--- a/src/org/apache/xalan/xsltc/compiler/util/ReferenceType.java
+++ b/src/org/apache/xalan/xsltc/compiler/util/ReferenceType.java
@@ -105,8 +105,8 @@
else if (type == Type.Boolean) {
translateTo(classGen, methodGen, (BooleanType) type);
}
- else if (type == Type.NodeSetDTM) {
- translateTo(classGen, methodGen, (NodeSetDTMType) type);
+ else if (type == Type.NodeSet) {
+ translateTo(classGen, methodGen, (NodeSetType) type);
}
else {
classGen.getParser().internalError(); // undefined
@@ -178,10 +178,10 @@
* @see org.apache.xalan.xsltc.compiler.util.Type#translateTo
*/
public void translateTo(ClassGenerator classGen, MethodGenerator methodGen,
- NodeSetDTMType type) {
+ NodeSetType type) {
final ConstantPoolGen cpg = classGen.getConstantPool();
final InstructionList il = methodGen.getInstructionList();
- int index = cpg.addMethodref(BASIS_LIBRARY_CLASS, "referenceToNodeSetDTM",
+ int index = cpg.addMethodref(BASIS_LIBRARY_CLASS, "referenceToNodeSet",
"("
+ OBJECT_SIG
+ ")"
diff --git a/src/org/apache/xalan/xsltc/compiler/util/ResultTreeType.java b/src/org/apache/xalan/xsltc/compiler/util/ResultTreeType.java
index c4b04f2..2e8b493 100644
--- a/src/org/apache/xalan/xsltc/compiler/util/ResultTreeType.java
+++ b/src/org/apache/xalan/xsltc/compiler/util/ResultTreeType.java
@@ -123,8 +123,8 @@
else if (type == Type.Real) {
translateTo(classGen, methodGen, (RealType)type);
}
- else if (type == Type.NodeSetDTM) {
- translateTo(classGen, methodGen, (NodeSetDTMType)type);
+ else if (type == Type.NodeSet) {
+ translateTo(classGen, methodGen, (NodeSetType)type);
}
else if (type == Type.Reference) {
translateTo(classGen, methodGen, (ReferenceType)type);
@@ -312,7 +312,7 @@
* @see org.apache.xalan.xsltc.compiler.util.Type#translateTo
*/
public void translateTo(ClassGenerator classGen, MethodGenerator methodGen,
- NodeSetDTMType type) {
+ NodeSetType type) {
classGen.getParser().notYetImplemented("result-tree -> node-set conversion");
}
@@ -343,8 +343,8 @@
final String className = clazz.getName();
if (className.equals("org.w3c.dom.Node") ||
className.equals("org.w3c.dom.NodeList")) {
- translateTo(classGen, methodGen, Type.NodeSetDTM);
- Type.NodeSetDTM.translateTo(classGen, methodGen, clazz);
+ translateTo(classGen, methodGen, Type.NodeSet);
+ Type.NodeSet.translateTo(classGen, methodGen, clazz);
}
else {
classGen.getParser().internalError(); // undefined
diff --git a/src/org/apache/xalan/xsltc/compiler/util/Type.java b/src/org/apache/xalan/xsltc/compiler/util/Type.java
index 044df23..fe4c2fc 100644
--- a/src/org/apache/xalan/xsltc/compiler/util/Type.java
+++ b/src/org/apache/xalan/xsltc/compiler/util/Type.java
@@ -74,7 +74,7 @@
public static final Type Int = new IntType();
public static final Type Real = new RealType();
public static final Type Boolean = new BooleanType();
- public static final Type NodeSetDTM = new NodeSetDTMType();
+ public static final Type NodeSet = new NodeSetType();
public static final Type String = new StringType();
public static final Type ResultTree = new ResultTreeType();
public static final Type Reference = new ReferenceType();
diff --git a/src/org/apache/xalan/xsltc/dom/UnionIterator.java b/src/org/apache/xalan/xsltc/dom/UnionIterator.java
index 10e6cef..b7474ea 100644
--- a/src/org/apache/xalan/xsltc/dom/UnionIterator.java
+++ b/src/org/apache/xalan/xsltc/dom/UnionIterator.java
@@ -69,7 +69,7 @@
/**
* UnionIterator takes a set of NodeIterators and produces
- * a merged NodeSetDTM in document order with duplicates removed
+ * a merged NodeSet in document order with duplicates removed
* The individual iterators are supposed to generate nodes
* in document order
*/
diff --git a/src/org/apache/xalan/xsltc/runtime/BasisLibrary.java b/src/org/apache/xalan/xsltc/runtime/BasisLibrary.java
index 8996a2b..05f7250 100644
--- a/src/org/apache/xalan/xsltc/runtime/BasisLibrary.java
+++ b/src/org/apache/xalan/xsltc/runtime/BasisLibrary.java
@@ -818,7 +818,7 @@
* Utility function: used to convert references to node-sets. If the
* obj is an instanceof Node then create a singleton iterator.
*/
- public static NodeIterator referenceToNodeSetDTM(Object obj) {
+ public static NodeIterator referenceToNodeSet(Object obj) {
try {
return (obj instanceof Node == false)
? (NodeIterator) obj
