You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vxquery.apache.org by vi...@apache.org on 2012/03/04 13:12:08 UTC
svn commit: r1296784 - in /incubator/vxquery/branches/vxquery_algebricks:
vxquery-core/src/main/java/org/apache/vxquery/api/
vxquery-core/src/main/java/org/apache/vxquery/compiler/expression/
vxquery-core/src/main/java/org/apache/vxquery/compiler/rewri...
Author: vinayakb
Date: Sun Mar 4 12:12:07 2012
New Revision: 1296784
URL: http://svn.apache.org/viewvc?rev=1296784&view=rev
Log:
Removed old expressions
Removed:
incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/compiler/expression/
incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/
incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/compiler/tools/
Modified:
incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/api/InternalAPI.java
incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContext.java
incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContextImpl.java
incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-operators.xml
incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/PrologVariable.java
incubator/vxquery/branches/vxquery_algebricks/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunnerFactory.java
Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/api/InternalAPI.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/api/InternalAPI.java?rev=1296784&r1=1296783&r2=1296784&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/api/InternalAPI.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/api/InternalAPI.java Sun Mar 4 12:12:07 2012
@@ -19,11 +19,11 @@ import java.io.Reader;
import java.util.GregorianCalendar;
import org.apache.vxquery.compiler.CompilerControlBlock;
-import org.apache.vxquery.compiler.expression.GlobalVariable;
import org.apache.vxquery.context.DataspaceContextImpl;
import org.apache.vxquery.context.DynamicContext;
import org.apache.vxquery.context.DynamicContextImpl;
import org.apache.vxquery.context.StaticContext;
+import org.apache.vxquery.context.XQueryVariable;
import org.apache.vxquery.datamodel.DatamodelStaticInterface;
import org.apache.vxquery.datamodel.XDMValue;
import org.apache.vxquery.exceptions.SystemException;
@@ -67,7 +67,7 @@ public class InternalAPI {
return sCtx;
}
- public void bindExternalVariable(GlobalVariable var, File file) throws SystemException {
+ public void bindExternalVariable(XQueryVariable var, File file) throws SystemException {
XDMValue value = XMLParserUtils.parseFile(rcb, file);
dCtx.bindVariable(var, value);
}
Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContext.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContext.java?rev=1296784&r1=1296783&r2=1296784&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContext.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContext.java Sun Mar 4 12:12:07 2012
@@ -16,7 +16,6 @@
*/
package org.apache.vxquery.context;
-import org.apache.vxquery.compiler.expression.GlobalVariable;
import org.apache.vxquery.datamodel.XDMValue;
import org.apache.vxquery.datamodel.atomic.DateTimeValue;
@@ -27,7 +26,7 @@ public interface DynamicContext {
public void setCurrentDateTime(DateTimeValue currentDateTime);
- public void bindVariable(GlobalVariable var, XDMValue value);
+ public void bindVariable(XQueryVariable var, XDMValue value);
- public XDMValue lookupVariable(GlobalVariable var);
+ public XDMValue lookupVariable(XQueryVariable var);
}
\ No newline at end of file
Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContextImpl.java?rev=1296784&r1=1296783&r2=1296784&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContextImpl.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContextImpl.java Sun Mar 4 12:12:07 2012
@@ -19,7 +19,6 @@ package org.apache.vxquery.context;
import java.util.HashMap;
import java.util.Map;
-import org.apache.vxquery.compiler.expression.GlobalVariable;
import org.apache.vxquery.datamodel.XDMValue;
import org.apache.vxquery.datamodel.atomic.DateTimeValue;
@@ -28,11 +27,11 @@ public class DynamicContextImpl implemen
private DateTimeValue currentDateTime;
- private Map<GlobalVariable, XDMValue> externalBindings;
+ private Map<XQueryVariable, XDMValue> externalBindings;
public DynamicContextImpl(StaticContext sCtx) {
this.sCtx = sCtx;
- externalBindings = new HashMap<GlobalVariable, XDMValue>();
+ externalBindings = new HashMap<XQueryVariable, XDMValue>();
}
@Override
@@ -51,12 +50,12 @@ public class DynamicContextImpl implemen
}
@Override
- public void bindVariable(GlobalVariable var, XDMValue value) {
+ public void bindVariable(XQueryVariable var, XDMValue value) {
externalBindings.put(var, value);
}
@Override
- public XDMValue lookupVariable(GlobalVariable var) {
+ public XDMValue lookupVariable(XQueryVariable var) {
return externalBindings.get(var);
}
}
\ No newline at end of file
Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-operators.xml
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-operators.xml?rev=1296784&r1=1296783&r2=1296784&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-operators.xml (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-operators.xml Sun Mar 4 12:12:07 2012
@@ -757,10 +757,10 @@
<return type="node()"/>
</operator>
- <!-- opext:document-constructor($content as element()) as document() -->
+ <!-- opext:document-constructor($content as node()) as node() -->
<operator name="opext:document-constructor">
- <param name="content" type="element()"/>
- <return type="document()"/>
+ <param name="content" type="node()"/>
+ <return type="node()"/>
</operator>
<!-- opext:if-then-else($condition as xs:boolean, $then as item()*, $else as item()*) as item()* -->
Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/PrologVariable.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/PrologVariable.java?rev=1296784&r1=1296783&r2=1296784&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/PrologVariable.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/PrologVariable.java Sun Mar 4 12:12:07 2012
@@ -16,19 +16,19 @@
*/
package org.apache.vxquery.xmlquery.query;
-import org.apache.vxquery.compiler.expression.GlobalVariable;
+import org.apache.vxquery.context.XQueryVariable;
import org.apache.vxquery.runtime.RuntimePlan;
public class PrologVariable {
- private GlobalVariable variable;
+ private XQueryVariable variable;
private RuntimePlan plan;
- public PrologVariable(GlobalVariable variable, RuntimePlan plan) {
+ public PrologVariable(XQueryVariable variable, RuntimePlan plan) {
this.variable = variable;
this.plan = plan;
}
- public GlobalVariable getVariable() {
+ public XQueryVariable getVariable() {
return variable;
}
Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunnerFactory.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunnerFactory.java?rev=1296784&r1=1296783&r2=1296784&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunnerFactory.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunnerFactory.java Sun Mar 4 12:12:07 2012
@@ -27,7 +27,7 @@ import java.util.List;
import javax.xml.namespace.QName;
import org.apache.vxquery.api.InternalAPI;
-import org.apache.vxquery.compiler.expression.GlobalVariable;
+import org.apache.vxquery.context.XQueryVariable;
import org.apache.vxquery.datamodel.XDMItem;
import org.apache.vxquery.datamodel.dtm.DTMDatamodelStaticInterfaceImpl;
import org.apache.vxquery.datamodel.serialization.XMLSerializer;
@@ -69,7 +69,7 @@ public class TestRunnerFactory {
}
Module module = iapi.compile(null, ast, opts.optimizationLevel);
for (PrologVariable pVar : module.getPrologVariables()) {
- GlobalVariable var = pVar.getVariable();
+ XQueryVariable var = pVar.getVariable();
QName varName = var.getName();
File binding = testCase.getExternalVariableBinding(varName);
if (binding != null) {