morten 01/09/26 03:26:13
Modified: java/src/org/apache/xalan/xsltc/compiler Stylesheet.java
Log:
Changed the order in which a stylesheet parses its top-level elements.
PR: bugzilla 3812
Obtained from: n/a
Submitted by: [EMAIL PROTECTED]
Reviewed by: [EMAIL PROTECTED]
Revision Changes Path
1.21 +4 -5
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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Stylesheet.java 2001/09/25 20:38:41 1.20
+++ Stylesheet.java 2001/09/26 10:26:13 1.21
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Stylesheet.java,v 1.20 2001/09/25 20:38:41 morten Exp $
+ * @(#)$Id: Stylesheet.java,v 1.21 2001/09/26 10:26:13 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -333,17 +333,16 @@
// variables and/or parameters before we parse the other elements...
for (int i=0; i<count; i++) {
SyntaxTreeNode child = (SyntaxTreeNode)contents.elementAt(i);
- if ((child instanceof Import) || (child instanceof Include)) {
+ if (child instanceof VariableBase) {
parser.getSymbolTable().setCurrentNode(child);
child.parseContents(parser);
}
}
- // We have to scan the stylesheet element's top-level elements for
- // variables and/or parameters before we parse the other elements...
+ // Then we have to go through the included/imported stylesheets
for (int i=0; i<count; i++) {
SyntaxTreeNode child = (SyntaxTreeNode)contents.elementAt(i);
- if (child instanceof VariableBase) {
+ if ((child instanceof Import) || (child instanceof Include)) {
parser.getSymbolTable().setCurrentNode(child);
child.parseContents(parser);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
