tmiller 02/02/01 12:07:13
Modified: java/src/org/apache/xalan/xsltc/compiler
AttributeValueTemplate.java
AbsoluteLocationPath.java AbsolutePathPattern.java
AlternativePattern.java AncestorPattern.java
ApplyImports.java ApplyTemplates.java
AttributeSet.java BooleanCall.java BinOpExpr.java
BooleanExpr.java CallTemplate.java CastExpr.java
CeilingCall.java Choose.java Comment.java
DecimalFormatting.java ConcatCall.java
Constants.java ContainsCall.java Copy.java
CopyOf.java CurrentCall.java DocumentCall.java
EqualityExpr.java Import.java If.java
ElementAvailableCall.java Expression.java
Fallback.java FilterExpr.java FilterParentPath.java
FloorCall.java FlowList.java ForEach.java
FormatNumberCall.java FunctionAvailableCall.java
FunctionCall.java GenerateIdCall.java
IdKeyPattern.java Include.java IntExpr.java
Key.java KeyCall.java LangCall.java LastCall.java
LiteralAttribute.java LiteralElement.java
LiteralExpr.java LocalNameCall.java
NamespaceAlias.java LogicalExpr.java Message.java
Mode.java NameBase.java NameCall.java
NamespaceUriCall.java NotCall.java Number.java
NumberCall.java Output.java Param.java
ParentLocationPath.java ParameterRef.java
ParentPattern.java PositionCall.java
RelationalExpr.java Predicate.java Sort.java
ProcessingInstruction.java RealExpr.java
VariableRef.java RoundCall.java ValueOf.java
SimpleAttributeValue.java StartsWithCall.java
Stylesheet.java StringCall.java
StringLengthCall.java StepPattern.java
Template.java TestSeq.java Text.java
TopLevelElement.java TransletOutput.java
UnaryOpExpr.java UnionPathExpr.java
UnparsedEntityUriCall.java UseAttributeSets.java
LongExpr.java Variable.java Whitespace.java
XslAttribute.java WithParam.java XSLTC.java
XslElement.java UnsupportedElement.java
VariableBase.java VariableRefBase.java
FilteredAbsoluteLocationPath.java
SyntaxTreeNode.java Step.java UnresolvedRef.java
ProcessingInstructionPattern.java
Log:
changed de.fub.bytecode to org.apache.bcel
Revision Changes Path
1.5 +3 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/AttributeValueTemplate.java
Index: AttributeValueTemplate.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/AttributeValueTemplate.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AttributeValueTemplate.java 8 Nov 2001 10:23:39 -0000 1.4
+++ AttributeValueTemplate.java 1 Feb 2002 20:07:08 -0000 1.5
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: AttributeValueTemplate.java,v 1.4 2001/11/08 10:23:39 morten Exp
$
+ * @(#)$Id: AttributeValueTemplate.java,v 1.5 2002/02/01 20:07:08 tmiller
Exp $
*
* The Apache Software License, Version 1.1
*
@@ -66,8 +66,8 @@
import java.util.Vector;
import java.util.Enumeration;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.Instruction;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.Instruction;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class AttributeValueTemplate extends AttributeValue {
1.5 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/AbsoluteLocationPath.java
Index: AbsoluteLocationPath.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/AbsoluteLocationPath.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbsoluteLocationPath.java 27 Aug 2001 09:07:19 -0000 1.4
+++ AbsoluteLocationPath.java 1 Feb 2002 20:07:08 -0000 1.5
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: AbsoluteLocationPath.java,v 1.4 2001/08/27 09:07:19 morten Exp $
+ * @(#)$Id: AbsoluteLocationPath.java,v 1.5 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -64,7 +64,7 @@
package org.apache.xalan.xsltc.compiler;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class AbsoluteLocationPath extends Expression {
1.5 +2 -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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbsolutePathPattern.java 10 Oct 2001 09:16:38 -0000 1.4
+++ AbsolutePathPattern.java 1 Feb 2002 20:07:08 -0000 1.5
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: AbsolutePathPattern.java,v 1.4 2001/10/10 09:16:38 morten Exp $
+ * @(#)$Id: AbsolutePathPattern.java,v 1.5 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -67,7 +67,7 @@
import org.apache.xalan.xsltc.DOM;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class AbsolutePathPattern extends LocationPathPattern {
1.2 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/AlternativePattern.java
Index: AlternativePattern.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/AlternativePattern.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AlternativePattern.java 17 Apr 2001 18:51:18 -0000 1.1
+++ AlternativePattern.java 1 Feb 2002 20:07:08 -0000 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: AlternativePattern.java,v 1.1 2001/04/17 18:51:18 sboag Exp $
+ * @(#)$Id: AlternativePattern.java,v 1.2 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -64,7 +64,7 @@
package org.apache.xalan.xsltc.compiler;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class AlternativePattern extends Pattern {
1.4 +4 -4
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/AncestorPattern.java
Index: AncestorPattern.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/AncestorPattern.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AncestorPattern.java 27 Aug 2001 09:07:19 -0000 1.3
+++ AncestorPattern.java 1 Feb 2002 20:07:08 -0000 1.4
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: AncestorPattern.java,v 1.3 2001/08/27 09:07:19 morten Exp $
+ * @(#)$Id: AncestorPattern.java,v 1.4 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -65,7 +65,7 @@
package org.apache.xalan.xsltc.compiler;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class AncestorPattern extends RelativePathPattern {
@@ -119,9 +119,9 @@
Util.getJCRefType(NODE_SIG),
il.getEnd());
- final de.fub.bytecode.generic.Instruction loadLocal =
+ final org.apache.bcel.generic.Instruction loadLocal =
new ILOAD(local.getIndex());
- final de.fub.bytecode.generic.Instruction storeLocal =
+ final org.apache.bcel.generic.Instruction storeLocal =
new ISTORE(local.getIndex());
if (_right instanceof StepPattern) {
1.9 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ApplyImports.java
Index: ApplyImports.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ApplyImports.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ApplyImports.java 26 Oct 2001 08:07:01 -0000 1.8
+++ ApplyImports.java 1 Feb 2002 20:07:08 -0000 1.9
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: ApplyImports.java,v 1.8 2001/10/26 08:07:01 morten Exp $
+ * @(#)$Id: ApplyImports.java,v 1.9 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -67,7 +67,7 @@
import org.apache.xalan.xsltc.compiler.util.Type;
import org.apache.xalan.xsltc.compiler.util.ReferenceType;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
1.11 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ApplyTemplates.java
Index: ApplyTemplates.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ApplyTemplates.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ApplyTemplates.java 21 Nov 2001 11:38:20 -0000 1.10
+++ ApplyTemplates.java 1 Feb 2002 20:07:08 -0000 1.11
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: ApplyTemplates.java,v 1.10 2001/11/21 11:38:20 morten Exp $
+ * @(#)$Id: ApplyTemplates.java,v 1.11 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -72,7 +72,7 @@
import org.apache.xalan.xsltc.compiler.util.Type;
import org.apache.xalan.xsltc.compiler.util.ReferenceType;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
1.10 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/AttributeSet.java
Index: AttributeSet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/AttributeSet.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AttributeSet.java 27 Nov 2001 14:42:02 -0000 1.9
+++ AttributeSet.java 1 Feb 2002 20:07:08 -0000 1.10
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: AttributeSet.java,v 1.9 2001/11/27 14:42:02 morten Exp $
+ * @(#)$Id: AttributeSet.java,v 1.10 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -73,7 +73,7 @@
import org.xml.sax.*;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class AttributeSet extends TopLevelElement {
1.3 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/BooleanCall.java
Index: BooleanCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/BooleanCall.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BooleanCall.java 12 Sep 2001 14:30:46 -0000 1.2
+++ BooleanCall.java 1 Feb 2002 20:07:08 -0000 1.3
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: BooleanCall.java,v 1.2 2001/09/12 14:30:46 morten Exp $
+ * @(#)$Id: BooleanCall.java,v 1.3 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -65,7 +65,7 @@
import java.util.Vector;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class BooleanCall extends FunctionCall {
1.7 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/BinOpExpr.java
Index: BinOpExpr.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/BinOpExpr.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BinOpExpr.java 6 Nov 2001 13:42:04 -0000 1.6
+++ BinOpExpr.java 1 Feb 2002 20:07:08 -0000 1.7
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: BinOpExpr.java,v 1.6 2001/11/06 13:42:04 morten Exp $
+ * @(#)$Id: BinOpExpr.java,v 1.7 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -64,7 +64,7 @@
package org.apache.xalan.xsltc.compiler;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class BinOpExpr extends Expression {
1.3 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/BooleanExpr.java
Index: BooleanExpr.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/BooleanExpr.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BooleanExpr.java 27 Aug 2001 09:07:19 -0000 1.2
+++ BooleanExpr.java 1 Feb 2002 20:07:08 -0000 1.3
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: BooleanExpr.java,v 1.2 2001/08/27 09:07:19 morten Exp $
+ * @(#)$Id: BooleanExpr.java,v 1.3 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -64,7 +64,7 @@
package org.apache.xalan.xsltc.compiler;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
/**
1.9 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/CallTemplate.java
Index: CallTemplate.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/CallTemplate.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CallTemplate.java 30 Oct 2001 08:42:55 -0000 1.8
+++ CallTemplate.java 1 Feb 2002 20:07:08 -0000 1.9
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: CallTemplate.java,v 1.8 2001/10/30 08:42:55 morten Exp $
+ * @(#)$Id: CallTemplate.java,v 1.9 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -69,7 +69,7 @@
import org.xml.sax.*;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class CallTemplate extends Instruction {
1.10 +2 -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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CastExpr.java 29 Nov 2001 11:33:09 -0000 1.9
+++ CastExpr.java 1 Feb 2002 20:07:08 -0000 1.10
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: CastExpr.java,v 1.9 2001/11/29 11:33:09 morten Exp $
+ * @(#)$Id: CastExpr.java,v 1.10 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -68,7 +68,7 @@
import org.apache.xalan.xsltc.dom.Axis;
import org.apache.xalan.xsltc.compiler.util.Type;
import org.apache.xalan.xsltc.compiler.util.ReferenceType;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class CastExpr extends Expression {
1.2 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/CeilingCall.java
Index: CeilingCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/CeilingCall.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CeilingCall.java 17 Apr 2001 18:51:22 -0000 1.1
+++ CeilingCall.java 1 Feb 2002 20:07:08 -0000 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: CeilingCall.java,v 1.1 2001/04/17 18:51:22 sboag Exp $
+ * @(#)$Id: CeilingCall.java,v 1.2 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -64,7 +64,7 @@
package org.apache.xalan.xsltc.compiler;
import java.util.Vector;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class CeilingCall extends FunctionCall {
1.6 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Choose.java
Index: Choose.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Choose.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Choose.java 22 Nov 2001 13:08:23 -0000 1.5
+++ Choose.java 1 Feb 2002 20:07:08 -0000 1.6
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Choose.java,v 1.5 2001/11/22 13:08:23 morten Exp $
+ * @(#)$Id: Choose.java,v 1.6 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -68,7 +68,7 @@
import java.util.Enumeration;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class Choose extends Instruction {
1.4 +3 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Comment.java
Index: Comment.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Comment.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Comment.java 6 Jun 2001 10:44:44 -0000 1.3
+++ Comment.java 1 Feb 2002 20:07:08 -0000 1.4
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Comment.java,v 1.3 2001/06/06 10:44:44 morten Exp $
+ * @(#)$Id: Comment.java,v 1.4 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -73,8 +73,8 @@
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
-import de.fub.bytecode.classfile.JavaClass;
+import org.apache.bcel.generic.*;
+import org.apache.bcel.classfile.JavaClass;
import org.apache.xalan.xsltc.compiler.util.*;
1.8 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/DecimalFormatting.java
Index: DecimalFormatting.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/DecimalFormatting.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DecimalFormatting.java 29 Nov 2001 12:51:31 -0000 1.7
+++ DecimalFormatting.java 1 Feb 2002 20:07:08 -0000 1.8
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: DecimalFormatting.java,v 1.7 2001/11/29 12:51:31 morten Exp $
+ * @(#)$Id: DecimalFormatting.java,v 1.8 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -70,7 +70,7 @@
import org.apache.xalan.xsltc.compiler.util.Type;
import org.apache.xalan.xsltc.compiler.util.ReferenceType;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
1.4 +3 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ConcatCall.java
Index: ConcatCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ConcatCall.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ConcatCall.java 30 Oct 2001 08:42:55 -0000 1.3
+++ ConcatCall.java 1 Feb 2002 20:07:08 -0000 1.4
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: ConcatCall.java,v 1.3 2001/10/30 08:42:55 morten Exp $
+ * @(#)$Id: ConcatCall.java,v 1.4 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -66,8 +66,8 @@
import java.util.Vector;
import java.util.Enumeration;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.Instruction;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.Instruction;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class ConcatCall extends FunctionCall {
1.18 +7 -7
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Constants.java
Index: Constants.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Constants.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Constants.java 22 Nov 2001 14:13:21 -0000 1.17
+++ Constants.java 1 Feb 2002 20:07:08 -0000 1.18
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Constants.java,v 1.17 2001/11/22 14:13:21 morten Exp $
+ * @(#)$Id: Constants.java,v 1.18 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -63,7 +63,7 @@
package org.apache.xalan.xsltc.compiler;
-import de.fub.bytecode.generic.InstructionConstants;
+import org.apache.bcel.generic.InstructionConstants;
public interface Constants extends InstructionConstants {
@@ -118,15 +118,15 @@
= "java.lang.String";
public static final int ACC_PUBLIC
- = de.fub.bytecode.Constants.ACC_PUBLIC;
+ = org.apache.bcel.Constants.ACC_PUBLIC;
public static final int ACC_SUPER
- = de.fub.bytecode.Constants.ACC_SUPER;
+ = org.apache.bcel.Constants.ACC_SUPER;
public static final int ACC_FINAL
- = de.fub.bytecode.Constants.ACC_FINAL;
+ = org.apache.bcel.Constants.ACC_FINAL;
public static final int ACC_PRIVATE
- = de.fub.bytecode.Constants.ACC_PRIVATE;
+ = org.apache.bcel.Constants.ACC_PRIVATE;
public static final int ACC_PROTECTED
- = de.fub.bytecode.Constants.ACC_PROTECTED;
+ = org.apache.bcel.Constants.ACC_PROTECTED;
public static final String STRING_SIG
= "Ljava/lang/String;";
1.4 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ContainsCall.java
Index: ContainsCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ContainsCall.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ContainsCall.java 30 Oct 2001 08:42:55 -0000 1.3
+++ ContainsCall.java 1 Feb 2002 20:07:08 -0000 1.4
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: ContainsCall.java,v 1.3 2001/10/30 08:42:55 morten Exp $
+ * @(#)$Id: ContainsCall.java,v 1.4 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -68,7 +68,7 @@
import org.apache.xalan.xsltc.compiler.util.Type;
import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class ContainsCall extends FunctionCall {
1.7 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Copy.java
Index: Copy.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Copy.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Copy.java 27 Aug 2001 09:07:19 -0000 1.6
+++ Copy.java 1 Feb 2002 20:07:08 -0000 1.7
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Copy.java,v 1.6 2001/08/27 09:07:19 morten Exp $
+ * @(#)$Id: Copy.java,v 1.7 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -72,7 +72,7 @@
import org.xml.sax.*;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class Copy extends Instruction {
1.10 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/CopyOf.java
Index: CopyOf.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/CopyOf.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CopyOf.java 30 Oct 2001 08:42:55 -0000 1.9
+++ CopyOf.java 1 Feb 2002 20:07:08 -0000 1.10
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: CopyOf.java,v 1.9 2001/10/30 08:42:55 morten Exp $
+ * @(#)$Id: CopyOf.java,v 1.10 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -69,7 +69,7 @@
import org.apache.xalan.xsltc.compiler.util.Type;
import org.apache.xalan.xsltc.compiler.util.ReferenceType;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class CopyOf extends Instruction {
1.2 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/CurrentCall.java
Index: CurrentCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/CurrentCall.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CurrentCall.java 17 Apr 2001 18:51:25 -0000 1.1
+++ CurrentCall.java 1 Feb 2002 20:07:08 -0000 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: CurrentCall.java,v 1.1 2001/04/17 18:51:25 sboag Exp $
+ * @(#)$Id: CurrentCall.java,v 1.2 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -63,7 +63,7 @@
package org.apache.xalan.xsltc.compiler;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class CurrentCall extends FunctionCall {
1.12 +3 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/DocumentCall.java
Index: DocumentCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/DocumentCall.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DocumentCall.java 30 Oct 2001 08:42:55 -0000 1.11
+++ DocumentCall.java 1 Feb 2002 20:07:08 -0000 1.12
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: DocumentCall.java,v 1.11 2001/10/30 08:42:55 morten Exp $
+ * @(#)$Id: DocumentCall.java,v 1.12 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -68,8 +68,8 @@
import org.apache.xalan.xsltc.compiler.util.Type;
import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import de.fub.bytecode.generic.Instruction;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.Instruction;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class DocumentCall extends FunctionCall {
1.8 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/EqualityExpr.java
Index: EqualityExpr.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/EqualityExpr.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- EqualityExpr.java 29 Nov 2001 11:33:09 -0000 1.7
+++ EqualityExpr.java 1 Feb 2002 20:07:08 -0000 1.8
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: EqualityExpr.java,v 1.7 2001/11/29 11:33:09 morten Exp $
+ * @(#)$Id: EqualityExpr.java,v 1.8 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -68,7 +68,7 @@
import org.apache.xalan.xsltc.compiler.util.Type;
import org.apache.xalan.xsltc.compiler.util.ReferenceType;
import org.apache.xalan.xsltc.runtime.Operators;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class EqualityExpr extends Expression implements Operators {
1.14 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Import.java
Index: Import.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Import.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Import.java 31 Oct 2001 07:29:38 -0000 1.13
+++ Import.java 1 Feb 2002 20:07:08 -0000 1.14
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Import.java,v 1.13 2001/10/31 07:29:38 morten Exp $
+ * @(#)$Id: Import.java,v 1.14 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -77,7 +77,7 @@
import org.apache.xalan.xsltc.compiler.util.Type;
import org.apache.xalan.xsltc.compiler.util.*;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
final class Import extends TopLevelElement {
1.9 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/If.java
Index: If.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/If.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- If.java 30 Oct 2001 08:42:55 -0000 1.8
+++ If.java 1 Feb 2002 20:07:08 -0000 1.9
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: If.java,v 1.8 2001/10/30 08:42:55 morten Exp $
+ * @(#)$Id: If.java,v 1.9 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -69,7 +69,7 @@
import org.xml.sax.*;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class If extends Instruction {
1.4 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ElementAvailableCall.java
Index: ElementAvailableCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ElementAvailableCall.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ElementAvailableCall.java 30 Oct 2001 08:42:55 -0000 1.3
+++ ElementAvailableCall.java 1 Feb 2002 20:07:08 -0000 1.4
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: ElementAvailableCall.java,v 1.3 2001/10/30 08:42:55 morten Exp $
+ * @(#)$Id: ElementAvailableCall.java,v 1.4 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -66,7 +66,7 @@
import java.util.Vector;
import java.util.HashSet;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class ElementAvailableCall extends FunctionCall {
1.10 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Expression.java
Index: Expression.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Expression.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Expression.java 29 Nov 2001 11:33:09 -0000 1.9
+++ Expression.java 1 Feb 2002 20:07:08 -0000 1.10
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Expression.java,v 1.9 2001/11/29 11:33:09 morten Exp $
+ * @(#)$Id: Expression.java,v 1.10 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -71,7 +71,7 @@
import java.util.Vector;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
abstract class Expression extends SyntaxTreeNode {
/**
1.4 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Fallback.java
Index: Fallback.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Fallback.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Fallback.java 6 Jun 2001 10:44:55 -0000 1.3
+++ Fallback.java 1 Feb 2002 20:07:08 -0000 1.4
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Fallback.java,v 1.3 2001/06/06 10:44:55 morten Exp $
+ * @(#)$Id: Fallback.java,v 1.4 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -71,7 +71,7 @@
import org.xml.sax.*;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class Fallback extends Instruction {
1.6 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FilterExpr.java
Index: FilterExpr.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FilterExpr.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FilterExpr.java 27 Nov 2001 15:20:55 -0000 1.5
+++ FilterExpr.java 1 Feb 2002 20:07:08 -0000 1.6
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: FilterExpr.java,v 1.5 2001/11/27 15:20:55 morten Exp $
+ * @(#)$Id: FilterExpr.java,v 1.6 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -68,7 +68,7 @@
import java.util.Enumeration;
import org.apache.xalan.xsltc.compiler.util.Type;
import org.apache.xalan.xsltc.compiler.util.ReferenceType;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
class FilterExpr extends Expression {
1.9 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FilterParentPath.java
Index: FilterParentPath.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FilterParentPath.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FilterParentPath.java 8 Nov 2001 10:23:39 -0000 1.8
+++ FilterParentPath.java 1 Feb 2002 20:07:08 -0000 1.9
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: FilterParentPath.java,v 1.8 2001/11/08 10:23:39 morten Exp $
+ * @(#)$Id: FilterParentPath.java,v 1.9 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -66,7 +66,7 @@
import org.apache.xalan.xsltc.dom.Axis;
import org.apache.xalan.xsltc.compiler.util.Type;
import org.apache.xalan.xsltc.compiler.util.ReferenceType;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class FilterParentPath extends Expression {
1.2 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FloorCall.java
Index: FloorCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FloorCall.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FloorCall.java 17 Apr 2001 18:51:28 -0000 1.1
+++ FloorCall.java 1 Feb 2002 20:07:08 -0000 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: FloorCall.java,v 1.1 2001/04/17 18:51:28 sboag Exp $
+ * @(#)$Id: FloorCall.java,v 1.2 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -64,7 +64,7 @@
package org.apache.xalan.xsltc.compiler;
import java.util.Vector;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class FloorCall extends FunctionCall {
1.2 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FlowList.java
Index: FlowList.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FlowList.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FlowList.java 17 Apr 2001 18:51:28 -0000 1.1
+++ FlowList.java 1 Feb 2002 20:07:08 -0000 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: FlowList.java,v 1.1 2001/04/17 18:51:28 sboag Exp $
+ * @(#)$Id: FlowList.java,v 1.2 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -64,7 +64,7 @@
package org.apache.xalan.xsltc.compiler;
import java.util.Vector;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
public final class FlowList {
private Vector _elements;
1.12 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ForEach.java
Index: ForEach.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ForEach.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ForEach.java 30 Oct 2001 08:42:55 -0000 1.11
+++ ForEach.java 1 Feb 2002 20:07:08 -0000 1.12
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: ForEach.java,v 1.11 2001/10/30 08:42:55 morten Exp $
+ * @(#)$Id: ForEach.java,v 1.12 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -73,7 +73,7 @@
import org.apache.xalan.xsltc.compiler.util.Type;
import org.apache.xalan.xsltc.compiler.util.ReferenceType;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class ForEach extends Instruction {
1.5 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FormatNumberCall.java
Index: FormatNumberCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FormatNumberCall.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FormatNumberCall.java 30 Oct 2001 08:42:55 -0000 1.4
+++ FormatNumberCall.java 1 Feb 2002 20:07:08 -0000 1.5
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: FormatNumberCall.java,v 1.4 2001/10/30 08:42:55 morten Exp $
+ * @(#)$Id: FormatNumberCall.java,v 1.5 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -67,7 +67,7 @@
import java.util.Vector;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class FormatNumberCall extends FunctionCall {
1.5 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FunctionAvailableCall.java
Index: FunctionAvailableCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FunctionAvailableCall.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FunctionAvailableCall.java 30 Oct 2001 08:42:55 -0000 1.4
+++ FunctionAvailableCall.java 1 Feb 2002 20:07:08 -0000 1.5
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: FunctionAvailableCall.java,v 1.4 2001/10/30 08:42:55 morten Exp $
+ * @(#)$Id: FunctionAvailableCall.java,v 1.5 2002/02/01 20:07:08 tmiller Exp
$
*
* The Apache Software License, Version 1.1
*
@@ -66,7 +66,7 @@
import java.util.Vector;
import java.util.HashSet;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class FunctionAvailableCall extends FunctionCall {
1.12 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FunctionCall.java
Index: FunctionCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FunctionCall.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FunctionCall.java 8 Nov 2001 14:11:15 -0000 1.11
+++ FunctionCall.java 1 Feb 2002 20:07:08 -0000 1.12
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: FunctionCall.java,v 1.11 2001/11/08 14:11:15 morten Exp $
+ * @(#)$Id: FunctionCall.java,v 1.12 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -72,7 +72,7 @@
import java.lang.reflect.*;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
import org.apache.xalan.xsltc.runtime.TransletLoader;
1.2 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/GenerateIdCall.java
Index: GenerateIdCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/GenerateIdCall.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GenerateIdCall.java 17 Apr 2001 18:51:31 -0000 1.1
+++ GenerateIdCall.java 1 Feb 2002 20:07:08 -0000 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: GenerateIdCall.java,v 1.1 2001/04/17 18:51:31 sboag Exp $
+ * @(#)$Id: GenerateIdCall.java,v 1.2 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -64,7 +64,7 @@
package org.apache.xalan.xsltc.compiler;
import java.util.Vector;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class GenerateIdCall extends FunctionCall {
1.6 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/IdKeyPattern.java
Index: IdKeyPattern.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/IdKeyPattern.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- IdKeyPattern.java 17 Aug 2001 13:17:44 -0000 1.5
+++ IdKeyPattern.java 1 Feb 2002 20:07:08 -0000 1.6
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: IdKeyPattern.java,v 1.5 2001/08/17 13:17:44 morten Exp $
+ * @(#)$Id: IdKeyPattern.java,v 1.6 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -63,7 +63,7 @@
package org.apache.xalan.xsltc.compiler;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.Type;
import org.apache.xalan.xsltc.compiler.util.*;
1.13 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Include.java
Index: Include.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Include.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Include.java 31 Oct 2001 07:29:38 -0000 1.12
+++ Include.java 1 Feb 2002 20:07:08 -0000 1.13
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Include.java,v 1.12 2001/10/31 07:29:38 morten Exp $
+ * @(#)$Id: Include.java,v 1.13 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -76,7 +76,7 @@
import org.apache.xalan.xsltc.compiler.util.Type;
import org.apache.xalan.xsltc.compiler.util.*;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
final class Include extends TopLevelElement {
1.2 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/IntExpr.java
Index: IntExpr.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/IntExpr.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IntExpr.java 17 Apr 2001 18:51:32 -0000 1.1
+++ IntExpr.java 1 Feb 2002 20:07:08 -0000 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: IntExpr.java,v 1.1 2001/04/17 18:51:32 sboag Exp $
+ * @(#)$Id: IntExpr.java,v 1.2 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -64,7 +64,7 @@
package org.apache.xalan.xsltc.compiler;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class IntExpr extends Expression {
1.10 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Key.java
Index: Key.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Key.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Key.java 30 Oct 2001 08:42:55 -0000 1.9
+++ Key.java 1 Feb 2002 20:07:08 -0000 1.10
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Key.java,v 1.9 2001/10/30 08:42:55 morten Exp $
+ * @(#)$Id: Key.java,v 1.10 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -66,7 +66,7 @@
import org.xml.sax.*;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
import org.apache.xalan.xsltc.compiler.util.Type;
1.7 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/KeyCall.java
Index: KeyCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/KeyCall.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- KeyCall.java 27 Aug 2001 09:07:19 -0000 1.6
+++ KeyCall.java 1 Feb 2002 20:07:08 -0000 1.7
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: KeyCall.java,v 1.6 2001/08/27 09:07:19 morten Exp $
+ * @(#)$Id: KeyCall.java,v 1.7 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -65,7 +65,7 @@
import java.util.Vector;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class KeyCall extends FunctionCall {
1.2 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/LangCall.java
Index: LangCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/LangCall.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LangCall.java 17 Apr 2001 18:51:34 -0000 1.1
+++ LangCall.java 1 Feb 2002 20:07:08 -0000 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: LangCall.java,v 1.1 2001/04/17 18:51:34 sboag Exp $
+ * @(#)$Id: LangCall.java,v 1.2 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -65,7 +65,7 @@
import java.util.Vector;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class LangCall extends FunctionCall {
1.7 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/LastCall.java
Index: LastCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/LastCall.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LastCall.java 29 Nov 2001 11:33:09 -0000 1.6
+++ LastCall.java 1 Feb 2002 20:07:08 -0000 1.7
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: LastCall.java,v 1.6 2001/11/29 11:33:09 morten Exp $
+ * @(#)$Id: LastCall.java,v 1.7 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -64,7 +64,7 @@
package org.apache.xalan.xsltc.compiler;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
import org.apache.xalan.xsltc.DOM;
import org.apache.xalan.xsltc.dom.Axis;
1.4 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/LiteralAttribute.java
Index: LiteralAttribute.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/LiteralAttribute.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LiteralAttribute.java 8 Nov 2001 10:23:39 -0000 1.3
+++ LiteralAttribute.java 1 Feb 2002 20:07:08 -0000 1.4
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: LiteralAttribute.java,v 1.3 2001/11/08 10:23:39 morten Exp $
+ * @(#)$Id: LiteralAttribute.java,v 1.4 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -65,7 +65,7 @@
package org.apache.xalan.xsltc.compiler;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class LiteralAttribute extends Instruction {
1.14 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/LiteralElement.java
Index: LiteralElement.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/LiteralElement.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- LiteralElement.java 8 Nov 2001 10:23:39 -0000 1.13
+++ LiteralElement.java 1 Feb 2002 20:07:08 -0000 1.14
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: LiteralElement.java,v 1.13 2001/11/08 10:23:39 morten Exp $
+ * @(#)$Id: LiteralElement.java,v 1.14 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -73,7 +73,7 @@
import org.xml.sax.*;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class LiteralElement extends Instruction {
1.4 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/LiteralExpr.java
Index: LiteralExpr.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/LiteralExpr.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LiteralExpr.java 8 Nov 2001 10:23:39 -0000 1.3
+++ LiteralExpr.java 1 Feb 2002 20:07:08 -0000 1.4
@@ -1,6 +1,6 @@
/*
- * @(#)$Id: LiteralExpr.java,v 1.3 2001/11/08 10:23:39 morten Exp $
+ * @(#)$Id: LiteralExpr.java,v 1.4 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -65,7 +65,7 @@
package org.apache.xalan.xsltc.compiler;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class LiteralExpr extends Expression {
1.3 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/LocalNameCall.java
Index: LocalNameCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/LocalNameCall.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LocalNameCall.java 27 Aug 2001 09:07:19 -0000 1.2
+++ LocalNameCall.java 1 Feb 2002 20:07:08 -0000 1.3
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: LocalNameCall.java,v 1.2 2001/08/27 09:07:19 morten Exp $
+ * @(#)$Id: LocalNameCall.java,v 1.3 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -65,7 +65,7 @@
import java.util.Vector;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class LocalNameCall extends NameBase {
1.4 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/NamespaceAlias.java
Index: NamespaceAlias.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/NamespaceAlias.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NamespaceAlias.java 6 Jun 2001 10:45:15 -0000 1.3
+++ NamespaceAlias.java 1 Feb 2002 20:07:08 -0000 1.4
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: NamespaceAlias.java,v 1.3 2001/06/06 10:45:15 morten Exp $
+ * @(#)$Id: NamespaceAlias.java,v 1.4 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -68,7 +68,7 @@
import java.util.StringTokenizer;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class NamespaceAlias extends TopLevelElement {
1.9 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/LogicalExpr.java
Index: LogicalExpr.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/LogicalExpr.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- LogicalExpr.java 6 Nov 2001 13:42:04 -0000 1.8
+++ LogicalExpr.java 1 Feb 2002 20:07:08 -0000 1.9
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: LogicalExpr.java,v 1.8 2001/11/06 13:42:04 morten Exp $
+ * @(#)$Id: LogicalExpr.java,v 1.9 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -65,7 +65,7 @@
package org.apache.xalan.xsltc.compiler;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class LogicalExpr extends Expression {
1.6 +3 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Message.java
Index: Message.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Message.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Message.java 26 Nov 2001 14:03:09 -0000 1.5
+++ Message.java 1 Feb 2002 20:07:08 -0000 1.6
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Message.java,v 1.5 2001/11/26 14:03:09 morten Exp $
+ * @(#)$Id: Message.java,v 1.6 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -66,8 +66,8 @@
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
-import de.fub.bytecode.classfile.JavaClass;
+import org.apache.bcel.generic.*;
+import org.apache.bcel.classfile.JavaClass;
import org.apache.xalan.xsltc.compiler.util.*;
1.19 +58 -90
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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Mode.java 20 Nov 2001 13:32:01 -0000 1.18
+++ Mode.java 1 Feb 2002 20:07:08 -0000 1.19
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Mode.java,v 1.18 2001/11/20 13:32:01 morten Exp $
+ * @(#)$Id: Mode.java,v 1.19 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -60,7 +60,7 @@
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
* @author Erwin Bolwidt <[EMAIL PROTECTED]>
- *
+ * @author G. Todd Miller
*/
package org.apache.xalan.xsltc.compiler;
@@ -71,7 +71,8 @@
import java.util.Hashtable;
import java.util.Enumeration;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
+import org.apache.bcel.util.*;
import org.apache.xalan.xsltc.compiler.util.*;
import org.apache.xalan.xsltc.DOM;
@@ -359,12 +360,12 @@
final NamedMethodGenerator methodGen =
new NamedMethodGenerator(ACC_PUBLIC,
- de.fub.bytecode.generic.Type.VOID,
- new de.fub.bytecode.generic.Type[] {
+ org.apache.bcel.generic.Type.VOID,
+ new org.apache.bcel.generic.Type[] {
Util.getJCRefType(DOM_INTF_SIG),
Util.getJCRefType(NODE_ITERATOR_SIG),
Util.getJCRefType(TRANSLET_OUTPUT_SIG),
- de.fub.bytecode.generic.Type.INT
+ org.apache.bcel.generic.Type.INT
},
new String[] {
DOCUMENT_PNAME,
@@ -590,8 +591,8 @@
final Vector names = xsltc.getNamesIndex();
// (*) Create the applyTemplates() method
- final de.fub.bytecode.generic.Type[] argTypes =
- new de.fub.bytecode.generic.Type[3];
+ final org.apache.bcel.generic.Type[] argTypes =
+ new org.apache.bcel.generic.Type[3];
argTypes[0] = Util.getJCRefType(DOM_INTF_SIG);
argTypes[1] = Util.getJCRefType(NODE_ITERATOR_SIG);
argTypes[2] = Util.getJCRefType(TRANSLET_OUTPUT_SIG);
@@ -604,7 +605,7 @@
final InstructionList mainIL = new InstructionList();
final MethodGenerator methodGen =
new MethodGenerator(ACC_PUBLIC | ACC_FINAL,
- de.fub.bytecode.generic.Type.VOID,
+ org.apache.bcel.generic.Type.VOID,
argTypes, argNames, functionName(),
getClassName(), mainIL,
classGen.getConstantPool());
@@ -613,7 +614,7 @@
// (*) Create the local variablea
final LocalVariableGen current;
current = methodGen.addLocalVariable2("current",
- de.fub.bytecode.generic.Type.INT,
+ org.apache.bcel.generic.Type.INT,
mainIL.getEnd());
_currentIndex = current.getIndex();
@@ -902,8 +903,8 @@
processPatterns(_keys);
// (*) Create the applyTemplates() method
- final de.fub.bytecode.generic.Type[] argTypes =
- new de.fub.bytecode.generic.Type[3];
+ final org.apache.bcel.generic.Type[] argTypes =
+ new org.apache.bcel.generic.Type[3];
argTypes[0] = Util.getJCRefType(DOM_INTF_SIG);
argTypes[1] = Util.getJCRefType(NODE_ITERATOR_SIG);
argTypes[2] = Util.getJCRefType(TRANSLET_OUTPUT_SIG);
@@ -916,7 +917,7 @@
final InstructionList mainIL = new InstructionList();
final MethodGenerator methodGen =
new MethodGenerator(ACC_PUBLIC | ACC_FINAL,
- de.fub.bytecode.generic.Type.VOID,
+ org.apache.bcel.generic.Type.VOID,
argTypes, argNames, functionName()+'_'+max,
getClassName(), mainIL,
classGen.getConstantPool());
@@ -938,7 +939,7 @@
// (*) Create the local variablea
final LocalVariableGen current;
current = methodGen.addLocalVariable2("current",
- de.fub.bytecode.generic.Type.INT,
+ org.apache.bcel.generic.Type.INT,
mainIL.getEnd());
_currentIndex = current.getIndex();
@@ -1159,95 +1160,62 @@
*/
private void peepHoleOptimization(MethodGenerator methodGen) {
InstructionList il = methodGen.getInstructionList();
- FindPattern find = new FindPattern(il);
+ InstructionFinder find = new InstructionFinder(il);
InstructionHandle ih;
String pattern;
- // Remove sequences of ALOAD, POP
+ // Remove seqences of ALOAD, POP (GTM)
pattern = "`ALOAD'`POP'`Instruction'";
- ih = find.search(pattern);
- while (ih != null) {
- final InstructionHandle[] match = find.getMatch();
+ for(Iterator iter=find.search(pattern); iter.hasNext();){
+ InstructionHandle[] match = (InstructionHandle[])iter.next();
try {
if ((!match[0].hasTargeters()) && (!match[1].hasTargeters())) {
- il.delete(match[0], match[1]);
- }
+ il.delete(match[0], match[1]);
+ }
}
catch (TargetLostException e) {
- // TODO: move target down into the list
- }
- ih = find.search(pattern, match[2]);
+ // TODO: move target down into the list
+ }
}
-
// Replace sequences of ILOAD_?, ALOAD_?, SWAP with ALOAD_?, ILOAD_?
- pattern = "`ILOAD__'`ALOAD__'`SWAP'`Instruction'";
- ih = find.search(pattern);
- while (ih != null) {
- final InstructionHandle[] match = find.getMatch();
- try {
- de.fub.bytecode.generic.Instruction iload;
- de.fub.bytecode.generic.Instruction aload;
- if ((!match[0].hasTargeters()) &&
- (!match[1].hasTargeters()) &&
- (!match[2].hasTargeters())) {
- iload = match[0].getInstruction();
- aload = match[1].getInstruction();
- il.insert(match[0], aload);
- il.insert(match[0], iload);
- il.delete(match[0], match[2]);
- }
- }
- catch (TargetLostException e) {
- // TODO: move target down into the list
- }
- ih = find.search(pattern, match[3]);
- }
+ pattern = "`ILOAD'`ALOAD'`SWAP'`Instruction'";
+ for(Iterator iter=find.search(pattern); iter.hasNext();){
+ InstructionHandle[] match = (InstructionHandle[])iter.next();
+ try {
+ org.apache.bcel.generic.Instruction iload;
+ org.apache.bcel.generic.Instruction aload;
+ if ((!match[0].hasTargeters()) &&
+ (!match[1].hasTargeters()) &&
+ (!match[2].hasTargeters())) {
+ iload = match[0].getInstruction();
+ aload = match[1].getInstruction();
+ il.insert(match[0], aload);
+ il.insert(match[0], iload);
+ il.delete(match[0], match[2]);
+ }
+ }
+ catch (TargetLostException e) {
+ // TODO: move target down into the list
+ }
+ }
- // Replaces sequences of ALOAD_1, ALOAD_1 with ALOAD_1, DUP
+ // Replace sequences of ALOAD_1, ALOAD_1 with ALOAD_1, DUP
pattern = "`ALOAD_1'`ALOAD_1'`Instruction'";
- ih = find.search(pattern);
- while (ih != null) {
- final InstructionHandle[] match = find.getMatch();
- try {
- de.fub.bytecode.generic.Instruction iload;
- de.fub.bytecode.generic.Instruction aload;
- if ((!match[0].hasTargeters()) && (!match[1].hasTargeters())) {
- il.insert(match[1], new DUP());
- il.delete(match[1]);
- }
- }
- catch (TargetLostException e) {
- // TODO: move target down into the list
- }
- ih = find.search(pattern, match[2]);
- }
+ for(Iterator iter=find.search(pattern); iter.hasNext();){
+ InstructionHandle[] match = (InstructionHandle[])iter.next();
+ try {
+ org.apache.bcel.generic.Instruction iload;
+ org.apache.bcel.generic.Instruction aload;
+ if ((!match[0].hasTargeters()) &&
(!match[1].hasTargeters())) {
+ il.insert(match[1], new DUP());
+ il.delete(match[1]);
+ }
+ }
+ catch (TargetLostException e) {
+ // TODO: move target down into the list
+ }
+ }
- // Removes uncessecary GOTOs
- /*
- pattern = "`GOTO'`GOTO'`Instruction'";
- ih = find.search(pattern);
- while (ih != null) {
- final InstructionHandle[] match = find.getMatch();
- try {
- de.fub.bytecode.generic.Instruction iload;
- de.fub.bytecode.generic.Instruction aload;
- InstructionTargeter tgtrs[] = match[1].getTargeters();
- if (tgtrs != null) {
- InstructionHandle newTarget =
- ((BranchHandle)match[1]).getTarget();
- for (int i=0; i<tgtrs.length; i++)
- tgtrs[i].updateTarget(match[1],newTarget);
- }
- il.delete(match[1]);
- }
- catch (TargetLostException e) {
- // TODO: move target down into the list
- }
- ih = find.search(pattern, match[2]);
- }
- */
-
-
}
public InstructionHandle getTemplateInstructionHandle(Template template)
{
1.6 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/NameBase.java
Index: NameBase.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/NameBase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NameBase.java 12 Oct 2001 12:43:40 -0000 1.5
+++ NameBase.java 1 Feb 2002 20:07:08 -0000 1.6
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: NameBase.java,v 1.5 2001/10/12 12:43:40 morten Exp $
+ * @(#)$Id: NameBase.java,v 1.6 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -66,7 +66,7 @@
import java.util.Vector;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
class NameBase extends FunctionCall {
1.3 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/NameCall.java
Index: NameCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/NameCall.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NameCall.java 27 Aug 2001 09:07:19 -0000 1.2
+++ NameCall.java 1 Feb 2002 20:07:08 -0000 1.3
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: NameCall.java,v 1.2 2001/08/27 09:07:19 morten Exp $
+ * @(#)$Id: NameCall.java,v 1.3 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -65,7 +65,7 @@
package org.apache.xalan.xsltc.compiler;
import java.util.Vector;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
import org.apache.xalan.xsltc.compiler.util.Type;
1.3 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/NamespaceUriCall.java
Index: NamespaceUriCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/NamespaceUriCall.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NamespaceUriCall.java 27 Aug 2001 09:07:19 -0000 1.2
+++ NamespaceUriCall.java 1 Feb 2002 20:07:08 -0000 1.3
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: NamespaceUriCall.java,v 1.2 2001/08/27 09:07:19 morten Exp $
+ * @(#)$Id: NamespaceUriCall.java,v 1.3 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -65,7 +65,7 @@
import java.util.Vector;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class NamespaceUriCall extends NameBase {
1.2 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/NotCall.java
Index: NotCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/NotCall.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NotCall.java 17 Apr 2001 18:51:38 -0000 1.1
+++ NotCall.java 1 Feb 2002 20:07:08 -0000 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: NotCall.java,v 1.1 2001/04/17 18:51:38 sboag Exp $
+ * @(#)$Id: NotCall.java,v 1.2 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -64,7 +64,7 @@
package org.apache.xalan.xsltc.compiler;
import java.util.Vector;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class NotCall extends FunctionCall {
1.8 +12 -12
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Number.java
Index: Number.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Number.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Number.java 31 Oct 2001 13:04:07 -0000 1.7
+++ Number.java 1 Feb 2002 20:07:08 -0000 1.8
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Number.java,v 1.7 2001/10/31 13:04:07 morten Exp $
+ * @(#)$Id: Number.java,v 1.8 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -65,9 +65,9 @@
import org.apache.xalan.xsltc.compiler.util.Type;
import org.apache.xalan.xsltc.compiler.util.ReferenceType;
-import de.fub.bytecode.classfile.JavaClass;
-import de.fub.bytecode.generic.*;
-import de.fub.bytecode.classfile.Field;
+import org.apache.bcel.classfile.JavaClass;
+import org.apache.bcel.generic.*;
+import org.apache.bcel.classfile.Field;
import org.apache.xalan.xsltc.compiler.util.*;
@@ -264,8 +264,8 @@
final ConstantPoolGen cpg = classGen.getConstantPool();
cons = new MethodGenerator(ACC_PUBLIC,
- de.fub.bytecode.generic.Type.VOID,
- new de.fub.bytecode.generic.Type[] {
+ org.apache.bcel.generic.Type.VOID,
+ new org.apache.bcel.generic.Type[] {
Util.getJCRefType(TRANSLET_INTF_SIG),
Util.getJCRefType(DOM_INTF_SIG),
Util.getJCRefType(NODE_ITERATOR_SIG)
@@ -375,9 +375,9 @@
il = new InstructionList();
matchGen =
new MatchGenerator(ACC_PUBLIC | ACC_FINAL,
- de.fub.bytecode.generic.Type.BOOLEAN,
- new de.fub.bytecode.generic.Type[] {
- de.fub.bytecode.generic.Type.INT,
+ org.apache.bcel.generic.Type.BOOLEAN,
+ new org.apache.bcel.generic.Type[] {
+ org.apache.bcel.generic.Type.INT,
},
new String[] {
"node",
@@ -405,9 +405,9 @@
if (_count != null) {
il = new InstructionList();
matchGen = new MatchGenerator(ACC_PUBLIC | ACC_FINAL,
- de.fub.bytecode.generic.Type.BOOLEAN,
- new de.fub.bytecode.generic.Type[] {
- de.fub.bytecode.generic.Type.INT,
+ org.apache.bcel.generic.Type.BOOLEAN,
+ new org.apache.bcel.generic.Type[] {
+ org.apache.bcel.generic.Type.INT,
},
new String[] {
"node",
1.2 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/NumberCall.java
Index: NumberCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/NumberCall.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NumberCall.java 17 Apr 2001 18:51:39 -0000 1.1
+++ NumberCall.java 1 Feb 2002 20:07:08 -0000 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: NumberCall.java,v 1.1 2001/04/17 18:51:39 sboag Exp $
+ * @(#)$Id: NumberCall.java,v 1.2 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -65,7 +65,7 @@
import java.util.Vector;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class NumberCall extends FunctionCall {
1.12 +3 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Output.java
Index: Output.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Output.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Output.java 5 Dec 2001 11:27:50 -0000 1.11
+++ Output.java 1 Feb 2002 20:07:08 -0000 1.12
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Output.java,v 1.11 2001/12/05 11:27:50 morten Exp $
+ * @(#)$Id: Output.java,v 1.12 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -69,8 +69,8 @@
import java.util.StringTokenizer;
import java.io.OutputStreamWriter;
-import de.fub.bytecode.generic.*;
-import de.fub.bytecode.classfile.JavaClass;
+import org.apache.bcel.generic.*;
+import org.apache.bcel.classfile.JavaClass;
import org.apache.xalan.xsltc.compiler.util.*;
import org.apache.xalan.xsltc.runtime.TextOutput;
1.19 +4 -4
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Param.java
Index: Param.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Param.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Param.java 30 Oct 2001 08:42:55 -0000 1.18
+++ Param.java 1 Feb 2002 20:07:08 -0000 1.19
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Param.java,v 1.18 2001/10/30 08:42:55 morten Exp $
+ * @(#)$Id: Param.java,v 1.19 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -71,9 +71,9 @@
import org.apache.xalan.xsltc.compiler.util.Type;
import org.apache.xalan.xsltc.compiler.util.ReferenceType;
-import de.fub.bytecode.generic.Instruction;
-import de.fub.bytecode.generic.*;
-import de.fub.bytecode.classfile.Field;
+import org.apache.bcel.generic.Instruction;
+import org.apache.bcel.generic.*;
+import org.apache.bcel.classfile.Field;
import org.apache.xalan.xsltc.compiler.util.*;
1.15 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ParentLocationPath.java
Index: ParentLocationPath.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ParentLocationPath.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ParentLocationPath.java 11 Dec 2001 10:11:19 -0000 1.14
+++ ParentLocationPath.java 1 Feb 2002 20:07:08 -0000 1.15
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: ParentLocationPath.java,v 1.14 2001/12/11 10:11:19 morten Exp $
+ * @(#)$Id: ParentLocationPath.java,v 1.15 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -66,7 +66,7 @@
import org.apache.xalan.xsltc.DOM;
import org.apache.xalan.xsltc.dom.Axis;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class ParentLocationPath extends RelativeLocationPath {
1.10 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ParameterRef.java
Index: ParameterRef.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ParameterRef.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ParameterRef.java 20 Sep 2001 14:35:15 -0000 1.9
+++ ParameterRef.java 1 Feb 2002 20:07:08 -0000 1.10
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: ParameterRef.java,v 1.9 2001/09/20 14:35:15 morten Exp $
+ * @(#)$Id: ParameterRef.java,v 1.10 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -66,7 +66,7 @@
package org.apache.xalan.xsltc.compiler;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class ParameterRef extends VariableRefBase {
1.3 +4 -4
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ParentPattern.java
Index: ParentPattern.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ParentPattern.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ParentPattern.java 27 Aug 2001 09:07:19 -0000 1.2
+++ ParentPattern.java 1 Feb 2002 20:07:08 -0000 1.3
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: ParentPattern.java,v 1.2 2001/08/27 09:07:19 morten Exp $
+ * @(#)$Id: ParentPattern.java,v 1.3 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -64,7 +64,7 @@
package org.apache.xalan.xsltc.compiler;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class ParentPattern extends RelativePathPattern {
@@ -107,9 +107,9 @@
Util.getJCRefType(NODE_SIG),
il.getEnd());
- final de.fub.bytecode.generic.Instruction loadLocal =
+ final org.apache.bcel.generic.Instruction loadLocal =
new ILOAD(local.getIndex());
- final de.fub.bytecode.generic.Instruction storeLocal =
+ final org.apache.bcel.generic.Instruction storeLocal =
new ISTORE(local.getIndex());
if (_right.isWildcard()) {
1.8 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/PositionCall.java
Index: PositionCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/PositionCall.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PositionCall.java 6 Nov 2001 13:42:04 -0000 1.7
+++ PositionCall.java 1 Feb 2002 20:07:08 -0000 1.8
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: PositionCall.java,v 1.7 2001/11/06 13:42:04 morten Exp $
+ * @(#)$Id: PositionCall.java,v 1.8 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -65,7 +65,7 @@
package org.apache.xalan.xsltc.compiler;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
import org.apache.xalan.xsltc.DOM;
1.12 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/RelationalExpr.java
Index: RelationalExpr.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/RelationalExpr.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- RelationalExpr.java 6 Nov 2001 13:42:04 -0000 1.11
+++ RelationalExpr.java 1 Feb 2002 20:07:08 -0000 1.12
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: RelationalExpr.java,v 1.11 2001/11/06 13:42:04 morten Exp $
+ * @(#)$Id: RelationalExpr.java,v 1.12 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -66,7 +66,7 @@
import org.apache.xalan.xsltc.compiler.util.Type;
import org.apache.xalan.xsltc.compiler.util.ReferenceType;
import org.apache.xalan.xsltc.runtime.Operators;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class RelationalExpr extends Expression implements Operators {
1.22 +9 -9
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Predicate.java
Index: Predicate.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Predicate.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Predicate.java 5 Dec 2001 10:34:29 -0000 1.21
+++ Predicate.java 1 Feb 2002 20:07:08 -0000 1.22
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Predicate.java,v 1.21 2001/12/05 10:34:29 morten Exp $
+ * @(#)$Id: Predicate.java,v 1.22 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -66,10 +66,10 @@
import java.util.Vector;
-import de.fub.bytecode.classfile.JavaClass;
+import org.apache.bcel.classfile.JavaClass;
import org.apache.xalan.xsltc.compiler.util.Type;
import org.apache.xalan.xsltc.compiler.util.ReferenceType;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class Predicate extends Expression {
@@ -277,12 +277,12 @@
final ConstantPoolGen cpg = filterGen.getConstantPool();
testGen = new TestGenerator(ACC_PUBLIC | ACC_FINAL,
- de.fub.bytecode.generic.Type.BOOLEAN,
- new de.fub.bytecode.generic.Type[] {
- de.fub.bytecode.generic.Type.INT,
- de.fub.bytecode.generic.Type.INT,
- de.fub.bytecode.generic.Type.INT,
- de.fub.bytecode.generic.Type.INT,
+ org.apache.bcel.generic.Type.BOOLEAN,
+ new org.apache.bcel.generic.Type[] {
+ org.apache.bcel.generic.Type.INT,
+ org.apache.bcel.generic.Type.INT,
+ org.apache.bcel.generic.Type.INT,
+ org.apache.bcel.generic.Type.INT,
Util.getJCRefType(TRANSLET_SIG),
Util.getJCRefType(NODE_ITERATOR_SIG)
},
1.14 +14 -14
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Sort.java
Index: Sort.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Sort.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Sort.java 29 Nov 2001 09:49:35 -0000 1.13
+++ Sort.java 1 Feb 2002 20:07:08 -0000 1.14
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Sort.java,v 1.13 2001/11/29 09:49:35 morten Exp $
+ * @(#)$Id: Sort.java,v 1.14 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -72,11 +72,11 @@
import org.apache.xalan.xsltc.compiler.util.Type;
import org.apache.xalan.xsltc.compiler.util.ReferenceType;
-import de.fub.bytecode.classfile.JavaClass;
-import de.fub.bytecode.classfile.Field;
-import de.fub.bytecode.classfile.Method;
-import de.fub.bytecode.generic.*;
-import de.fub.bytecode.Constants;
+import org.apache.bcel.classfile.JavaClass;
+import org.apache.bcel.classfile.Field;
+import org.apache.bcel.classfile.Method;
+import org.apache.bcel.generic.*;
+import org.apache.bcel.Constants;
import org.apache.xalan.xsltc.dom.*;
import org.apache.xalan.xsltc.compiler.util.*;
@@ -350,8 +350,8 @@
final InstructionList il = new InstructionList();
final CompareGenerator classInit =
new CompareGenerator(ACC_PUBLIC | ACC_FINAL,
- de.fub.bytecode.generic.Type.VOID,
- new de.fub.bytecode.generic.Type[] { },
+ org.apache.bcel.generic.Type.VOID,
+ new org.apache.bcel.generic.Type[] { },
new String[] { },
"<clinit>", className, il, cpg);
@@ -432,13 +432,13 @@
// String NodeSortRecord.extractValueFromDOM(dom,node,level);
final CompareGenerator extractMethod =
new CompareGenerator(ACC_PUBLIC | ACC_FINAL,
- de.fub.bytecode.generic.Type.STRING,
- new de.fub.bytecode.generic.Type[] {
+ org.apache.bcel.generic.Type.STRING,
+ new org.apache.bcel.generic.Type[] {
Util.getJCRefType(DOM_INTF_SIG),
- de.fub.bytecode.generic.Type.INT,
- de.fub.bytecode.generic.Type.INT,
+ org.apache.bcel.generic.Type.INT,
+ org.apache.bcel.generic.Type.INT,
Util.getJCRefType(TRANSLET_SIG),
- de.fub.bytecode.generic.Type.INT
+ org.apache.bcel.generic.Type.INT
},
new String[] { "dom",
"current",
@@ -501,7 +501,7 @@
final MethodGenerator getCollator =
new MethodGenerator(ACC_PUBLIC | ACC_FINAL,
Util.getJCRefType(COLLATOR_SIG),
- new de.fub.bytecode.generic.Type[] {},
+ new org.apache.bcel.generic.Type[] {},
new String[] { },
"getCollator", className, il, cpg);
1.5 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ProcessingInstruction.java
Index: ProcessingInstruction.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ProcessingInstruction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ProcessingInstruction.java 30 Oct 2001 08:42:55 -0000 1.4
+++ ProcessingInstruction.java 1 Feb 2002 20:07:08 -0000 1.5
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: ProcessingInstruction.java,v 1.4 2001/10/30 08:42:55 morten Exp $
+ * @(#)$Id: ProcessingInstruction.java,v 1.5 2002/02/01 20:07:08 tmiller Exp
$
*
* The Apache Software License, Version 1.1
*
@@ -64,7 +64,7 @@
package org.apache.xalan.xsltc.compiler;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class ProcessingInstruction extends Instruction {
1.2 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/RealExpr.java
Index: RealExpr.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/RealExpr.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RealExpr.java 17 Apr 2001 18:51:45 -0000 1.1
+++ RealExpr.java 1 Feb 2002 20:07:08 -0000 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: RealExpr.java,v 1.1 2001/04/17 18:51:45 sboag Exp $
+ * @(#)$Id: RealExpr.java,v 1.2 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -64,7 +64,7 @@
package org.apache.xalan.xsltc.compiler;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class RealExpr extends Expression {
1.11 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/VariableRef.java
Index: VariableRef.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/VariableRef.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- VariableRef.java 29 Oct 2001 11:47:25 -0000 1.10
+++ VariableRef.java 1 Feb 2002 20:07:08 -0000 1.11
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: VariableRef.java,v 1.10 2001/10/29 11:47:25 morten Exp $
+ * @(#)$Id: VariableRef.java,v 1.11 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -66,7 +66,7 @@
package org.apache.xalan.xsltc.compiler;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class VariableRef extends VariableRefBase {
1.4 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/RoundCall.java
Index: RoundCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/RoundCall.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RoundCall.java 4 Dec 2001 16:59:09 -0000 1.3
+++ RoundCall.java 1 Feb 2002 20:07:08 -0000 1.4
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: RoundCall.java,v 1.3 2001/12/04 16:59:09 morten Exp $
+ * @(#)$Id: RoundCall.java,v 1.4 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -64,7 +64,7 @@
package org.apache.xalan.xsltc.compiler;
import java.util.Vector;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class RoundCall extends FunctionCall {
1.7 +3 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ValueOf.java
Index: ValueOf.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ValueOf.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ValueOf.java 30 Oct 2001 08:42:55 -0000 1.6
+++ ValueOf.java 1 Feb 2002 20:07:08 -0000 1.7
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: ValueOf.java,v 1.6 2001/10/30 08:42:55 morten Exp $
+ * @(#)$Id: ValueOf.java,v 1.7 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -64,10 +64,10 @@
package org.apache.xalan.xsltc.compiler;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class ValueOf extends Instruction {
1.3 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/SimpleAttributeValue.java
Index: SimpleAttributeValue.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/SimpleAttributeValue.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SimpleAttributeValue.java 8 Nov 2001 10:23:39 -0000 1.2
+++ SimpleAttributeValue.java 1 Feb 2002 20:07:08 -0000 1.3
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: SimpleAttributeValue.java,v 1.2 2001/11/08 10:23:39 morten Exp $
+ * @(#)$Id: SimpleAttributeValue.java,v 1.3 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -65,7 +65,7 @@
import org.apache.xalan.xsltc.compiler.util.Type;
import org.apache.xalan.xsltc.compiler.util.*;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
final class SimpleAttributeValue extends AttributeValue {
1.4 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/StartsWithCall.java
Index: StartsWithCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/StartsWithCall.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StartsWithCall.java 30 Oct 2001 08:42:55 -0000 1.3
+++ StartsWithCall.java 1 Feb 2002 20:07:08 -0000 1.4
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: StartsWithCall.java,v 1.3 2001/10/30 08:42:55 morten Exp $
+ * @(#)$Id: StartsWithCall.java,v 1.4 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -67,7 +67,7 @@
import java.util.Vector;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class StartsWithCall extends FunctionCall {
1.35 +23 -24
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Stylesheet.java
Index: Stylesheet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Stylesheet.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- Stylesheet.java 10 Dec 2001 13:55:59 -0000 1.34
+++ Stylesheet.java 1 Feb 2002 20:07:08 -0000 1.35
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Stylesheet.java,v 1.34 2001/12/10 13:55:59 morten Exp $
+ * @(#)$Id: Stylesheet.java,v 1.35 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -68,6 +68,7 @@
import java.util.Hashtable;
import java.util.Enumeration;
import java.util.StringTokenizer;
+import java.util.Iterator;
import java.net.URL;
import javax.xml.parsers.*;
@@ -76,8 +77,9 @@
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
-import de.fub.bytecode.classfile.JavaClass;
+import org.apache.bcel.generic.*;
+import org.apache.bcel.util.*;
+import org.apache.bcel.classfile.JavaClass;
import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
@@ -538,7 +540,7 @@
final MethodGenerator constructor =
new MethodGenerator(ACC_PUBLIC,
- de.fub.bytecode.generic.Type.VOID,
+ org.apache.bcel.generic.Type.VOID,
null, null, "<init>",
_className, il, cpg);
@@ -610,7 +612,7 @@
final ConstantPoolGen cpg = classGen.getConstantPool();
- final de.fub.bytecode.generic.Type[] argTypes = {
+ final org.apache.bcel.generic.Type[] argTypes = {
Util.getJCRefType(DOM_INTF_SIG),
Util.getJCRefType(NODE_ITERATOR_SIG),
Util.getJCRefType(TRANSLET_OUTPUT_SIG)
@@ -624,7 +626,7 @@
final MethodGenerator toplevel =
new MethodGenerator(ACC_PUBLIC,
- de.fub.bytecode.generic.Type.VOID,
+ org.apache.bcel.generic.Type.VOID,
argTypes, argNames,
"topLevel", _className, il,
classGen.getConstantPool());
@@ -634,7 +636,7 @@
// Define and initialize 'current' variable with the root node
final LocalVariableGen current =
toplevel.addLocalVariable("current",
- de.fub.bytecode.generic.Type.INT,
+ org.apache.bcel.generic.Type.INT,
il.getEnd(), null);
final int setFilter = cpg.addInterfaceMethodref(DOM_INTF,
@@ -734,11 +736,11 @@
final ConstantPoolGen cpg = classGen.getConstantPool();
- final de.fub.bytecode.generic.Type[] argTypes = {
+ final org.apache.bcel.generic.Type[] argTypes = {
Util.getJCRefType(DOM_INTF_SIG),
Util.getJCRefType(NODE_ITERATOR_SIG),
Util.getJCRefType(TRANSLET_OUTPUT_SIG),
- de.fub.bytecode.generic.Type.INT
+ org.apache.bcel.generic.Type.INT
};
final String[] argNames = {
@@ -749,7 +751,7 @@
final MethodGenerator buildKeys =
new MethodGenerator(ACC_PUBLIC,
- de.fub.bytecode.generic.Type.VOID,
+ org.apache.bcel.generic.Type.VOID,
argTypes, argNames,
"buildKeys", _className, il,
classGen.getConstantPool());
@@ -801,8 +803,8 @@
* Define the the method transform with the following signature:
* void transform(DOM, NodeIterator, HandlerBase)
*/
- final de.fub.bytecode.generic.Type[] argTypes =
- new de.fub.bytecode.generic.Type[3];
+ final org.apache.bcel.generic.Type[] argTypes =
+ new org.apache.bcel.generic.Type[3];
argTypes[0] = Util.getJCRefType(DOM_INTF_SIG);
argTypes[1] = Util.getJCRefType(NODE_ITERATOR_SIG);
argTypes[2] = Util.getJCRefType(TRANSLET_OUTPUT_SIG);
@@ -815,7 +817,7 @@
final InstructionList il = new InstructionList();
final MethodGenerator transf =
new MethodGenerator(ACC_PUBLIC,
- de.fub.bytecode.generic.Type.VOID,
+ org.apache.bcel.generic.Type.VOID,
argTypes, argNames,
"transform",
_className,
@@ -826,7 +828,7 @@
// Define and initialize current with the root node
final LocalVariableGen current =
transf.addLocalVariable("current",
- de.fub.bytecode.generic.Type.INT,
+ org.apache.bcel.generic.Type.INT,
il.getEnd(), null);
final String applyTemplatesSig = classGen.getApplyTemplatesSig();
final int applyTemplates = cpg.addMethodref(getClassName(),
@@ -937,20 +939,17 @@
* Peephole optimization: Remove sequences of [ALOAD, POP].
*/
private void peepHoleOptimization(MethodGenerator methodGen) {
- final String pat = "`ALOAD'`POP'`Instruction'";
+ final String pattern = "`ALOAD'`POP'`Instruction'";
final InstructionList il = methodGen.getInstructionList();
- final FindPattern find = new FindPattern(il);
-
- InstructionHandle ih = find.search(pat);
- while (ih != null) {
- InstructionHandle[] match = find.getMatch();
+ final InstructionFinder find = new InstructionFinder(il);
+ for(Iterator iter=find.search(pattern); iter.hasNext(); ) {
+ InstructionHandle[] match = (InstructionHandle[])iter.next();
try {
il.delete(match[0], match[1]);
- }
+ }
catch (TargetLostException e) {
- // TODO: move target down into the list
- }
- ih = find.search(pat, match[2]);
+ // TODO: move target down into the list
+ }
}
}
1.3 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/StringCall.java
Index: StringCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/StringCall.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StringCall.java 30 Oct 2001 08:42:55 -0000 1.2
+++ StringCall.java 1 Feb 2002 20:07:08 -0000 1.3
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: StringCall.java,v 1.2 2001/10/30 08:42:55 morten Exp $
+ * @(#)$Id: StringCall.java,v 1.3 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -65,7 +65,7 @@
import java.util.Vector;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class StringCall extends FunctionCall {
1.2 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/StringLengthCall.java
Index: StringLengthCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/StringLengthCall.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StringLengthCall.java 17 Apr 2001 18:51:48 -0000 1.1
+++ StringLengthCall.java 1 Feb 2002 20:07:08 -0000 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: StringLengthCall.java,v 1.1 2001/04/17 18:51:48 sboag Exp $
+ * @(#)$Id: StringLengthCall.java,v 1.2 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -65,7 +65,7 @@
import java.util.Vector;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class StringLengthCall extends FunctionCall {
1.13 +3 -3
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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- StepPattern.java 9 Nov 2001 13:40:05 -0000 1.12
+++ StepPattern.java 1 Feb 2002 20:07:08 -0000 1.13
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: StepPattern.java,v 1.12 2001/11/09 13:40:05 morten Exp $
+ * @(#)$Id: StepPattern.java,v 1.13 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -68,8 +68,8 @@
import org.apache.xalan.xsltc.DOM;
import org.apache.xalan.xsltc.dom.Axis;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
-import de.fub.bytecode.classfile.Field;
+import org.apache.bcel.generic.*;
+import org.apache.bcel.classfile.Field;
import org.apache.xalan.xsltc.compiler.util.*;
1.16 +3 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Template.java
Index: Template.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Template.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Template.java 20 Nov 2001 13:32:01 -0000 1.15
+++ Template.java 1 Feb 2002 20:07:08 -0000 1.16
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Template.java,v 1.15 2001/11/20 13:32:01 morten Exp $
+ * @(#)$Id: Template.java,v 1.16 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -71,8 +71,8 @@
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
-import de.fub.bytecode.classfile.JavaClass;
+import org.apache.bcel.generic.*;
+import org.apache.bcel.classfile.JavaClass;
import org.apache.xalan.xsltc.compiler.util.*;
1.6 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/TestSeq.java
Index: TestSeq.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/TestSeq.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestSeq.java 19 Sep 2001 11:50:31 -0000 1.5
+++ TestSeq.java 1 Feb 2002 20:07:08 -0000 1.6
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: TestSeq.java,v 1.5 2001/09/19 11:50:31 morten Exp $
+ * @(#)$Id: TestSeq.java,v 1.6 2002/02/01 20:07:08 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -70,7 +70,7 @@
import java.util.Dictionary;
import java.util.Enumeration;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class TestSeq {
1.9 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Text.java
Index: Text.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Text.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Text.java 22 Nov 2001 13:08:23 -0000 1.8
+++ Text.java 1 Feb 2002 20:07:09 -0000 1.9
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Text.java,v 1.8 2001/11/22 13:08:23 morten Exp $
+ * @(#)$Id: Text.java,v 1.9 2002/02/01 20:07:09 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -67,7 +67,7 @@
import java.util.Vector;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class Text extends Instruction {
1.4 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/TopLevelElement.java
Index: TopLevelElement.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/TopLevelElement.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TopLevelElement.java 30 Oct 2001 08:42:55 -0000 1.3
+++ TopLevelElement.java 1 Feb 2002 20:07:09 -0000 1.4
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: TopLevelElement.java,v 1.3 2001/10/30 08:42:55 morten Exp $
+ * @(#)$Id: TopLevelElement.java,v 1.4 2002/02/01 20:07:09 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -64,7 +64,7 @@
import org.apache.xalan.xsltc.compiler.util.Type;
import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
class TopLevelElement extends SyntaxTreeNode {
1.7 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/TransletOutput.java
Index: TransletOutput.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/TransletOutput.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TransletOutput.java 30 Oct 2001 08:42:55 -0000 1.6
+++ TransletOutput.java 1 Feb 2002 20:07:09 -0000 1.7
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: TransletOutput.java,v 1.6 2001/10/30 08:42:55 morten Exp $
+ * @(#)$Id: TransletOutput.java,v 1.7 2002/02/01 20:07:09 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -63,7 +63,7 @@
package org.apache.xalan.xsltc.compiler;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class TransletOutput extends Instruction {
1.4 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/UnaryOpExpr.java
Index: UnaryOpExpr.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/UnaryOpExpr.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- UnaryOpExpr.java 6 Nov 2001 13:42:04 -0000 1.3
+++ UnaryOpExpr.java 1 Feb 2002 20:07:09 -0000 1.4
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: UnaryOpExpr.java,v 1.3 2001/11/06 13:42:04 morten Exp $
+ * @(#)$Id: UnaryOpExpr.java,v 1.4 2002/02/01 20:07:09 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -64,7 +64,7 @@
package org.apache.xalan.xsltc.compiler;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class UnaryOpExpr extends Expression {
1.6 +3 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/UnionPathExpr.java
Index: UnionPathExpr.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/UnionPathExpr.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UnionPathExpr.java 8 Nov 2001 10:23:39 -0000 1.5
+++ UnionPathExpr.java 1 Feb 2002 20:07:09 -0000 1.6
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: UnionPathExpr.java,v 1.5 2001/11/08 10:23:39 morten Exp $
+ * @(#)$Id: UnionPathExpr.java,v 1.6 2002/02/01 20:07:09 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -69,8 +69,8 @@
import org.apache.xalan.xsltc.dom.Axis;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.Instruction;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.Instruction;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class UnionPathExpr extends Expression {
1.2 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/UnparsedEntityUriCall.java
Index: UnparsedEntityUriCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/UnparsedEntityUriCall.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UnparsedEntityUriCall.java 17 Apr 2001 18:51:50 -0000 1.1
+++ UnparsedEntityUriCall.java 1 Feb 2002 20:07:09 -0000 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: UnparsedEntityUriCall.java,v 1.1 2001/04/17 18:51:50 sboag Exp $
+ * @(#)$Id: UnparsedEntityUriCall.java,v 1.2 2002/02/01 20:07:09 tmiller Exp
$
*
* The Apache Software License, Version 1.1
*
@@ -67,7 +67,7 @@
import java.util.Vector;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class UnparsedEntityUriCall extends FunctionCall {
1.7 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/UseAttributeSets.java
Index: UseAttributeSets.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/UseAttributeSets.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- UseAttributeSets.java 30 Oct 2001 08:42:55 -0000 1.6
+++ UseAttributeSets.java 1 Feb 2002 20:07:09 -0000 1.7
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: UseAttributeSets.java,v 1.6 2001/10/30 08:42:55 morten Exp $
+ * @(#)$Id: UseAttributeSets.java,v 1.7 2002/02/01 20:07:09 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -70,7 +70,7 @@
import java.util.StringTokenizer;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class UseAttributeSets extends Instruction {
1.2 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/LongExpr.java
Index: LongExpr.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/LongExpr.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LongExpr.java 9 Nov 2001 15:13:20 -0000 1.1
+++ LongExpr.java 1 Feb 2002 20:07:09 -0000 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: LongExpr.java,v 1.1 2001/11/09 15:13:20 tmiller Exp $
+ * @(#)$Id: LongExpr.java,v 1.2 2002/02/01 20:07:09 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -63,7 +63,7 @@
package org.apache.xalan.xsltc.compiler;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class LongExpr extends Expression {
1.22 +4 -4
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Variable.java
Index: Variable.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Variable.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Variable.java 30 Oct 2001 08:42:55 -0000 1.21
+++ Variable.java 1 Feb 2002 20:07:09 -0000 1.22
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Variable.java,v 1.21 2001/10/30 08:42:55 morten Exp $
+ * @(#)$Id: Variable.java,v 1.22 2002/02/01 20:07:09 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -69,9 +69,9 @@
import java.util.Vector;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.Instruction;
-import de.fub.bytecode.generic.*;
-import de.fub.bytecode.classfile.Field;
+import org.apache.bcel.generic.Instruction;
+import org.apache.bcel.generic.*;
+import org.apache.bcel.classfile.Field;
import org.apache.xalan.xsltc.compiler.util.*;
import org.apache.xalan.xsltc.dom.Axis;
1.7 +13 -13
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Whitespace.java
Index: Whitespace.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Whitespace.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Whitespace.java 30 Oct 2001 08:42:55 -0000 1.6
+++ Whitespace.java 1 Feb 2002 20:07:09 -0000 1.7
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Whitespace.java,v 1.6 2001/10/30 08:42:55 morten Exp $
+ * @(#)$Id: Whitespace.java,v 1.7 2002/02/01 20:07:09 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -68,10 +68,10 @@
import org.apache.xalan.xsltc.compiler.util.Type;
import org.apache.xalan.xsltc.compiler.util.ReferenceType;
-import de.fub.bytecode.classfile.JavaClass;
-import de.fub.bytecode.classfile.Field;
-import de.fub.bytecode.classfile.Method;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.classfile.JavaClass;
+import org.apache.bcel.classfile.Field;
+import org.apache.bcel.classfile.Method;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.dom.*;
import org.apache.xalan.xsltc.compiler.util.*;
@@ -375,11 +375,11 @@
// private boolean Translet.stripSpace(int type) - cannot be static
final MethodGenerator stripSpace =
new MethodGenerator(ACC_PUBLIC | ACC_FINAL ,
- de.fub.bytecode.generic.Type.BOOLEAN,
- new de.fub.bytecode.generic.Type[] {
+ org.apache.bcel.generic.Type.BOOLEAN,
+ new org.apache.bcel.generic.Type[] {
Util.getJCRefType(DOM_INTF_SIG),
- de.fub.bytecode.generic.Type.INT,
- de.fub.bytecode.generic.Type.INT
+ org.apache.bcel.generic.Type.INT,
+ org.apache.bcel.generic.Type.INT
},
new String[] { "dom","node","type" },
"stripSpace",classGen.getClassName(),il,cpg);
@@ -478,11 +478,11 @@
// private boolean Translet.stripSpace(int type) - cannot be static
final MethodGenerator stripSpace =
new MethodGenerator(ACC_PUBLIC | ACC_FINAL ,
- de.fub.bytecode.generic.Type.BOOLEAN,
- new de.fub.bytecode.generic.Type[] {
+ org.apache.bcel.generic.Type.BOOLEAN,
+ new org.apache.bcel.generic.Type[] {
Util.getJCRefType(DOM_INTF_SIG),
- de.fub.bytecode.generic.Type.INT,
- de.fub.bytecode.generic.Type.INT
+ org.apache.bcel.generic.Type.INT,
+ org.apache.bcel.generic.Type.INT
},
new String[] { "dom","node","type" },
"stripSpace",classGen.getClassName(),il,cpg);
1.16 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/XslAttribute.java
Index: XslAttribute.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/XslAttribute.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- XslAttribute.java 26 Nov 2001 12:57:44 -0000 1.15
+++ XslAttribute.java 1 Feb 2002 20:07:09 -0000 1.16
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: XslAttribute.java,v 1.15 2001/11/26 12:57:44 morten Exp $
+ * @(#)$Id: XslAttribute.java,v 1.16 2002/02/01 20:07:09 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -68,7 +68,7 @@
import java.util.Vector;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class XslAttribute extends Instruction {
1.10 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/WithParam.java
Index: WithParam.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/WithParam.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- WithParam.java 30 Oct 2001 08:42:55 -0000 1.9
+++ WithParam.java 1 Feb 2002 20:07:09 -0000 1.10
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: WithParam.java,v 1.9 2001/10/30 08:42:55 morten Exp $
+ * @(#)$Id: WithParam.java,v 1.10 2002/02/01 20:07:09 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -67,7 +67,7 @@
import org.apache.xalan.xsltc.compiler.util.Type;
import org.apache.xalan.xsltc.compiler.util.ReferenceType;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class WithParam extends Instruction {
1.35 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/XSLTC.java
Index: XSLTC.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/XSLTC.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- XSLTC.java 17 Dec 2001 09:51:12 -0000 1.34
+++ XSLTC.java 1 Feb 2002 20:07:09 -0000 1.35
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: XSLTC.java,v 1.34 2001/12/17 09:51:12 morten Exp $
+ * @(#)$Id: XSLTC.java,v 1.35 2002/02/01 20:07:09 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -87,7 +87,7 @@
import org.apache.xalan.xsltc.compiler.util.*;
import org.apache.xalan.xsltc.cmdline.getopt.*;
import org.apache.xalan.xsltc.DOM;
-import de.fub.bytecode.classfile.JavaClass;
+import org.apache.bcel.classfile.JavaClass;
public final class XSLTC {
1.15 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/XslElement.java
Index: XslElement.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/XslElement.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XslElement.java 4 Dec 2001 11:46:37 -0000 1.14
+++ XslElement.java 1 Feb 2002 20:07:09 -0000 1.15
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: XslElement.java,v 1.14 2001/12/04 11:46:37 morten Exp $
+ * @(#)$Id: XslElement.java,v 1.15 2002/02/01 20:07:09 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -69,7 +69,7 @@
import java.util.StringTokenizer;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class XslElement extends Instruction {
1.3 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/UnsupportedElement.java
Index: UnsupportedElement.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/UnsupportedElement.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UnsupportedElement.java 30 Oct 2001 08:42:55 -0000 1.2
+++ UnsupportedElement.java 1 Feb 2002 20:07:09 -0000 1.3
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: UnsupportedElement.java,v 1.2 2001/10/30 08:42:55 morten Exp $
+ * @(#)$Id: UnsupportedElement.java,v 1.3 2002/02/01 20:07:09 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -73,7 +73,7 @@
import org.apache.xalan.xsltc.compiler.util.Type;
import org.apache.xalan.xsltc.compiler.util.ReferenceType;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class UnsupportedElement extends SyntaxTreeNode {
1.13 +5 -5
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/VariableBase.java
Index: VariableBase.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/VariableBase.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- VariableBase.java 30 Oct 2001 08:42:55 -0000 1.12
+++ VariableBase.java 1 Feb 2002 20:07:09 -0000 1.13
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: VariableBase.java,v 1.12 2001/10/30 08:42:55 morten Exp $
+ * @(#)$Id: VariableBase.java,v 1.13 2002/02/01 20:07:09 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -69,9 +69,9 @@
import java.util.Vector;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.Instruction;
-import de.fub.bytecode.generic.*;
-import de.fub.bytecode.classfile.Field;
+import org.apache.bcel.generic.Instruction;
+import org.apache.bcel.generic.*;
+import org.apache.bcel.classfile.Field;
import org.apache.xalan.xsltc.compiler.util.*;
import org.apache.xalan.xsltc.dom.Axis;
@@ -143,7 +143,7 @@
if (_local == null) {
final InstructionList il = methodGen.getInstructionList();
final String name = _name.getLocalPart(); // TODO: namespace ?
- final de.fub.bytecode.generic.Type varType = _type.toJCType();
+ final org.apache.bcel.generic.Type varType = _type.toJCType();
_local = methodGen.addLocalVariable2(name, varType, il.getEnd());
}
}
1.8 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/VariableRefBase.java
Index: VariableRefBase.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/VariableRefBase.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- VariableRefBase.java 29 Nov 2001 11:33:09 -0000 1.7
+++ VariableRefBase.java 1 Feb 2002 20:07:09 -0000 1.8
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: VariableRefBase.java,v 1.7 2001/11/29 11:33:09 morten Exp $
+ * @(#)$Id: VariableRefBase.java,v 1.8 2002/02/01 20:07:09 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -63,7 +63,7 @@
package org.apache.xalan.xsltc.compiler;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
class VariableRefBase extends Expression {
1.3 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FilteredAbsoluteLocationPath.java
Index: FilteredAbsoluteLocationPath.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FilteredAbsoluteLocationPath.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FilteredAbsoluteLocationPath.java 27 Aug 2001 09:07:19 -0000 1.2
+++ FilteredAbsoluteLocationPath.java 1 Feb 2002 20:07:09 -0000 1.3
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: FilteredAbsoluteLocationPath.java,v 1.2 2001/08/27 09:07:19
morten Exp $
+ * @(#)$Id: FilteredAbsoluteLocationPath.java,v 1.3 2002/02/01 20:07:09
tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -63,7 +63,7 @@
package org.apache.xalan.xsltc.compiler;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class FilteredAbsoluteLocationPath extends Expression {
1.18 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/SyntaxTreeNode.java
Index: SyntaxTreeNode.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/SyntaxTreeNode.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- SyntaxTreeNode.java 4 Dec 2001 11:46:37 -0000 1.17
+++ SyntaxTreeNode.java 1 Feb 2002 20:07:09 -0000 1.18
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: SyntaxTreeNode.java,v 1.17 2001/12/04 11:46:37 morten Exp $
+ * @(#)$Id: SyntaxTreeNode.java,v 1.18 2002/02/01 20:07:09 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -78,7 +78,7 @@
import org.apache.xalan.xsltc.compiler.util.Type;
import org.apache.xalan.xsltc.compiler.util.ReferenceType;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
1.29 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Step.java
Index: Step.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Step.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Step.java 9 Nov 2001 13:40:05 -0000 1.28
+++ Step.java 1 Feb 2002 20:07:09 -0000 1.29
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Step.java,v 1.28 2001/11/09 13:40:05 morten Exp $
+ * @(#)$Id: Step.java,v 1.29 2002/02/01 20:07:09 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -67,7 +67,7 @@
import java.util.Vector;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
import org.apache.xalan.xsltc.dom.Axis;
import org.apache.xalan.xsltc.DOM;
1.2 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/UnresolvedRef.java
Index: UnresolvedRef.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/UnresolvedRef.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UnresolvedRef.java 30 Oct 2001 08:23:05 -0000 1.1
+++ UnresolvedRef.java 1 Feb 2002 20:07:09 -0000 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: UnresolvedRef.java,v 1.1 2001/10/30 08:23:05 morten Exp $
+ * @(#)$Id: UnresolvedRef.java,v 1.2 2002/02/01 20:07:09 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -63,7 +63,7 @@
package org.apache.xalan.xsltc.compiler;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
final class UnresolvedRef extends VariableRefBase {
1.2 +2 -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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ProcessingInstructionPattern.java 9 Nov 2001 13:48:40 -0000 1.1
+++ ProcessingInstructionPattern.java 1 Feb 2002 20:07:09 -0000 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: ProcessingInstructionPattern.java,v 1.1 2001/11/09 13:48:40
morten Exp $
+ * @(#)$Id: ProcessingInstructionPattern.java,v 1.2 2002/02/01 20:07:09
tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -65,7 +65,7 @@
import java.util.Vector;
import org.apache.xalan.xsltc.compiler.util.Type;
-import de.fub.bytecode.generic.*;
+import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.util.*;
import org.apache.xalan.xsltc.DOM;
import org.apache.xalan.xsltc.dom.Axis;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
