morten 01/06/07 08:16:23
Modified: java/src/org/apache/xalan/xsltc/compiler BinOpExpr.java
FunctionCall.java Otherwise.java Param.java
RelationalExpr.java Stylesheet.java
SyntaxTreeNode.java Variable.java When.java
XSLTC.java XslElement.java
Log:
Updated a few classes that were still calling Parser.addError(),
Parser.addWarning() and Parser.addFatalError() to use the new common
error handler Prarser.reportError(int category, ErrorMsg message).
Submitted by: [EMAIL PROTECTED]
Reviewed by: [EMAIL PROTECTED]
Revision Changes Path
1.3 +4 -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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BinOpExpr.java 2001/06/06 10:44:41 1.2
+++ BinOpExpr.java 2001/06/07 15:15:50 1.3
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: BinOpExpr.java,v 1.2 2001/06/06 10:44:41 morten Exp $
+ * @(#)$Id: BinOpExpr.java,v 1.3 2001/06/07 15:15:50 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -136,7 +136,9 @@
il.append(_type.REM());
break;
default:
- getParser().addFatalError("Unknown operator for binary expression");
+ final ErrorMsg msg =
+ new ErrorMsg("Unknown operator for binary expression");
+ getParser().reportError(Constants.ERROR, msg);
}
}
1.3 +5 -5
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FunctionCall.java 2001/06/06 10:45:00 1.2
+++ FunctionCall.java 2001/06/07 15:15:52 1.3
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: FunctionCall.java,v 1.2 2001/06/06 10:45:00 morten Exp $
+ * @(#)$Id: FunctionCall.java,v 1.3 2001/06/07 15:15:52 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -411,9 +411,9 @@
try {
final Class clazz = Class.forName(_className);
if (clazz == null) {
- ErrorMsg error =
+ final ErrorMsg msg =
new ErrorMsg(ErrorMsg.CLSUNDEF_ERR, _className);
- getParser().addError(error);
+ getParser().reportError(Constants.ERROR, msg);
}
else {
final String methodName = _fname.getLocalPart();
@@ -437,9 +437,9 @@
}
}
catch (ClassNotFoundException e) {
- ErrorMsg error =
+ final ErrorMsg msg =
new ErrorMsg(ErrorMsg.CLSUNDEF_ERR, _className);
- getParser().addError(error);
+ getParser().reportError(Constants.ERROR, msg);
}
}
return result;
1.2 +6 -4
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Otherwise.java
Index: Otherwise.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Otherwise.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Otherwise.java 2001/04/17 18:51:39 1.1
+++ Otherwise.java 2001/06/07 15:15:55 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Otherwise.java,v 1.1 2001/04/17 18:51:39 sboag Exp $
+ * @(#)$Id: Otherwise.java,v 1.2 2001/06/07 15:15:55 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -81,8 +81,10 @@
}
public void translate(ClassGenerator classGen, MethodGenerator methodGen) {
- getParser()
- .addError(new ErrorMsg("'otherwise' must be used within a 'choose'.",
- getLineNumber()));
+ final Parser parser = getParser();
+ final ErrorMsg msg =
+ new ErrorMsg("'otherwise' must be used within a 'choose'.",
+ getLineNumber());
+ parser.reportError(Constants.ERROR, msg);
}
}
1.4 +3 -3 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Param.java 2001/06/06 10:45:20 1.3
+++ Param.java 2001/06/07 15:15:56 1.4
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Param.java,v 1.3 2001/06/06 10:45:20 morten Exp $
+ * @(#)$Id: Param.java,v 1.4 2001/06/07 15:15:56 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -152,8 +152,8 @@
// check whether variable/param of the same name is already in scope
if (parser.lookupVariable(_name) != null) {
- ErrorMsg error = new ErrorMsg(ErrorMsg.VARREDEF_ERR, _name, this);
- parser.addError(error);
+ ErrorMsg msg = new ErrorMsg(ErrorMsg.VARREDEF_ERR, _name, this);
+ parser.reportError(Constants.ERROR, msg);
}
final String select = getAttribute("select");
1.3 +4 -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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RelationalExpr.java 2001/06/06 10:45:26 1.2
+++ RelationalExpr.java 2001/06/07 15:15:59 1.3
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: RelationalExpr.java,v 1.2 2001/06/06 10:45:26 morten Exp $
+ * @(#)$Id: RelationalExpr.java,v 1.3 2001/06/07 15:15:59 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -242,7 +242,9 @@
break;
default:
- getParser().addFatalError("Unknown operator for relational
expression");
+ final ErrorMsg msg =
+ new ErrorMsg("Unknown operator for relational expression");
+ getParser().reportError(Constants.FATAL, msg);
}
_falseList.add(il.append(bi)); // must be backpatched
1.7 +3 -3
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Stylesheet.java 2001/06/06 10:45:29 1.6
+++ Stylesheet.java 2001/06/07 15:16:00 1.7
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Stylesheet.java,v 1.6 2001/06/06 10:45:29 morten Exp $
+ * @(#)$Id: Stylesheet.java,v 1.7 2001/06/07 15:16:00 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -278,8 +278,8 @@
final Stylesheet sheet = stable.addStylesheet(_name, this);
if (sheet != null) {
// Error: more that one stylesheet defined
- ErrorMsg error = new ErrorMsg(ErrorMsg.STLREDEF_ERR, this);
- parser.addError(error);
+ final ErrorMsg msg = new ErrorMsg(ErrorMsg.STLREDEF_ERR, this);
+ parser.reportError(Constants.ERROR, msg);
}
// If this is a simplified stylesheet we must create a template that
1.4 +3 -3
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SyntaxTreeNode.java 2001/06/06 10:45:30 1.3
+++ SyntaxTreeNode.java 2001/06/07 15:16:02 1.4
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: SyntaxTreeNode.java,v 1.3 2001/06/06 10:45:30 morten Exp $
+ * @(#)$Id: SyntaxTreeNode.java,v 1.4 2001/06/07 15:16:02 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -451,13 +451,13 @@
protected static void reportError(SyntaxTreeNode element, Parser parser,
int errorCode, String msg) {
final ErrorMsg error = new ErrorMsg(errorCode, 0 /*lineNumber*/, msg);
- parser.addError(error);
+ parser.reportError(Constants.ERROR, error);
}
protected static void reportWarning(SyntaxTreeNode element, Parser parser,
int errorCode, String msg) {
final ErrorMsg error = new ErrorMsg(errorCode, 0 /*lineNumber*/, msg);
- parser.addWarning(error);
+ parser.reportError(Constants.WARNING, error);
}
}
1.5 +4 -6 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Variable.java 2001/06/06 10:45:39 1.4
+++ Variable.java 2001/06/07 15:16:04 1.5
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Variable.java,v 1.4 2001/06/06 10:45:39 morten Exp $
+ * @(#)$Id: Variable.java,v 1.5 2001/06/07 15:16:04 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -191,8 +191,7 @@
// check whether variable/param of the same name is already in scope
if (parser.lookupVariable(_name) != null) {
- ErrorMsg error = new ErrorMsg(ErrorMsg.VARREDEF_ERR, _name, this);
- parser.addError(error);
+ reportError(this, parser, ErrorMsg.VARREDEF_ERR, _name.toString());
}
final String select = getAttribute("select");
@@ -216,9 +215,8 @@
final int them = var.getImportPrecedence();
// It is an error if the two have the same import precedence
if (us == them) {
- ErrorMsg error =
- new ErrorMsg(ErrorMsg.VARREDEF_ERR, _name, this);
- parser.addError(error);
+ reportError(this, parser, ErrorMsg.VARREDEF_ERR,
+ _name.toString());
}
// Ignore this if previous definition has higher precedence
else if (them > us) {
1.4 +5 -4 xml-xalan/java/src/org/apache/xalan/xsltc/compiler/When.java
Index: When.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/When.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- When.java 2001/06/06 10:45:40 1.3
+++ When.java 2001/06/07 15:16:06 1.4
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: When.java,v 1.3 2001/06/06 10:45:40 morten Exp $
+ * @(#)$Id: When.java,v 1.4 2001/06/07 15:16:06 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -109,8 +109,9 @@
}
public void translate(ClassGenerator classGen, MethodGenerator methodGen) {
- getParser()
- .addError(new ErrorMsg("Instruction 'when' must be used within a
'choose'.",
- getLineNumber()));
+ final ErrorMsg msg =
+ new ErrorMsg("Instruction 'when' must be used within a 'choose'.",
+ getLineNumber());
+ getParser().reportError(Constants.ERROR, msg);
}
}
1.6 +3 -3 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XSLTC.java 2001/06/06 10:45:44 1.5
+++ XSLTC.java 2001/06/07 15:16:07 1.6
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: XSLTC.java,v 1.5 2001/06/06 10:45:44 morten Exp $
+ * @(#)$Id: XSLTC.java,v 1.6 2001/06/07 15:16:07 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -227,9 +227,9 @@
}
catch (CompilerException e) {
e.printStackTrace();
- _parser.addError(new ErrorMsg(e.getMessage()));
+ _parser.reportError(Constants.FATAL, new ErrorMsg(e.getMessage()));
_parser.printErrors();
- return false;
+ return false;
}
}
1.6 +8 -4
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XslElement.java 2001/06/06 10:45:46 1.5
+++ XslElement.java 2001/06/07 15:16:08 1.6
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: XslElement.java,v 1.5 2001/06/06 10:45:46 morten Exp $
+ * @(#)$Id: XslElement.java,v 1.6 2001/06/07 15:16:08 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -113,7 +113,9 @@
(prefix != null)) {
namespace = lookupNamespace(prefix);
if (namespace == null) {
- parser.addWarning(new ErrorMsg(ErrorMsg.NSPUNDEF_ERR, prefix));
+ final ErrorMsg msg =
+ new ErrorMsg(ErrorMsg.NSPUNDEF_ERR, prefix);
+ parser.reportError(Constants.WARNING, msg);
parseChildren(parser);
_ignore = true; // Ignore the element if prefix is undeclared
return;
@@ -122,8 +124,10 @@
// Next check that the local part of the QName is legal (no whitespace)
if (qname.getLocalPart().indexOf(' ') > -1) {
- parser.addWarning(new ErrorMsg("You can't call an element \""+
- qname.getLocalPart()+"\""));
+ final ErrorMsg msg =
+ new ErrorMsg("You can't call an element \""+
+ qname.getLocalPart()+"\"");
+ parser.reportError(Constants.WARNING, msg);
parseChildren(parser);
_ignore = true; // Ignore the element if the local part is invalid
return;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
