You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mo...@apache.org on 2001/09/25 18:20:39 UTC
cvs commit: xml-xalan/java/src/org/apache/xalan/xsltc/compiler Param.java Variable.java
morten 01/09/25 09:20:39
Modified: java/src/org/apache/xalan/xsltc/compiler Param.java
Variable.java
Log:
Removed previous attempt to fix forward references in globar vars.
PR: n/a
Obtained from: n/a
Submitted by: morten@xml.apache.org
Reviewed by: morten@xml.apache.org
Revision Changes Path
1.16 +5 -7 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Param.java 2001/09/25 15:57:22 1.15
+++ Param.java 2001/09/25 16:20:39 1.16
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Param.java,v 1.15 2001/09/25 15:57:22 morten Exp $
+ * @(#)$Id: Param.java,v 1.16 2001/09/25 16:20:39 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -129,6 +129,10 @@
}
select = getAttribute("select");
+ if (select.length() > 0) {
+ _select = getParser().parseExpression(this, "select", null);
+ }
+
// Children must be parsed first -> static scoping
parseChildren(parser);
@@ -174,12 +178,6 @@
* element has a body and no 'select' expression.
*/
public Type typeCheck(SymbolTable stable) throws TypeCheckError {
-
- // Parse the XPath expression in this method to allow for
- // forward references to other varibables
- if (select.length() > 0) {
- _select = getParser().parseExpression(this, "select", null);
- }
// Get the type from the select exrepssion...
if (_select != null) {
1.19 +5 -7 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Variable.java 2001/09/25 15:57:22 1.18
+++ Variable.java 2001/09/25 16:20:39 1.19
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Variable.java,v 1.18 2001/09/25 15:57:22 morten Exp $
+ * @(#)$Id: Variable.java,v 1.19 2001/09/25 16:20:39 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -122,6 +122,10 @@
}
select = getAttribute("select");
+ if (select.length() > 0) {
+ _select = getParser().parseExpression(this, "select", null);
+ }
+
// Children must be parsed first -> static scoping
parseChildren(parser);
@@ -165,12 +169,6 @@
* expression in the 'select' attribute
*/
public Type typeCheck(SymbolTable stable) throws TypeCheckError {
-
- // Parse the XPath expression in this method to allow for
- // forward references to other varibables
- if (select.length() > 0) {
- _select = getParser().parseExpression(this, "select", null);
- }
// Type check the 'select' expression if present
if (_select != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org