v1.1 XCQL for proximity modifiers

diff --git a/test/regression/sections/05/02.xcql b/test/regression/sections/05/02.xcql
index 3e07a64..fced1cc 100644 (file)
--- a/test/regression/sections/05/02.xcql
+++ b/test/regression/sections/05/02.xcql
@@ -2,10 +2,19 @@
   <boolean>
     <value>prox</value>
     <modifiers>
-      <modifier><type>relation</type><value>=</value></modifier>
-      <modifier><type>distance</type><value>3</value></modifier>
-      <modifier><type>unit</type><value>word</value></modifier>
-      <modifier><type>ordering</type><value>ordered</value></modifier>
+      <modifier>
+        <type>distance</type>
+        <comparison>=</comparison>
+        <value>3</value>
+      </modifier>
+      <modifier>
+        <type>unit</type>
+        <comparison>=</comparison>
+        <value>word</value>
+      </modifier>
+      <modifier>
+        <type>ordered</type>
+      </modifier>
     </modifiers>
   </boolean>
   <leftOperand>

diff --git a/test/regression/sections/05/03.xcql b/test/regression/sections/05/03.xcql
index 28131ea..98cd944 100644 (file)
--- a/test/regression/sections/05/03.xcql
+++ b/test/regression/sections/05/03.xcql
@@ -2,7 +2,11 @@
   <boolean>
     <value>prox</value>
     <modifiers>
-      <modifier><type>distance</type><value>3</value></modifier>
+      <modifier>
+        <type>distance</type>
+        <comparison>&lt;</comparison>
+        <value>3</value>
+      </modifier>
     </modifiers>
   </boolean>
   <leftOperand>

diff --git a/test/regression/sections/05/04.xcql b/test/regression/sections/05/04.xcql
index b083474..024fad4 100644 (file)
--- a/test/regression/sections/05/04.xcql
+++ b/test/regression/sections/05/04.xcql
@@ -2,7 +2,11 @@
   <boolean>
     <value>prox</value>
     <modifiers>
-      <modifier><type>unit</type><value>sentence</value></modifier>
+      <modifier>
+        <type>unit</type>
+        <comparison>=</comparison>
+        <value>sentence</value>
+      </modifier>
     </modifiers>
   </boolean>
   <leftOperand>

diff --git a/test/regression/sections/05/05.xcql b/test/regression/sections/05/05.xcql
index 2307ceb..f630a95 100644 (file)
--- a/test/regression/sections/05/05.xcql
+++ b/test/regression/sections/05/05.xcql
@@ -2,8 +2,11 @@
   <boolean>
     <value>prox</value>
     <modifiers>
-      <modifier><type>relation</type><value>&gt;=</value></modifier>
-      <modifier><type>distance</type><value>5</value></modifier>
+      <modifier>
+        <type>distance</type>
+        <comparison>&lt;=</comparison>
+        <value>5</value>
+      </modifier>
     </modifiers>
   </boolean>
   <leftOperand>

diff --git a/test/regression/sections/05/06.xcql b/test/regression/sections/05/06.xcql
index 4763259..42029b0 100644 (file)
--- a/test/regression/sections/05/06.xcql
+++ b/test/regression/sections/05/06.xcql
@@ -2,9 +2,16 @@
   <boolean>
     <value>prox</value>
     <modifiers>
-      <modifier><type>relation</type><value>&lt;</value></modifier>
-      <modifier><type>distance</type><value>5</value></modifier>
-      <modifier><type>unit</type><value>element</value></modifier>
+      <modifier>
+        <type>distance</type>
+        <comparison>&gt;</comparison>
+        <value>5</value>
+      </modifier>
+      <modifier>
+        <type>unit</type>
+        <comparison>=</comparison>
+        <value>element</value>
+      </modifier>
     </modifiers>
   </boolean>
   <leftOperand>