minchau 2003/10/16 09:15:03
Modified: java/src/org/apache/xalan/xsltc/compiler
UnsupportedElement.java Parser.java
Log:
PR: bugzilla 23706
Submitted by: Joanne Tong
Reviewed by: Brian Minchau
Not only does this patch for "fallback" fix the bug in 23706 it also makes
ver01 ver05 ver06 and ver07 pass
for the conformance tests!
Revision Changes Path
1.6 +5 -5
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UnsupportedElement.java 30 Jan 2003 18:46:02 -0000 1.5
+++ UnsupportedElement.java 16 Oct 2003 16:15:03 -0000 1.6
@@ -146,10 +146,10 @@
* Run type check on the fallback element (if any).
*/
public Type typeCheck(SymbolTable stable) throws TypeCheckError {
- if (_fallback == null) {
- throw new TypeCheckError(_message);
- }
- return(_fallback.typeCheck(stable));
+ if (_fallback != null) {
+ _fallback.typeCheck(stable);
+ }
+ return Type.Void;
}
/**
1.61 +5 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Parser.java
Index: Parser.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Parser.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- Parser.java 7 Oct 2003 15:44:22 -0000 1.60
+++ Parser.java 16 Oct 2003 16:15:03 -0000 1.61
@@ -975,9 +975,11 @@
if (uri.equals(XSLT_URI)) {
node = new UnsupportedElement(uri, prefix, local);
UnsupportedElement element = (UnsupportedElement)node;
- ErrorMsg msg = new ErrorMsg(ErrorMsg.UNSUPPORTED_XSL_ERR,
+ if (versionIsOne) {
+ ErrorMsg msg = new
ErrorMsg(ErrorMsg.UNSUPPORTED_XSL_ERR,
_locator.getLineNumber(),local);
- element.setErrorMessage(msg);
+ element.setErrorMessage(msg);
+ }
}
// Check if this is an XSLTC extension element
else if (uri.equals(TRANSLET_URI)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
