morten 01/10/30 07:35:31
Modified: java/src/org/apache/xalan/xsltc/compiler/util
BooleanType.java ErrorMessages.java
ErrorMessages_no.java ErrorMsg.java IntType.java
NodeSetType.java NodeType.java RealType.java
ReferenceType.java ResultTreeType.java
StringType.java Type.java VoidType.java
Log:
Code cleanup.
PR: n/a
Obtained from: n/a
Submitted by: [EMAIL PROTECTED]
Reviewed by: [EMAIL PROTECTED]
Revision Changes Path
1.2 +8 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/BooleanType.java
Index: BooleanType.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/BooleanType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BooleanType.java 2001/04/17 18:52:13 1.1
+++ BooleanType.java 2001/10/30 15:35:30 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: BooleanType.java,v 1.1 2001/04/17 18:52:13 sboag Exp $
+ * @(#)$Id: BooleanType.java,v 1.2 2001/10/30 15:35:30 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -66,6 +66,7 @@
import org.apache.xalan.xsltc.compiler.util.Type;
import de.fub.bytecode.generic.*;
import org.apache.xalan.xsltc.compiler.Parser;
+import org.apache.xalan.xsltc.compiler.Constants;
public final class BooleanType extends Type {
protected BooleanType() {}
@@ -109,7 +110,9 @@
translateTo(classGen, methodGen, (ReferenceType) type);
}
else {
- classGen.getParser().internalError(); // undefined
+ ErrorMsg err = new ErrorMsg(ErrorMsg.DATA_CONVERSION_ERR,
+ toString(), type.toString());
+ classGen.getParser().reportError(Constants.FATAL, err);
}
}
@@ -170,7 +173,9 @@
methodGen.getInstructionList().append(NOP);
}
else {
- classGen.getParser().internalError(); // undefined
+ ErrorMsg err = new ErrorMsg(ErrorMsg.DATA_CONVERSION_ERR,
+ toString(), clazz.getName());
+ classGen.getParser().reportError(Constants.FATAL, err);
}
}
1.2 +3 -1
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/ErrorMessages.java
Index: ErrorMessages.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/ErrorMessages.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ErrorMessages.java 2001/10/30 14:57:53 1.1
+++ ErrorMessages.java 2001/10/30 15:35:30 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: ErrorMessages.java,v 1.1 2001/10/30 14:57:53 morten Exp $
+ * @(#)$Id: ErrorMessages.java,v 1.2 2001/10/30 15:35:30 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -180,6 +180,8 @@
"Cannot parse attribute value template ''{0}''.",
// UNKNOWN_SIG_TYPE_ERR
"Unknown data-type in signature for class ''{0}''.",
+ // DATA_CONVERSION_ERR
+ "Cannot convert data-type ''{0}'' to ''{1}''.",
// NO_TRANSLET_CLASS_ERR
"This Templates does not contain a valid translet class definition.",
1.2 +3 -1
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/ErrorMessages_no.java
Index: ErrorMessages_no.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/ErrorMessages_no.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ErrorMessages_no.java 2001/10/30 14:57:53 1.1
+++ ErrorMessages_no.java 2001/10/30 15:35:30 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: ErrorMessages_no.java,v 1.1 2001/10/30 14:57:53 morten Exp $
+ * @(#)$Id: ErrorMessages_no.java,v 1.2 2001/10/30 15:35:30 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -180,6 +180,8 @@
"Kan ikke tolke attributt ''{0}''.",
// UNKNOWN_SIG_TYPE_ERR
"Ukjent data-type i signatur for klassen ''{0}''.",
+ // DATA_CONVERSION_ERR
+ "Kan ikke oversette mellom data-type ''{0}'' og ''{1}''.",
// NO_TRANSLET_CLASS_ERR
"Dette Templates objected inneholder ingen translet klasse definisjon.",
1.9 +21 -20
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/ErrorMsg.java
Index: ErrorMsg.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/ErrorMsg.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ErrorMsg.java 2001/10/30 14:57:53 1.8
+++ ErrorMsg.java 2001/10/30 15:35:30 1.9
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: ErrorMsg.java,v 1.8 2001/10/30 14:57:53 morten Exp $
+ * @(#)$Id: ErrorMsg.java,v 1.9 2001/10/30 15:35:30 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -137,29 +137,30 @@
public static final int ATTRIBSET_UNDEF_ERR = 51;
public static final int ATTR_VAL_TEMPLATE_ERR = 52;
public static final int UNKNOWN_SIG_TYPE_ERR = 53;
+ public static final int DATA_CONVERSION_ERR = 54;
// JAXP/TrAX error messages
- public static final int NO_TRANSLET_CLASS_ERR = 54;
- public static final int NO_MAIN_TRANSLET_ERR = 55;
- public static final int TRANSLET_CLASS_ERR = 56;
- public static final int TRANSLET_OBJECT_ERR = 57;
- public static final int ERROR_LISTENER_NULL_ERR = 58;
- public static final int JAXP_UNKNOWN_SOURCE_ERR = 59;
- public static final int JAXP_NO_SOURCE_ERR = 60;
- public static final int JAXP_COMPILE_ERR = 61;
- public static final int JAXP_INVALID_ATTR_ERR = 62;
- public static final int JAXP_SET_RESULT_ERR = 63;
- public static final int JAXP_NO_TRANSLET_ERR = 64;
- public static final int JAXP_NO_HANDLER_ERR = 65;
- public static final int JAXP_NO_RESULT_ERR = 66;
- public static final int JAXP_UNKNOWN_PROP_ERR = 67;
- public static final int SAX2DOM_ADAPTER_ERR = 68;
- public static final int XSLTC_SOURCE_ERR = 69;
+ public static final int NO_TRANSLET_CLASS_ERR = 55;
+ public static final int NO_MAIN_TRANSLET_ERR = 56;
+ public static final int TRANSLET_CLASS_ERR = 57;
+ public static final int TRANSLET_OBJECT_ERR = 58;
+ public static final int ERROR_LISTENER_NULL_ERR = 59;
+ public static final int JAXP_UNKNOWN_SOURCE_ERR = 60;
+ public static final int JAXP_NO_SOURCE_ERR = 61;
+ public static final int JAXP_COMPILE_ERR = 62;
+ public static final int JAXP_INVALID_ATTR_ERR = 63;
+ public static final int JAXP_SET_RESULT_ERR = 64;
+ public static final int JAXP_NO_TRANSLET_ERR = 65;
+ public static final int JAXP_NO_HANDLER_ERR = 66;
+ public static final int JAXP_NO_RESULT_ERR = 67;
+ public static final int JAXP_UNKNOWN_PROP_ERR = 68;
+ public static final int SAX2DOM_ADAPTER_ERR = 69;
+ public static final int XSLTC_SOURCE_ERR = 70;
// Command-line error messages
- public static final int COMPILE_STDIN_ERR = 70;
- public static final int COMPILE_USAGE_STR = 71;
- public static final int TRANSFORM_USAGE_STR = 72;
+ public static final int COMPILE_STDIN_ERR = 71;
+ public static final int COMPILE_USAGE_STR = 72;
+ public static final int TRANSFORM_USAGE_STR = 73;
// All error messages are localized and are stored in resource bundles.
1.2 +8 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/IntType.java
Index: IntType.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/IntType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IntType.java 2001/04/17 18:52:15 1.1
+++ IntType.java 2001/10/30 15:35:30 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: IntType.java,v 1.1 2001/04/17 18:52:15 sboag Exp $
+ * @(#)$Id: IntType.java,v 1.2 2001/10/30 15:35:30 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -67,6 +67,7 @@
import de.fub.bytecode.generic.*;
import org.apache.xalan.xsltc.compiler.Parser;
import org.apache.xalan.xsltc.compiler.FlowList;
+import org.apache.xalan.xsltc.compiler.Constants;
public final class IntType extends NumberType {
protected IntType() {}
@@ -121,7 +122,9 @@
translateTo(classGen, methodGen, (ReferenceType) type);
}
else {
- classGen.getParser().internalError(); // undefined
+ ErrorMsg err = new ErrorMsg(ErrorMsg.DATA_CONVERSION_ERR,
+ toString(), type.toString());
+ classGen.getParser().reportError(Constants.FATAL, err);
}
}
@@ -229,7 +232,9 @@
il.append(I2D);
}
else {
- classGen.getParser().internalError(); // undefined
+ ErrorMsg err = new ErrorMsg(ErrorMsg.DATA_CONVERSION_ERR,
+ toString(), clazz.getName());
+ classGen.getParser().reportError(Constants.FATAL, err);
}
}
1.8 +8 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/NodeSetType.java
Index: NodeSetType.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/NodeSetType.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NodeSetType.java 2001/08/28 12:43:08 1.7
+++ NodeSetType.java 2001/10/30 15:35:30 1.8
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: NodeSetType.java,v 1.7 2001/08/28 12:43:08 morten Exp $
+ * @(#)$Id: NodeSetType.java,v 1.8 2001/10/30 15:35:30 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -67,6 +67,7 @@
import de.fub.bytecode.generic.*;
import org.apache.xalan.xsltc.compiler.Parser;
import org.apache.xalan.xsltc.compiler.FlowList;
+import org.apache.xalan.xsltc.compiler.Constants;
public final class NodeSetType extends Type {
protected NodeSetType() {}
@@ -113,7 +114,9 @@
translateTo(classGen, methodGen, (ReferenceType) type);
}
else {
- classGen.getParser().internalError(); // undefined
+ ErrorMsg err = new ErrorMsg(ErrorMsg.DATA_CONVERSION_ERR,
+ toString(), type.toString());
+ classGen.getParser().reportError(Constants.FATAL, err);
}
}
@@ -246,7 +249,9 @@
il.append(new INVOKESTATIC(str));
}
else {
- classGen.getParser().internalError(); // undefined
+ ErrorMsg err = new ErrorMsg(ErrorMsg.DATA_CONVERSION_ERR,
+ toString(), className);
+ classGen.getParser().reportError(Constants.FATAL, err);
}
}
1.6 +11 -4
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/NodeType.java
Index: NodeType.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/NodeType.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NodeType.java 2001/08/28 12:43:08 1.5
+++ NodeType.java 2001/10/30 15:35:30 1.6
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: NodeType.java,v 1.5 2001/08/28 12:43:08 morten Exp $
+ * @(#)$Id: NodeType.java,v 1.6 2001/10/30 15:35:30 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -68,6 +68,7 @@
import org.apache.xalan.xsltc.compiler.Parser;
import org.apache.xalan.xsltc.compiler.NodeTest;
import org.apache.xalan.xsltc.compiler.FlowList;
+import org.apache.xalan.xsltc.compiler.Constants;
public final class NodeType extends Type {
private final int _type;
@@ -129,7 +130,9 @@
translateTo(classGen, methodGen, (ReferenceType) type);
}
else {
- classGen.getParser().internalError(); // undefined
+ ErrorMsg err = new ErrorMsg(ErrorMsg.DATA_CONVERSION_ERR,
+ toString(), type.toString());
+ classGen.getParser().reportError(Constants.FATAL, err);
}
}
@@ -167,7 +170,9 @@
break;
default:
- classGen.getParser().internalError();
+ ErrorMsg err = new ErrorMsg(ErrorMsg.DATA_CONVERSION_ERR,
+ toString(), type.toString());
+ classGen.getParser().reportError(Constants.FATAL, err);
break;
}
}
@@ -281,7 +286,9 @@
il.append(new INVOKEINTERFACE(index, 2));
}
else {
- classGen.getParser().internalError();
+ ErrorMsg err = new ErrorMsg(ErrorMsg.DATA_CONVERSION_ERR,
+ toString(), className);
+ classGen.getParser().reportError(Constants.FATAL, err);
}
}
1.2 +11 -4
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/RealType.java
Index: RealType.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/RealType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RealType.java 2001/04/17 18:52:19 1.1
+++ RealType.java 2001/10/30 15:35:30 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: RealType.java,v 1.1 2001/04/17 18:52:19 sboag Exp $
+ * @(#)$Id: RealType.java,v 1.2 2001/10/30 15:35:30 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -67,6 +67,7 @@
import de.fub.bytecode.generic.*;
import org.apache.xalan.xsltc.compiler.Parser;
import org.apache.xalan.xsltc.compiler.FlowList;
+import org.apache.xalan.xsltc.compiler.Constants;
public final class RealType extends NumberType {
protected RealType() {}
@@ -123,7 +124,9 @@
translateTo(classGen, methodGen, (IntType) type);
}
else {
- classGen.getParser().internalError(); // undefined
+ ErrorMsg err = new ErrorMsg(ErrorMsg.DATA_CONVERSION_ERR,
+ toString(), type.toString());
+ classGen.getParser().reportError(Constants.FATAL, err);
}
}
@@ -258,7 +261,9 @@
il.append(NOP);
}
else {
- classGen.getParser().internalError();
+ ErrorMsg err = new ErrorMsg(ErrorMsg.DATA_CONVERSION_ERR,
+ toString(), clazz.getName());
+ classGen.getParser().reportError(Constants.FATAL, err);
}
}
@@ -284,7 +289,9 @@
il.append(NOP);
}
else {
- classGen.getParser().internalError();
+ ErrorMsg err = new ErrorMsg(ErrorMsg.DATA_CONVERSION_ERR,
+ toString(), clazz.getName());
+ classGen.getParser().reportError(Constants.FATAL, err);
}
}
1.6 +4 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/ReferenceType.java
Index: ReferenceType.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/ReferenceType.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ReferenceType.java 2001/08/28 12:43:08 1.5
+++ ReferenceType.java 2001/10/30 15:35:30 1.6
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: ReferenceType.java,v 1.5 2001/08/28 12:43:08 morten Exp $
+ * @(#)$Id: ReferenceType.java,v 1.6 2001/10/30 15:35:30 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -68,6 +68,7 @@
import de.fub.bytecode.generic.*;
import org.apache.xalan.xsltc.compiler.Parser;
import org.apache.xalan.xsltc.compiler.FlowList;
+import org.apache.xalan.xsltc.compiler.Constants;
public final class ReferenceType extends Type {
protected ReferenceType() {}
@@ -113,7 +114,8 @@
translateTo(classGen, methodGen, (NodeType) type);
}
else {
- classGen.getParser().internalError(); // undefined
+ ErrorMsg err = new ErrorMsg(ErrorMsg.INTERNAL_ERR, type.toString());
+ classGen.getParser().reportError(Constants.FATAL, err);
}
}
1.8 +8 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/ResultTreeType.java
Index: ResultTreeType.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/ResultTreeType.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ResultTreeType.java 2001/09/12 14:30:47 1.7
+++ ResultTreeType.java 2001/10/30 15:35:30 1.8
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: ResultTreeType.java,v 1.7 2001/09/12 14:30:47 morten Exp $
+ * @(#)$Id: ResultTreeType.java,v 1.8 2001/10/30 15:35:30 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -70,6 +70,7 @@
import de.fub.bytecode.generic.*;
import org.apache.xalan.xsltc.compiler.Parser;
import org.apache.xalan.xsltc.compiler.FlowList;
+import org.apache.xalan.xsltc.compiler.Constants;
public final class ResultTreeType extends Type {
private final String _methodName;
@@ -134,7 +135,9 @@
translateTo(classGen, methodGen, (ReferenceType)type);
}
else {
- classGen.getParser().internalError(); // undefined
+ ErrorMsg err = new ErrorMsg(ErrorMsg.DATA_CONVERSION_ERR,
+ toString(), type.toString());
+ classGen.getParser().reportError(Constants.FATAL, err);
}
}
@@ -403,7 +406,9 @@
Type.NodeSet.translateTo(classGen, methodGen, clazz);
}
else {
- classGen.getParser().internalError(); // undefined
+ ErrorMsg err = new ErrorMsg(ErrorMsg.DATA_CONVERSION_ERR,
+ toString(), className);
+ classGen.getParser().reportError(Constants.FATAL, err);
}
}
1.3 +8 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/StringType.java
Index: StringType.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/StringType.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StringType.java 2001/08/28 12:43:08 1.2
+++ StringType.java 2001/10/30 15:35:30 1.3
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: StringType.java,v 1.2 2001/08/28 12:43:08 morten Exp $
+ * @(#)$Id: StringType.java,v 1.3 2001/10/30 15:35:30 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -67,6 +67,7 @@
import de.fub.bytecode.generic.*;
import org.apache.xalan.xsltc.compiler.Parser;
import org.apache.xalan.xsltc.compiler.FlowList;
+import org.apache.xalan.xsltc.compiler.Constants;
public class StringType extends Type {
protected StringType() {}
@@ -110,7 +111,9 @@
translateTo(classGen, methodGen, (ReferenceType) type);
}
else {
- classGen.getParser().internalError(); // undefined
+ ErrorMsg err = new ErrorMsg(ErrorMsg.DATA_CONVERSION_ERR,
+ toString(), type.toString());
+ classGen.getParser().reportError(Constants.FATAL, err);
}
}
@@ -185,7 +188,9 @@
methodGen.getInstructionList().append(NOP);
}
else {
- classGen.getParser().internalError();
+ ErrorMsg err = new ErrorMsg(ErrorMsg.DATA_CONVERSION_ERR,
+ toString(), clazz.getName());
+ classGen.getParser().reportError(Constants.FATAL, err);
}
}
1.7 +20 -20
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/Type.java
Index: Type.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/Type.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Type.java 2001/08/28 12:43:08 1.6
+++ Type.java 2001/10/30 15:35:30 1.7
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Type.java,v 1.6 2001/08/28 12:43:08 morten Exp $
+ * @(#)$Id: Type.java,v 1.7 2001/10/30 15:35:30 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -144,9 +144,9 @@
*/
public void translateTo(ClassGenerator classGen, MethodGenerator
methodGen,
Type type) {
- classGen
- .getParser()
- .notYetImplemented(toString() + " -> " + type.toString());
+ ErrorMsg err = new ErrorMsg(ErrorMsg.DATA_CONVERSION_ERR,
+ toString(), type.toString());
+ classGen.getParser().reportError(Constants.FATAL, err);
}
/**
@@ -177,9 +177,9 @@
public FlowList translateToDesynthesized(ClassGenerator classGen,
MethodGenerator methodGen,
BooleanType type) {
- classGen
- .getParser()
- .notYetImplemented(toString() + " -> " + type.toString());
+ ErrorMsg err = new ErrorMsg(ErrorMsg.DATA_CONVERSION_ERR,
+ toString(), type.toString());
+ classGen.getParser().reportError(Constants.FATAL, err);
return null;
}
@@ -190,8 +190,9 @@
*/
public void translateTo(ClassGenerator classGen, MethodGenerator
methodGen,
Class clazz) {
- classGen.getParser().notYetImplemented(toString() + " -> " +
- clazz.getClass().toString());
+ ErrorMsg err = new ErrorMsg(ErrorMsg.DATA_CONVERSION_ERR,
+ toString(), clazz.getClass().toString());
+ classGen.getParser().reportError(Constants.FATAL, err);
}
/**
@@ -199,12 +200,11 @@
* an object of this type. This method is used to translate return
values
* when external functions are called.
*/
- public void translateFrom(ClassGenerator classGen, MethodGenerator
methodGen,
+ public void translateFrom(ClassGenerator classGen, MethodGenerator
methodGen,
Class clazz) {
- classGen
- .getParser()
- .notYetImplemented(clazz.getClass().toString() + " -> "
- + toString());
+ ErrorMsg err = new ErrorMsg(ErrorMsg.DATA_CONVERSION_ERR,
+ clazz.getClass().toString(), toString());
+ classGen.getParser().reportError(Constants.FATAL, err);
}
/**
@@ -212,9 +212,9 @@
*/
public void translateBox(ClassGenerator classGen,
MethodGenerator methodGen) {
- classGen
- .getParser()
- .notYetImplemented(toString() + " -> boxed " + toString());
+ ErrorMsg err = new ErrorMsg(ErrorMsg.DATA_CONVERSION_ERR,
+ toString(), "["+toString()+"]");
+ classGen.getParser().reportError(Constants.FATAL, err);
}
/**
@@ -222,9 +222,9 @@
*/
public void translateUnBox(ClassGenerator classGen,
MethodGenerator methodGen) {
- classGen
- .getParser()
- .notYetImplemented(toString() + " -> unboxed " + toString());
+ ErrorMsg err = new ErrorMsg(ErrorMsg.DATA_CONVERSION_ERR,
+ "["+toString()+"]", toString());
+ classGen.getParser().reportError(Constants.FATAL, err);
}
/**
1.2 +8 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/VoidType.java
Index: VoidType.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/VoidType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VoidType.java 2001/04/17 18:52:22 1.1
+++ VoidType.java 2001/10/30 15:35:30 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: VoidType.java,v 1.1 2001/04/17 18:52:22 sboag Exp $
+ * @(#)$Id: VoidType.java,v 1.2 2001/10/30 15:35:30 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -66,6 +66,7 @@
import org.apache.xalan.xsltc.compiler.util.Type;
import de.fub.bytecode.generic.*;
import org.apache.xalan.xsltc.compiler.Parser;
+import org.apache.xalan.xsltc.compiler.Constants;
public final class VoidType extends Type {
protected VoidType() {}
@@ -99,7 +100,9 @@
translateTo(classGen, methodGen, (StringType) type);
}
else {
- classGen.getParser().internalError(); // undefined
+ ErrorMsg err = new ErrorMsg(ErrorMsg.DATA_CONVERSION_ERR,
+ toString(), type.toString());
+ classGen.getParser().reportError(Constants.FATAL, err);
}
}
@@ -121,7 +124,9 @@
public void translateFrom(ClassGenerator classGen, MethodGenerator
methodGen,
Class clazz) {
if (!clazz.getName().equals("void")) {
- classGen.getParser().internalError(); // undefined
+ ErrorMsg err = new ErrorMsg(ErrorMsg.DATA_CONVERSION_ERR,
+ toString(), clazz.getName());
+ classGen.getParser().reportError(Constants.FATAL, err);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
