villard 2003/07/30 20:03:30
Modified: java/xpath_rwapi/grammar Tag: xslt20 etree.xsl
java/xpath_rwapi/src2/org/apache/xpath/impl/parser Tag:
xslt20 XPathVisitor.java XPathTreeConstants.java
XPath.java
java/xpath_rwapi Tag: xslt20 build2.xml
java/xpath_rwapi/src2/org/apache/xpath/impl Tag: xslt20
ExpressionFactoryImpl.java
java/xpath_rwapi/src2/org/apache/xpath/expression Tag:
xslt20 package.html
Log:
Namespace resolution in progress...
Revision Changes Path
No revision
No revision
1.1.2.5 +2 -2 xml-xalan/java/xpath_rwapi/grammar/Attic/etree.xsl
Index: etree.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/java/xpath_rwapi/grammar/Attic/etree.xsl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- etree.xsl 13 Mar 2003 20:29:09 -0000 1.1.2.4
+++ etree.xsl 31 Jul 2003 03:03:30 -0000 1.1.2.5
@@ -25,8 +25,7 @@
<xsl:template name="extra-parser-code">
// Begin generated by etree.xsl:extra-parser-code
- org.apache.xpath.patterns.FunctionPattern m_matchFunc = null; // short
lived.
-
+
int m_predLevel = 0;
/**
@@ -50,6 +49,7 @@
return m_nodeFactory;
}
+
/**
* The "version" property as pertains to the XPath spec.
* @serial
No revision
No revision
1.1.2.5 +1 -1
xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/impl/parser/Attic/XPathVisitor.java
Index: XPathVisitor.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/impl/parser/Attic/XPathVisitor.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- XPathVisitor.java 26 Mar 2003 21:27:21 -0000 1.1.2.4
+++ XPathVisitor.java 31 Jul 2003 03:03:30 -0000 1.1.2.5
@@ -1,4 +1,4 @@
-/* Generated By:JJTree: Do not edit this line.
C:/data/projects/xml-xalan-xslt20/java/xpath_rwapi/src2/org/apache/xpath/impl/parser\XPathVisitor.java
*/
+/* Generated By:JJTree: Do not edit this line.
F:/projets/xml-xalan-xslt20/xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/impl/parser\XPathVisitor.java
*/
package org.apache.xpath.impl.parser;
1.1.2.6 +1 -1
xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/impl/parser/Attic/XPathTreeConstants.java
Index: XPathTreeConstants.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/impl/parser/Attic/XPathTreeConstants.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- XPathTreeConstants.java 26 Mar 2003 21:27:21 -0000 1.1.2.5
+++ XPathTreeConstants.java 31 Jul 2003 03:03:30 -0000 1.1.2.6
@@ -1,4 +1,4 @@
-/* Generated By:JJTree: Do not edit this line.
C:/data/projects/xml-xalan-xslt20/java/xpath_rwapi/src2/org/apache/xpath/impl/parser\XPathTreeConstants.java
*/
+/* Generated By:JJTree: Do not edit this line.
F:/projets/xml-xalan-xslt20/xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/impl/parser\XPathTreeConstants.java
*/
package org.apache.xpath.impl.parser;
1.1.2.7 +2 -1
xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/impl/parser/Attic/XPath.java
Index: XPath.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/impl/parser/Attic/XPath.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- XPath.java 11 Jul 2003 19:09:26 -0000 1.1.2.6
+++ XPath.java 31 Jul 2003 03:03:30 -0000 1.1.2.7
@@ -7,7 +7,7 @@
public class XPath/[EMAIL PROTECTED](jjtree)*/implements XPathTreeConstants,
XPathConstants {/[EMAIL PROTECTED](jjtree)*/
protected JJTXPathState jjtree = new JJTXPathState();
// Begin generated by etree.xsl:extra-parser-code
-
+
int m_predLevel = 0;
/**
@@ -30,6 +30,7 @@
public NodeFactory getNodeFactory() {
return m_nodeFactory;
}
+
/**
* The "version" property as pertains to the XPath spec.
No revision
No revision
1.1.2.5 +5 -2 xml-xalan/java/xpath_rwapi/Attic/build2.xml
Index: build2.xml
===================================================================
RCS file: /home/cvs/xml-xalan/java/xpath_rwapi/Attic/build2.xml,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- build2.xml 5 May 2003 19:48:24 -0000 1.1.2.4
+++ build2.xml 31 Jul 2003 03:03:30 -0000 1.1.2.5
@@ -32,9 +32,12 @@
<project name="XPathAPI" default="javacc" basedir=".">
<property name="year" value="2003"/>
+ <property name="version" value="0.5"/>
+
<property name="build.dir" value="../build"/>
<property name="build.classes" value="${build.dir}/classes"/>
<property name="build.debug" value="on"/>
+
<!-- Note bin.dir assumes we're using Xalan's checked-in copy of ant.jar
-->
<property name="bin.dir" value="${ant.home}/bin"/>
<property name="jarfilename" value="xpath.jar"/>
@@ -178,7 +181,7 @@
version="true"
use="true"
windowtitle="XPath API"
- doctitle="XPath API 2"
+ doctitle="XPath API 2.0 Version ${version}"
bottom="Copyright © ${year} Apache XML Project. All
Rights Reserved.">
<classpath refid="docs.class.path" />
<group title="Namespace Support" packages="org.apache.xml"/>
No revision
No revision
1.1.2.13 +6 -4
xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/impl/Attic/ExpressionFactoryImpl.java
Index: ExpressionFactoryImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/impl/Attic/ExpressionFactoryImpl.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- ExpressionFactoryImpl.java 31 Jul 2003 02:29:28 -0000 1.1.2.12
+++ ExpressionFactoryImpl.java 31 Jul 2003 03:03:30 -0000 1.1.2.13
@@ -87,6 +87,8 @@
public class ExpressionFactoryImpl implements ExpressionFactory
{
+ public StaticContext m_context;
+
public Expr createExpr(String expr) throws XPath20Exception
{
XPath parser = new XPath(new StringReader(expr));
@@ -102,9 +104,9 @@
public Expr createExpr(StaticContext ctx, String expr)
throws XPath20Exception
- {
- // TODO : context
- XPath parser = new XPath(new StringReader(expr));
+ {
+ m_context = ctx;
+ XPath parser = new XPath(new StringReader(expr));
try
{
return (Expr) parser.XPath2().jjtGetChild(0);
No revision
No revision
1.1.2.4 +4 -3
xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/expression/Attic/package.html
Index: package.html
===================================================================
RCS file:
/home/cvs/xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/expression/Attic/package.html,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- package.html 29 Jul 2003 21:12:31 -0000 1.1.2.3
+++ package.html 31 Jul 2003 03:03:30 -0000 1.1.2.4
@@ -8,13 +8,14 @@
Primary external APIs for this XPath AST model.</p>
<p>This XPath API is a compact set of Java interfaces that allow to
encode and handle XPath 2.0/XQuery 1.0 expressions (although only XPath
-2.0 expressions are currently supported). It was designed to fulfill
+2.0 expressions are currently supported except for the let expression).
+It was designed to fulfill
the following requirements:</p>
<ul>
<li style="font-weight: bold;">Read/Write: <span
style="font-weight: normal;">capability of visiting and modifying the
internal representation of expressions. The expression reading is
-performed by using either the visitor pattern or the get-like methods.
+performed by using either the visitor pattern or get-like methods.
Similarly, the</span><span style="font-weight: normal;"> expression
</span><span
style="font-weight: normal;">writing is done through a bunch of
set-like methods.</span></li>
@@ -33,7 +34,7 @@
style="font-weight: normal;">keep the interface set as minimal as
possible by factoring similar concepts. The best example is the
interface OperatorExpr which allows to represent more than ten
-expressions types.</span></li>
+expression types.</span></li>
</ul>
Right now, the XPath API do not provide a standard way to evaluate
expressions. This should be done.<br>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
