From d8d752bbd56bf3c9929e12d38c02e8be843937fd Mon Sep 17 00:00:00 2001
From: grammarware <vadim@grammarware.net>
Date: Wed, 3 Sep 2008 14:33:19 +0000
Subject: [PATCH] wrappers have their own dir now; WIP on LCI

git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@226 ab42f6e0-554d-0410-b580-99e487e6eeb2
---
 shared/{tools => wrappers}/runantlrevaluator  |   0
 shared/{tools => wrappers}/runantlrparser     |   0
 shared/{tools => wrappers}/runasfsdfevaluator |   0
 shared/{tools => wrappers}/runasfsdfparser    |   0
 shared/{tools => wrappers}/runprologevaluator |   0
 shared/{tools => wrappers}/runprologparser    |   0
 shared/{tools => wrappers}/runxqueryevaluator |   0
 shared/{tools => wrappers}/runxsdparser       |   0
 shared/xsd/lcf.xsd                            |  34 ++++-
 topics/convergence/lci/lci.py                 |  12 +-
 topics/fl/lci/fl.lcf                          | 122 +++++++++++-------
 11 files changed, 113 insertions(+), 55 deletions(-)
 rename shared/{tools => wrappers}/runantlrevaluator (100%)
 rename shared/{tools => wrappers}/runantlrparser (100%)
 rename shared/{tools => wrappers}/runasfsdfevaluator (100%)
 rename shared/{tools => wrappers}/runasfsdfparser (100%)
 rename shared/{tools => wrappers}/runprologevaluator (100%)
 rename shared/{tools => wrappers}/runprologparser (100%)
 rename shared/{tools => wrappers}/runxqueryevaluator (100%)
 rename shared/{tools => wrappers}/runxsdparser (100%)

diff --git a/shared/tools/runantlrevaluator b/shared/wrappers/runantlrevaluator
similarity index 100%
rename from shared/tools/runantlrevaluator
rename to shared/wrappers/runantlrevaluator
diff --git a/shared/tools/runantlrparser b/shared/wrappers/runantlrparser
similarity index 100%
rename from shared/tools/runantlrparser
rename to shared/wrappers/runantlrparser
diff --git a/shared/tools/runasfsdfevaluator b/shared/wrappers/runasfsdfevaluator
similarity index 100%
rename from shared/tools/runasfsdfevaluator
rename to shared/wrappers/runasfsdfevaluator
diff --git a/shared/tools/runasfsdfparser b/shared/wrappers/runasfsdfparser
similarity index 100%
rename from shared/tools/runasfsdfparser
rename to shared/wrappers/runasfsdfparser
diff --git a/shared/tools/runprologevaluator b/shared/wrappers/runprologevaluator
similarity index 100%
rename from shared/tools/runprologevaluator
rename to shared/wrappers/runprologevaluator
diff --git a/shared/tools/runprologparser b/shared/wrappers/runprologparser
similarity index 100%
rename from shared/tools/runprologparser
rename to shared/wrappers/runprologparser
diff --git a/shared/tools/runxqueryevaluator b/shared/wrappers/runxqueryevaluator
similarity index 100%
rename from shared/tools/runxqueryevaluator
rename to shared/wrappers/runxqueryevaluator
diff --git a/shared/tools/runxsdparser b/shared/wrappers/runxsdparser
similarity index 100%
rename from shared/tools/runxsdparser
rename to shared/wrappers/runxsdparser
diff --git a/shared/xsd/lcf.xsd b/shared/xsd/lcf.xsd
index 1352e1e9..0f27aee7 100644
--- a/shared/xsd/lcf.xsd
+++ b/shared/xsd/lcf.xsd
@@ -65,9 +65,37 @@
     </xsd:annotation>
     <xsd:sequence>
       <xsd:element name="name" type="xsd:string" />
-      <xsd:element name="extraction" type="lcf:xstring" />
-      <xsd:element name="parsing" type="lcf:xstring" minOccurs="0" />
-      <xsd:element name="evaluation" type="lcf:xstring" minOccurs="0" />
+      <xsd:element name="grammar">
+        <xsd:complexType>
+          <xsd:annotation>
+            <xsd:documentation>
+              This extractor must take a grammar in its source format and output the corresponding BGF.
+              This parser must take a test case, try to parse it and report through exit status.
+              This evaluator must take a test case, try to evaluate it and report through exit status.
+            </xsd:documentation>
+          </xsd:annotation>
+          <xsd:sequence>
+            <xsd:element name="extraction" type="lcf:xstring" />
+            <xsd:element name="parsing" type="lcf:xstring" minOccurs="0" />
+            <xsd:element name="evaluation" type="lcf:xstring" minOccurs="0" />
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="tree" minOccurs="0">
+        <xsd:complexType>
+          <xsd:annotation>
+            <xsd:documentation>
+              This extractor must take a BGF and a source file and output the corresponding BTF.
+              There is no parser since a valid BTF always parses.
+              This evaluator must take a BTF, try to evaluate it and report through exit status.
+            </xsd:documentation>
+          </xsd:annotation>
+          <xsd:sequence>
+            <xsd:element name="extraction" type="lcf:xstring" />
+            <xsd:element name="evaluation" type="lcf:xstring" minOccurs="0" />
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
       <xsd:element name="testing" minOccurs="0">
         <xsd:complexType>
           <xsd:sequence>
diff --git a/topics/convergence/lci/lci.py b/topics/convergence/lci/lci.py
index 60494a3b..98de12b1 100755
--- a/topics/convergence/lci/lci.py
+++ b/topics/convergence/lci/lci.py
@@ -59,12 +59,12 @@ def readxmlconfig (cfg):
   testsets[outline.findtext('name')]=expandxml(outline.findall('command')[0],{})
  # sources
  for outline in config.findall('//source'):
-  extractor[outline.findtext('name')]=expandxml(outline.findall('extraction')[0],{})
+  extractor[outline.findtext('name')]=expandxml(outline.findall('grammar/extraction')[0],{})
   pcmd = ecmd = ''
-  if outline.findall('parsing'):
-   parser[outline.findtext('name')]=expandxml(outline.findall('parsing')[0],{})
-  if outline.findall('evaluation'):
-   evaluator[outline.findtext('name')]=expandxml(outline.findall('evaluation')[0],{})
+  if outline.findall('grammar/parsing'):
+   parser[outline.findtext('name')]=expandxml(outline.findall('grammar/parsing')[0],{})
+  if outline.findall('grammar/evaluation'):
+   evaluator[outline.findtext('name')]=expandxml(outline.findall('grammar/evaluation')[0],{})
   tmp = []
   for set in outline.findall('testing/set'):
    tmp.append(set.text)
@@ -419,7 +419,7 @@ def checkconsistency():
   #sysexit(8)
 
 if __name__ == "__main__":
- print 'Language Covergence Infrastructure v1.10'
+ print 'Language Covergence Infrastructure v1.10alpha'
  if len(sys.argv) == 3:
   log = open(sys.argv[1].split('.')[0]+'.log','w')
   readxmlconfig(sys.argv[1])
diff --git a/topics/fl/lci/fl.lcf b/topics/fl/lci/fl.lcf
index 6e0b8af0..fc6f21f1 100644
--- a/topics/fl/lci/fl.lcf
+++ b/topics/fl/lci/fl.lcf
@@ -17,7 +17,15 @@
       <expand>slps</expand>/shared/tools
     </expansion>
   </shortcut>
+  
+  <shortcut>
+    <name>wrappers</name>
+    <expansion>
+      <expand>slps</expand>/shared/wrappers
+    </expansion>
+  </shortcut>
 
+  
   <tool>
     <name>validation</name>
     <command>
@@ -38,6 +46,7 @@
       <expand>tools</expand>/xbgf
     </command>
   </tool>
+  
 
   <testset>
     <name>xmlsamples</name>
@@ -53,17 +62,20 @@
     </command>
   </testset>
 
+  
   <source>
     <name>antlr</name>
-    <extraction>
-      <expand>tools</expand>/antlr2bgf <expand>fl</expand>/java1/FL.g
-    </extraction>
-    <parsing>
-      <expand>tools</expand>/runantlrparser
-    </parsing>
-    <evaluation>
-      <expand>tools</expand>/runantlrevaluator
-    </evaluation>
+    <grammar>
+      <extraction>
+        <expand>tools</expand>/antlr2bgf <expand>fl</expand>/java1/FL.g
+      </extraction>
+      <parsing>
+        <expand>wrappers</expand>/runantlrparser
+      </parsing>
+      <evaluation>
+        <expand>wrappers</expand>/runantlrevaluator
+      </evaluation>
+    </grammar>
     <testing>
       <set>codesamples</set>
     </testing>
@@ -71,15 +83,17 @@
 
   <source>
     <name>dcg</name>
-    <extraction>
-      <expand>tools</expand>/dcg2bgf <expand>fl</expand>/prolog1/Parser.pro
-    </extraction>
-    <parsing>
-      <expand>tools</expand>/runprologparser
-    </parsing>
-    <evaluation>
-      <expand>tools</expand>/runprologevaluator
-    </evaluation>
+    <grammar>
+      <extraction>
+        <expand>tools</expand>/dcg2bgf <expand>fl</expand>/prolog1/Parser.pro
+      </extraction>
+      <parsing>
+        <expand>wrappers</expand>/runprologparser
+      </parsing>
+      <evaluation>
+        <expand>wrappers</expand>/runprologevaluator
+      </evaluation>
+    </grammar>
     <testing>
       <set>codesamples</set>
     </testing>
@@ -87,15 +101,17 @@
 
   <source>
     <name>sdf</name>
-    <extraction>
-      <expand>tools</expand>/sdf2bgf <expand>fl</expand>/asfsdf/*.sdf
-    </extraction>
-    <parsing>
-      <expand>tools</expand>/runasfsdfparser
-    </parsing>
-    <evaluation>
-      <expand>tools</expand>/runasfsdfevaluator
-    </evaluation>
+    <grammar>
+      <extraction>
+        <expand>tools</expand>/sdf2bgf <expand>fl</expand>/asfsdf/*.sdf
+      </extraction>
+      <parsing>
+        <expand>wrappers</expand>/runasfsdfparser
+      </parsing>
+      <evaluation>
+        <expand>wrappers</expand>/runasfsdfevaluator
+      </evaluation>
+    </grammar>
     <testing>
       <set>codesamples</set>
     </testing>
@@ -103,22 +119,31 @@
 
   <source>
     <name>om</name>
-    <extraction>
-      <expand>tools</expand>/java2bgf <expand>fl</expand>/java1 types
-    </extraction>
+    <grammar>
+      <extraction>
+        <expand>tools</expand>/java2bgf <expand>fl</expand>/java1 types
+      </extraction>
+    </grammar>
   </source>
 
   <source>
     <name>xml</name>
-    <extraction>
-      <expand>tools</expand>/xsd2bgf <expand>fl</expand>/xsd/fl.xsd
-    </extraction>
-    <parsing>
-      <expand>tools</expand>/runxsdparser
-    </parsing>
-    <evaluation>
-      <expand>tools</expand>/runxqueryevaluator
-    </evaluation>
+    <grammar>
+      <extraction>
+        <expand>tools</expand>/xsd2bgf <expand>fl</expand>/xsd/fl.xsd
+      </extraction>
+      <parsing>
+        <expand>wrappers</expand>/runxsdparser
+      </parsing>
+      <evaluation>
+        <expand>wrappers</expand>/runxqueryevaluator
+      </evaluation>
+    </grammar>
+    <tree>
+      <extraction>
+        <expand>tools</expand>/xml2btf <expand>fl</expand>/xsd/fl.xsd
+      </extraction>
+    </tree>
     <testing>
       <set>xmlsamples</set>
     </testing>
@@ -126,18 +151,23 @@
 
   <source>
     <name>jaxb</name>
-    <extraction>
-      <expand>tools</expand>/java2bgf <expand>fl</expand>/java3 fl
-    </extraction>
+    <grammar>
+      <extraction>
+        <expand>tools</expand>/java2bgf <expand>fl</expand>/java3 fl
+      </extraction>
+    </grammar>
   </source>
 
   <source>
     <name>ldf</name>
-    <extraction>
-      <expand>tools</expand>/ldf2bgf <expand>fl</expand>/ldf/fl.ldf
-    </extraction>
+    <grammar>
+      <extraction>
+        <expand>tools</expand>/ldf2bgf <expand>fl</expand>/ldf/fl.ldf
+      </extraction>
+    </grammar>
   </source>
 
+  
   <target>
     <name>java</name>
     <branch>
@@ -206,4 +236,4 @@
     </branch>
   </target>
 
-</lcf:configuration>
+</lcf:configuration>
\ No newline at end of file