resolve RuleML/issues-ruleml#68

RuleML · Nov 16, 2015 · c0379c3 · c0379c3
1 parent 10456e9
commit c0379c3
Show file tree

Hide file tree

Showing 16 changed files with 78 additions and 31 deletions.
diff --git a/relaxng/all_compact.rnc b/relaxng/all_compact.rnc
@@ -89,7 +89,7 @@ include "modules/termseq_unbin_expansion_module.rnc" inherit = ruleml {start |=
 include "modules/type_expansion_module.rnc" inherit = ruleml {start |= notAllowed}
 #include "modules/unordered_groups_expansion_module.rnc" inherit = ruleml {start |= notAllowed}
 #include "modules/unordered_deterministic_groups_expansion_module.rnc" inherit = ruleml {start |= notAllowed}
-include "modules/val_absence_expansion_module.rnc" inherit = ruleml {start |= notAllowed}
+#include "modules/val_absence_expansion_module.rnc" inherit = ruleml {start |= notAllowed}
 include "modules/val_attrib_expansion_module.rnc" inherit = ruleml {start |= notAllowed}
 include "modules/val_default_expansion_module.rnc" inherit = ruleml {start |= notAllowed}
 include "modules/val_non-default_expansion_module.rnc" inherit = ruleml {start |= notAllowed}

diff --git a/relaxng/all_ordered.rnc b/relaxng/all_ordered.rnc
@@ -104,7 +104,7 @@ include "modules/termseq_unbin_expansion_module.rnc" inherit = ruleml {start |=
 include "modules/type_expansion_module.rnc" inherit = ruleml {start |= notAllowed}
 #include "modules/unordered_groups_expansion_module.rnc" inherit = ruleml {start |= notAllowed}
 #include "modules/unordered_deterministic_groups_expansion_module.rnc" inherit = ruleml {start |= notAllowed}
-include "modules/val_absence_expansion_module.rnc" inherit = ruleml {start |= notAllowed}
+#include "modules/val_absence_expansion_module.rnc" inherit = ruleml {start |= notAllowed}
 include "modules/val_attrib_expansion_module.rnc" inherit = ruleml {start |= notAllowed}
 include "modules/val_default_expansion_module.rnc" inherit = ruleml {start |= notAllowed}
 include "modules/val_non-default_expansion_module.rnc" inherit = ruleml {start |= notAllowed}

diff --git a/relaxng/all_unordered.rnc b/relaxng/all_unordered.rnc
@@ -104,7 +104,7 @@ include "modules/termseq_unbin_expansion_module.rnc" inherit = ruleml {start |=
 include "modules/type_expansion_module.rnc" inherit = ruleml {start |= notAllowed}
 include "modules/unordered_groups_expansion_module.rnc" inherit = ruleml {start |= notAllowed}
 #include "modules/unordered_deterministic_groups_expansion_module.rnc" inherit = ruleml {start |= notAllowed}
-include "modules/val_absence_expansion_module.rnc" inherit = ruleml {start |= notAllowed}
+#include "modules/val_absence_expansion_module.rnc" inherit = ruleml {start |= notAllowed}
 include "modules/val_attrib_expansion_module.rnc" inherit = ruleml {start |= notAllowed}
 include "modules/val_default_expansion_module.rnc" inherit = ruleml {start |= notAllowed}
 include "modules/val_non-default_expansion_module.rnc" inherit = ruleml {start |= notAllowed}

diff --git a/relaxng/all_unordered_deterministic.rnc b/relaxng/all_unordered_deterministic.rnc
@@ -104,7 +104,7 @@ include "modules/termseq_unbin_expansion_module.rnc" inherit = ruleml {start |=
 include "modules/type_expansion_module.rnc" inherit = ruleml {start |= notAllowed}
 #include "modules/unordered_groups_expansion_module.rnc" inherit = ruleml {start |= notAllowed}
 include "modules/unordered_deterministic_groups_expansion_module.rnc" inherit = ruleml {start |= notAllowed}
-include "modules/val_absence_expansion_module.rnc" inherit = ruleml {start |= notAllowed}
+#include "modules/val_absence_expansion_module.rnc" inherit = ruleml {start |= notAllowed}
 include "modules/val_attrib_expansion_module.rnc" inherit = ruleml {start |= notAllowed}
 include "modules/val_default_expansion_module.rnc" inherit = ruleml {start |= notAllowed}
 include "modules/val_non-default_expansion_module.rnc" inherit = ruleml {start |= notAllowed}

diff --git a/relaxng/indep_valid_modules/oriented_default_expansion_module.rnc b/relaxng/indep_valid_modules/oriented_default_expansion_module.rnc
@@ -1,2 +1,2 @@
-include "../modules/oriented_default_expansion_module.rnc"
-include "../modules/init_expansion_module.rnc"
+include "../modules/oriented_default_expansion_module.rnc"
+include "../modules/init_expansion_module.rnc"
diff --git a/relaxng/indep_valid_modules/oriented_non-default_expansion_module.rnc b/relaxng/indep_valid_modules/oriented_non-default_expansion_module.rnc
@@ -1,2 +1,2 @@
-include "../modules/oriented_non-default_expansion_module.rnc"
-include "../modules/init_expansion_module.rnc"
+include "../modules/oriented_non-default_expansion_module.rnc"
+include "../modules/init_expansion_module.rnc"
diff --git a/relaxng/indep_valid_modules/val_non-default_expansion_module.rnc b/relaxng/indep_valid_modules/val_non-default_expansion_module.rnc
@@ -1,2 +1,2 @@
-include "../modules/val_non-default_expansion_module.rnc"
-include "../modules/init_expansion_module.rnc"
+include "../modules/val_non-default_expansion_module.rnc"
+include "../modules/init_expansion_module.rnc"
diff --git a/relaxng/indep_valid_modules/xml_lang_expansion_module.rnc b/relaxng/indep_valid_modules/xml_lang_expansion_module.rnc
@@ -1,2 +1,2 @@
-include "../modules/xml_lang_expansion_module.rnc"
-include "../modules/init_expansion_module.rnc"
+include "../modules/xml_lang_expansion_module.rnc"
+include "../modules/init_expansion_module.rnc"
diff --git a/relaxng/modules/val_attrib_expansion_module.rnc b/relaxng/modules/val_attrib_expansion_module.rnc
@@ -22,7 +22,7 @@ singlevalued-att.choice |= val.attrib.def
 val.attrib.def =
   #
 
-  ## This attribute is used to indicate whether a function (<Fun>) is deterministic or non-deterministic. 
+  ## An attribute indicating whether a function (<Fun>) is deterministic or non-deterministic. 
   ## It has two values: "1" (deterministic: exactly one) and "0.." (set-valued: zero or more).    
   ## See http://deliberation.ruleml.org/1.02/glossary/.40val
   attribute val { val.value }

diff --git a/relaxng/naffologeq_compact.rnc b/relaxng/naffologeq_compact.rnc
@@ -331,9 +331,9 @@ include "modules/plex_expansion_module.rnc" inherit = ruleml {
 # 
 # SET-VALUED EXPRESSION ATTRIBUTE IS ABSENT OR OPTIONAL
 #
-include "modules/val_absence_expansion_module.rnc" inherit = ruleml {
-  start |= notAllowed
-}
+#include "modules/val_absence_expansion_module.rnc" inherit = ruleml {
+#  start |= notAllowed
+#}
 # 
 # SET-VALUED EXPRESSION ATTRIBUTE IS INCLUDED
 #

diff --git a/relaxng/naffologeq_compact4simp.rnc b/relaxng/naffologeq_compact4simp.rnc
@@ -327,9 +327,9 @@ include "modules/plex_expansion_module.rnc" inherit = ruleml {
 # 
 # SET-VALUED EXPRESSION ATTRIBUTE IS ABSENT OR OPTIONAL
 #
-include "modules/val_absence_expansion_module.rnc" inherit = ruleml {
-  start |= notAllowed
-}
+#include "modules/val_absence_expansion_module.rnc" inherit = ruleml {
+#  start |= notAllowed
+#}
 # 
 # SET-VALUED EXPRESSION ATTRIBUTE IS INCLUDED
 #

diff --git a/relaxng/naffologeq_compact4xsd.rnc b/relaxng/naffologeq_compact4xsd.rnc
@@ -325,9 +325,9 @@ include "modules/plex_expansion_module.rnc" inherit = ruleml {
 # 
 # SET-VALUED EXPRESSION ATTRIBUTE IS ABSENT OR OPTIONAL
 #
-include "modules/val_absence_expansion_module.rnc" inherit = ruleml {
-  start |= notAllowed
-}
+#include "modules/val_absence_expansion_module.rnc" inherit = ruleml {
+#  start |= notAllowed
+#}
 # 
 # SET-VALUED EXPRESSION ATTRIBUTE IS INCLUDED
 #

diff --git a/relaxng/naffologeq_ifthen-compact.rnc b/relaxng/naffologeq_ifthen-compact.rnc
@@ -222,7 +222,7 @@ include "modules/plex_expansion_module.rnc" inherit = ruleml {start |= notAllowe
 #
 # SET-VALUED EXPRESSION ATTRIBUTE IS ABSENT OR OPTIONAL
 #
-include "modules/val_absence_expansion_module.rnc" inherit = ruleml {start |= notAllowed}
+#include "modules/val_absence_expansion_module.rnc" inherit = ruleml {start |= notAllowed}
 #
 # SET-VALUED EXPRESSION ATTRIBUTE IS INCLUDED
 #

diff --git a/relaxng/naffologeq_ifthen-compact4xsd.rnc b/relaxng/naffologeq_ifthen-compact4xsd.rnc
@@ -220,7 +220,7 @@ include "modules/plex_expansion_module.rnc" inherit = ruleml {start |= notAllowe
 #
 # SET-VALUED EXPRESSION ATTRIBUTE IS ABSENT OR OPTIONAL
 #
-include "modules/val_absence_expansion_module.rnc" inherit = ruleml {start |= notAllowed}
+#include "modules/val_absence_expansion_module.rnc" inherit = ruleml {start |= notAllowed}
 #
 # SET-VALUED EXPRESSION ATTRIBUTE IS INCLUDED
 #

diff --git a/relaxng/schema_rnc.php b/relaxng/schema_rnc.php
@@ -88,7 +88,7 @@
 $quantParam = "x".dechex(bindec($bquant));
 //
 $expr = "expr";
-$expr_val_absent = 0;
+//$expr_val_absent = 0;
 $expr_plex = 1;
 $expr_val_nondefault = 2;
 $expr_in = 3;
@@ -320,7 +320,7 @@
   $needResl = extractBit($bquant, $quant_resl);
   $enableRepo = extractBit($bquant, $quant_repo);
 
-  $enableValAbsent = extractBit($bexpr, $expr_val_absent);
+  //$enableValAbsent = extractBit($bexpr, $expr_val_absent);
   $enablePlex = extractBit($bexpr, $expr_plex);
   $enableValND = extractBit($bexpr, $expr_val_nondefault);
   $NeedValND = $enableValND;
@@ -795,11 +795,11 @@
     }
 
   // Include empty initialization of set-valued attribute if needed
-  if ( $enableValAbsent ){
-      echo "#\n# SET-VALUED EXPRESSION ATTRIBUTE IS ABSENT OR OPTIONAL\n";
-      echo "#\n".'include "' . $modulesLocation .
-          'val_absence_expansion_module.rnc"'."$end\n";
-  }  
+//  if ( $enableValAbsent ){
+//      echo "#\n# SET-VALUED EXPRESSION ATTRIBUTE IS ABSENT OR OPTIONAL\n";
+//      echo "#\n".'include "' . $modulesLocation .
+//          'val_absence_expansion_module.rnc"'."$end\n";
+//  }  
   // Include set-valued expression attribute if needed
  if ($needValAtt){
     echo "#\n# SET-VALUED EXPRESSION ATTRIBUTE IS INCLUDED\n";

diff --git a/test/rnc-test-suites/web-test-suite/naffologeq_curies_variants.ruleml b/test/rnc-test-suites/web-test-suite/naffologeq_curies_variants.ruleml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../../../relaxng/drivers/naffologeq_relaxed.rnc" 
+  type="application/relax-ng-compact-syntax"?>
+<RuleML xmlns="http://ruleml.org/spec"
+  xmlns:this="http://deliberation.ruleml.org/1.02/test/iri-test-suite/datalog_curies.ruleml"
+  xmlns:sort="http://example.org/ontology#"
+  xmlns:ext="http://example.org/ruleml-extension/vocab#"
+  xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <!-- dc:rights [ 'Copyright 2015 RuleML Inc. - Licensed under the RuleML Specification License, Version 1.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://ruleml.org/licensing/RSL1.0-RuleML. Disclaimer: THIS SPECIFICATION IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, ..., EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. See the License for the specifics governing permissions and limitations under the License.' ]-->
+  <!-- note the addition of the XML Schema namespace because a built-in datatype is used -->
+  <!-- a syntactic example rulebase for testing the Datalog RuleML sublanguage -->
+  <act index="1">
+    <Assert node="this:#assert1" mapClosure="ext:exists!" mapDirection="ext:greencut" mapMaterial="ext:intuitionistic">
+      <formula>
+        <Implies node="http://example.org#rule1" closure="ext:none" material="ext:indicative" direction="ext:cut">
+          <if>
+            <And>
+              <formula>
+                <Atom>
+                  <op><Rel iri="_:" node="this:#rel1">friend</Rel></op>
+                  <arg index=" 1"><Ind iri="d:e" node="e:f">Jane</Ind></arg>
+                  <arg index="2 "><Skolem node="this:#sk1">constant b</Skolem></arg>
+                  <arg index=" 3 "><Data xsi:type="xs:string">test</Data></arg>
+                  <arg index="4"><Data xsi:type="xs:integer">12</Data></arg>
+                  <arg index="5"><Data node="this:#data1" xsi:type="integer">12</Data></arg>
+                  <arg index="6"><Data node="this:#data2">12a <xs:integer/></Data></arg>
+                  <arg index="7"><Data>tomorrow</Data></arg>
+                  <arg index="8"><Data xsi:type="xs:dateTime">2002-10-10T17:00:00Z</Data></arg>
+                  <arg index="9"><Data>test12</Data></arg>
+                  <arg index="10"><Ind type="sort:person">Jack</Ind></arg>
+                  <arg index="11"><Var type="sort:car">y</Var></arg>
+                  <arg index="12"><Expr><Fun per="ext:lazy" val="ext:0..2"></Fun></Expr></arg>
+                </Atom>
+              </formula>
+            </And>
+          </if>
+          <then>
+            <Equal oriented="ext:reverse">
+              <Ind>a</Ind>
+              <Expr><Fun>f</Fun><Var>x</Var></Expr>
+            </Equal>
+          </then>
+        </Implies>
+      </formula>
+    </Assert>
+  </act>
+</RuleML>