You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by sb...@apache.org on 2001/06/12 04:54:53 UTC
cvs commit: xml-xalan/java/src/org/apache/xpath/compiler Keywords.java XPathParser.java
sboag 01/06/11 19:54:53
Modified: java/src/org/apache/xpath/compiler Tag: DTM_EXP
Keywords.java XPathParser.java
Removed: java/src/org/apache/xml/utils Tag: DTM_EXP StringKey.java
Log:
Removed StringKey, and references to such. Minor item that's been
long outstanding on my todo list.
Revision Changes Path
No revision
No revision
1.6.2.1 +61 -63 xml-xalan/java/src/org/apache/xpath/compiler/Keywords.java
Index: Keywords.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/compiler/Keywords.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- Keywords.java 2000/12/17 05:20:08 1.6
+++ Keywords.java 2001/06/12 02:54:52 1.6.2.1
@@ -58,8 +58,6 @@
import java.util.Hashtable;
-import org.apache.xml.utils.StringKey;
-
/**
* <meta name="usage" content="internal"/>
* Table of strings to operation code lookups.
@@ -253,129 +251,129 @@
static
{
- m_axisnames.put(new StringKey(FROM_ANCESTORS_STRING),
+ m_axisnames.put(FROM_ANCESTORS_STRING,
new Integer(OpCodes.FROM_ANCESTORS));
- m_axisnames.put(new StringKey(FROM_ANCESTORS_OR_SELF_STRING),
+ m_axisnames.put(FROM_ANCESTORS_OR_SELF_STRING,
new Integer(OpCodes.FROM_ANCESTORS_OR_SELF));
- m_axisnames.put(new StringKey(FROM_ATTRIBUTES_STRING),
+ m_axisnames.put(FROM_ATTRIBUTES_STRING,
new Integer(OpCodes.FROM_ATTRIBUTES));
- m_axisnames.put(new StringKey(FROM_CHILDREN_STRING),
+ m_axisnames.put(FROM_CHILDREN_STRING,
new Integer(OpCodes.FROM_CHILDREN));
- m_axisnames.put(new StringKey(FROM_DESCENDANTS_STRING),
+ m_axisnames.put(FROM_DESCENDANTS_STRING,
new Integer(OpCodes.FROM_DESCENDANTS));
- m_axisnames.put(new StringKey(FROM_DESCENDANTS_OR_SELF_STRING),
+ m_axisnames.put(FROM_DESCENDANTS_OR_SELF_STRING,
new Integer(OpCodes.FROM_DESCENDANTS_OR_SELF));
- m_axisnames.put(new StringKey(FROM_FOLLOWING_STRING),
+ m_axisnames.put(FROM_FOLLOWING_STRING,
new Integer(OpCodes.FROM_FOLLOWING));
- m_axisnames.put(new StringKey(FROM_FOLLOWING_SIBLINGS_STRING),
+ m_axisnames.put(FROM_FOLLOWING_SIBLINGS_STRING,
new Integer(OpCodes.FROM_FOLLOWING_SIBLINGS));
- m_axisnames.put(new StringKey(FROM_PARENT_STRING),
+ m_axisnames.put(FROM_PARENT_STRING,
new Integer(OpCodes.FROM_PARENT));
- m_axisnames.put(new StringKey(FROM_PRECEDING_STRING),
+ m_axisnames.put(FROM_PRECEDING_STRING,
new Integer(OpCodes.FROM_PRECEDING));
- m_axisnames.put(new StringKey(FROM_PRECEDING_SIBLINGS_STRING),
+ m_axisnames.put(FROM_PRECEDING_SIBLINGS_STRING,
new Integer(OpCodes.FROM_PRECEDING_SIBLINGS));
- m_axisnames.put(new StringKey(FROM_SELF_STRING),
+ m_axisnames.put(FROM_SELF_STRING,
new Integer(OpCodes.FROM_SELF));
- m_axisnames.put(new StringKey(FROM_NAMESPACE_STRING),
+ m_axisnames.put(FROM_NAMESPACE_STRING,
new Integer(OpCodes.FROM_NAMESPACE));
- m_nodetypes.put(new StringKey(NODETYPE_COMMENT_STRING),
+ m_nodetypes.put(NODETYPE_COMMENT_STRING,
new Integer(OpCodes.NODETYPE_COMMENT));
- m_nodetypes.put(new StringKey(NODETYPE_TEXT_STRING),
+ m_nodetypes.put(NODETYPE_TEXT_STRING,
new Integer(OpCodes.NODETYPE_TEXT));
- m_nodetypes.put(new StringKey(NODETYPE_PI_STRING),
+ m_nodetypes.put(NODETYPE_PI_STRING,
new Integer(OpCodes.NODETYPE_PI));
- m_nodetypes.put(new StringKey(NODETYPE_NODE_STRING),
+ m_nodetypes.put(NODETYPE_NODE_STRING,
new Integer(OpCodes.NODETYPE_NODE));
- m_nodetypes.put(new StringKey(NODETYPE_ANYELEMENT_STRING),
+ m_nodetypes.put(NODETYPE_ANYELEMENT_STRING,
new Integer(OpCodes.NODETYPE_ANYELEMENT));
- m_keywords.put(new StringKey(FROM_SELF_ABBREVIATED_STRING),
+ m_keywords.put(FROM_SELF_ABBREVIATED_STRING,
new Integer(OpCodes.FROM_SELF));
- m_keywords.put(new StringKey(FUNC_ID_STRING),
+ m_keywords.put(FUNC_ID_STRING,
new Integer(FunctionTable.FUNC_ID));
- m_keywords.put(new StringKey(FUNC_KEY_STRING),
+ m_keywords.put(FUNC_KEY_STRING,
new Integer(FunctionTable.FUNC_KEY));
- m_functions.put(new StringKey(FUNC_CURRENT_STRING),
+ m_functions.put(FUNC_CURRENT_STRING,
new Integer(FunctionTable.FUNC_CURRENT));
- m_functions.put(new StringKey(FUNC_LAST_STRING),
+ m_functions.put(FUNC_LAST_STRING,
new Integer(FunctionTable.FUNC_LAST));
- m_functions.put(new StringKey(FUNC_POSITION_STRING),
+ m_functions.put(FUNC_POSITION_STRING,
new Integer(FunctionTable.FUNC_POSITION));
- m_functions.put(new StringKey(FUNC_COUNT_STRING),
+ m_functions.put(FUNC_COUNT_STRING,
new Integer(FunctionTable.FUNC_COUNT));
- m_functions.put(new StringKey(FUNC_ID_STRING),
+ m_functions.put(FUNC_ID_STRING,
new Integer(FunctionTable.FUNC_ID));
- m_functions.put(new StringKey(FUNC_KEY_STRING),
+ m_functions.put(FUNC_KEY_STRING,
new Integer(FunctionTable.FUNC_KEY));
- m_functions.put(new StringKey(FUNC_LOCAL_PART_STRING),
+ m_functions.put(FUNC_LOCAL_PART_STRING,
new Integer(FunctionTable.FUNC_LOCAL_PART));
- m_functions.put(new StringKey(FUNC_NAMESPACE_STRING),
+ m_functions.put(FUNC_NAMESPACE_STRING,
new Integer(FunctionTable.FUNC_NAMESPACE));
- m_functions.put(new StringKey(FUNC_NAME_STRING),
+ m_functions.put(FUNC_NAME_STRING,
new Integer(FunctionTable.FUNC_QNAME));
- m_functions.put(new StringKey(FUNC_GENERATE_ID_STRING),
+ m_functions.put(FUNC_GENERATE_ID_STRING,
new Integer(FunctionTable.FUNC_GENERATE_ID));
- m_functions.put(new StringKey(FUNC_NOT_STRING),
+ m_functions.put(FUNC_NOT_STRING,
new Integer(FunctionTable.FUNC_NOT));
- m_functions.put(new StringKey(FUNC_TRUE_STRING),
+ m_functions.put(FUNC_TRUE_STRING,
new Integer(FunctionTable.FUNC_TRUE));
- m_functions.put(new StringKey(FUNC_FALSE_STRING),
+ m_functions.put(FUNC_FALSE_STRING,
new Integer(FunctionTable.FUNC_FALSE));
- m_functions.put(new StringKey(FUNC_BOOLEAN_STRING),
+ m_functions.put(FUNC_BOOLEAN_STRING,
new Integer(FunctionTable.FUNC_BOOLEAN));
- m_functions.put(new StringKey(FUNC_LANG_STRING),
+ m_functions.put(FUNC_LANG_STRING,
new Integer(FunctionTable.FUNC_LANG));
- m_functions.put(new StringKey(FUNC_NUMBER_STRING),
+ m_functions.put(FUNC_NUMBER_STRING,
new Integer(FunctionTable.FUNC_NUMBER));
- m_functions.put(new StringKey(FUNC_FLOOR_STRING),
+ m_functions.put(FUNC_FLOOR_STRING,
new Integer(FunctionTable.FUNC_FLOOR));
- m_functions.put(new StringKey(FUNC_CEILING_STRING),
+ m_functions.put(FUNC_CEILING_STRING,
new Integer(FunctionTable.FUNC_CEILING));
- m_functions.put(new StringKey(FUNC_ROUND_STRING),
+ m_functions.put(FUNC_ROUND_STRING,
new Integer(FunctionTable.FUNC_ROUND));
- m_functions.put(new StringKey(FUNC_SUM_STRING),
+ m_functions.put(FUNC_SUM_STRING,
new Integer(FunctionTable.FUNC_SUM));
- m_functions.put(new StringKey(FUNC_STRING_STRING),
+ m_functions.put(FUNC_STRING_STRING,
new Integer(FunctionTable.FUNC_STRING));
- m_functions.put(new StringKey(FUNC_STARTS_WITH_STRING),
+ m_functions.put(FUNC_STARTS_WITH_STRING,
new Integer(FunctionTable.FUNC_STARTS_WITH));
- m_functions.put(new StringKey(FUNC_CONTAINS_STRING),
+ m_functions.put(FUNC_CONTAINS_STRING,
new Integer(FunctionTable.FUNC_CONTAINS));
- m_functions.put(new StringKey(FUNC_SUBSTRING_BEFORE_STRING),
+ m_functions.put(FUNC_SUBSTRING_BEFORE_STRING,
new Integer(FunctionTable.FUNC_SUBSTRING_BEFORE));
- m_functions.put(new StringKey(FUNC_SUBSTRING_AFTER_STRING),
+ m_functions.put(FUNC_SUBSTRING_AFTER_STRING,
new Integer(FunctionTable.FUNC_SUBSTRING_AFTER));
- m_functions.put(new StringKey(FUNC_NORMALIZE_SPACE_STRING),
+ m_functions.put(FUNC_NORMALIZE_SPACE_STRING,
new Integer(FunctionTable.FUNC_NORMALIZE_SPACE));
- m_functions.put(new StringKey(FUNC_TRANSLATE_STRING),
+ m_functions.put(FUNC_TRANSLATE_STRING,
new Integer(FunctionTable.FUNC_TRANSLATE));
- m_functions.put(new StringKey(FUNC_CONCAT_STRING),
+ m_functions.put(FUNC_CONCAT_STRING,
new Integer(FunctionTable.FUNC_CONCAT));
- //m_functions.put(new StringKey(FUNC_FORMAT_NUMBER_STRING), new Integer(FunctionTable.FUNC_FORMAT_NUMBER));
- m_functions.put(new StringKey(FUNC_SYSTEM_PROPERTY_STRING),
+ //m_functions.put(FUNC_FORMAT_NUMBER_STRING, new Integer(FunctionTable.FUNC_FORMAT_NUMBER));
+ m_functions.put(FUNC_SYSTEM_PROPERTY_STRING,
new Integer(FunctionTable.FUNC_SYSTEM_PROPERTY));
- m_functions.put(new StringKey(FUNC_EXT_FUNCTION_AVAILABLE_STRING),
+ m_functions.put(FUNC_EXT_FUNCTION_AVAILABLE_STRING,
new Integer(FunctionTable.FUNC_EXT_FUNCTION_AVAILABLE));
- m_functions.put(new StringKey(FUNC_EXT_ELEM_AVAILABLE_STRING),
+ m_functions.put(FUNC_EXT_ELEM_AVAILABLE_STRING,
new Integer(FunctionTable.FUNC_EXT_ELEM_AVAILABLE));
- m_functions.put(new StringKey(FUNC_SUBSTRING_STRING),
+ m_functions.put(FUNC_SUBSTRING_STRING,
new Integer(FunctionTable.FUNC_SUBSTRING));
- m_functions.put(new StringKey(FUNC_STRING_LENGTH_STRING),
+ m_functions.put(FUNC_STRING_LENGTH_STRING,
new Integer(FunctionTable.FUNC_STRING_LENGTH));
- m_functions.put(new StringKey(FUNC_UNPARSED_ENTITY_URI_STRING),
+ m_functions.put(FUNC_UNPARSED_ENTITY_URI_STRING,
new Integer(FunctionTable.FUNC_UNPARSED_ENTITY_URI));
// These aren't really functions.
- m_functions.put(new StringKey(NODETYPE_COMMENT_STRING),
+ m_functions.put(NODETYPE_COMMENT_STRING,
new Integer(OpCodes.NODETYPE_COMMENT));
- m_functions.put(new StringKey(NODETYPE_TEXT_STRING),
+ m_functions.put(NODETYPE_TEXT_STRING,
new Integer(OpCodes.NODETYPE_TEXT));
- m_functions.put(new StringKey(NODETYPE_PI_STRING),
+ m_functions.put(NODETYPE_PI_STRING,
new Integer(OpCodes.NODETYPE_PI));
- m_functions.put(new StringKey(NODETYPE_NODE_STRING),
+ m_functions.put(NODETYPE_NODE_STRING,
new Integer(OpCodes.NODETYPE_NODE));
- m_functions.put(new StringKey(FUNC_DOCLOCATION_STRING),
+ m_functions.put(FUNC_DOCLOCATION_STRING,
new Integer(FunctionTable.FUNC_DOCLOCATION));
}
1.15.2.1 +0 -1 xml-xalan/java/src/org/apache/xpath/compiler/XPathParser.java
Index: XPathParser.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/compiler/XPathParser.java,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -r1.15 -r1.15.2.1
--- XPathParser.java 2001/03/16 22:17:32 1.15
+++ XPathParser.java 2001/06/12 02:54:52 1.15.2.1
@@ -65,7 +65,6 @@
import org.apache.xpath.objects.XString;
import org.apache.xpath.objects.XNumber;
import org.apache.xalan.res.XSLMessages;
-import org.apache.xml.utils.StringKey;
import javax.xml.transform.TransformerException;
import org.xml.sax.Locator;
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org