lift /configuration/source/extraction/arguments/argument* to /configu…

…ration/source/extraction/argument* git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@144 ab42f6e0-554d-0410-b580-99e487e6eeb2
grammarware · Aug 6, 2008 · 2d094b9 · 2d094b9
1 parent 5785ce3
commit 2d094b9
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 61 deletions.
diff --git a/shared/xsd/lcf.xsd b/shared/xsd/lcf.xsd
@@ -35,7 +35,7 @@
         A shortcut in LCF is just a simple macro.
         If binds a longer definition to a concise name.
         For example, a path with long directory names that is used multiple times in the LCF document is a good shortcut.
-          </xsd:documentation>
+      </xsd:documentation>
     </xsd:annotation>
     <xsd:sequence>
       <xsd:element name="name" type="xsd:string" />
@@ -87,16 +87,10 @@
                 </xsd:sequence>
               </xsd:complexType>
             </xsd:element>
-            <xsd:element name="arguments">
-              <xsd:complexType>
+            <xsd:element maxOccurs="unbounded" name="argument">
+              <xsd:complexType mixed="true">
                 <xsd:sequence>
-                  <xsd:element maxOccurs="unbounded" name="argument">
-                    <xsd:complexType mixed="true">
-                      <xsd:sequence>
-                        <xsd:element name="expand" type="xsd:string"  minOccurs="0" maxOccurs="unbounded"/>
-                      </xsd:sequence>
-                    </xsd:complexType>
-                  </xsd:element>
+                  <xsd:element name="expand" type="xsd:string"  minOccurs="0" maxOccurs="unbounded"/>
                 </xsd:sequence>
               </xsd:complexType>
             </xsd:element>
@@ -146,7 +140,7 @@
                   A performed action must reside in an external XBGF file
                   that contains a sequence of atomic grammar transformations
                   grouped by one theme.
-                  
+
                   Performing a chain of actions is a way to get from sources
                   and intermediate targets to one final target.
                 </xsd:documentation>

diff --git a/topics/convergence/lci/lci.py b/topics/convergence/lci/lci.py
@@ -35,7 +35,7 @@ def readxmlconfig (cfg):
  # sources
  for outline in config.findall('//source'):
   args = [expandxml(outline.findall('extraction/name')[0],{})]
-  for arg in outline.findall('extraction/arguments/argument'):
+  for arg in outline.findall('extraction/argument'):
    args.append(expandxml(arg,{}))
   sources[outline.findtext('name')]=args
   pcmd = ecmd = ''

diff --git a/topics/fl/lci/fl.lcf b/topics/fl/lci/fl.lcf
@@ -15,7 +15,7 @@
     </definition>
   </shortcut>
 
-   <tool>
+  <tool>
     <name>validation</name>
     <command>
       java -jar <expand>slps</expand>/download/msv/msv.jar <expand>slps</expand>/shared/xsd/bgf.xsd
@@ -31,29 +31,27 @@
     <name>testset</name>
     <command>
       <expand>tools</expand>/ldf2samples <expand>fl</expand>/ldf/fl.ldf
-  </command>
+    </command>
   </tool>
   <tool>
     <name>transformation</name>
     <command>
       <expand>tools</expand>/xbgf
     </command>
   </tool>
-     
+
   <source>
     <name>antlr</name>
     <extraction>
       <name>
         <expand>tools</expand>/antlr2bgf
       </name>
-      <arguments>
-        <argument>
-          <expand>fl</expand>/java1/FL.g
-        </argument>
-        <argument>
-          antlr.bgf
-        </argument>
-      </arguments>
+      <argument>
+        <expand>fl</expand>/java1/FL.g
+      </argument>
+      <argument>
+        antlr.bgf
+      </argument>
     </extraction>
     <parsing>
       <command>
@@ -72,14 +70,12 @@
       <name>
         <expand>tools</expand>/dcg2bgf
       </name>
-      <arguments>
-        <argument>
-          <expand>fl</expand>/prolog/Parser.pro
-        </argument>
-        <argument>
-          dcg.bgf
-        </argument>
-      </arguments>
+      <argument>
+        <expand>fl</expand>/prolog/Parser.pro
+      </argument>
+      <argument>
+        dcg.bgf
+      </argument>
     </extraction>
     <parsing>
       <command>
@@ -98,17 +94,15 @@
       <name>
         <expand>tools</expand>/java2bgf
       </name>
-      <arguments>
-        <argument>
-          <expand>fl</expand>/java1
-        </argument>
-        <argument>
-          types
-        </argument>
-        <argument>
-          om.bgf
-        </argument>
-      </arguments>
+      <argument>
+        <expand>fl</expand>/java1
+      </argument>
+      <argument>
+        types
+      </argument>
+      <argument>
+        om.bgf
+      </argument>
     </extraction>
   </source>
   <source>
@@ -117,14 +111,12 @@
       <name>
         <expand>tools</expand>/xsd2bgf
       </name>
-      <arguments>
-        <argument>
-          <expand>fl</expand>/xsd/fl.xsd
-        </argument>
-        <argument>
-          xsd.bgf
-        </argument>
-      </arguments>
+      <argument>
+        <expand>fl</expand>/xsd/fl.xsd
+      </argument>
+      <argument>
+        xsd.bgf
+      </argument>
     </extraction>
   </source>
   <source>
@@ -133,17 +125,15 @@
       <name>
         <expand>tools</expand>/java2bgf
       </name>
-      <arguments>
-        <argument>
-          <expand>fl</expand>/java3
-        </argument>
-        <argument>
-          fl
-        </argument>
-        <argument>
-          jaxb.bgf
-        </argument>
-      </arguments>
+      <argument>
+        <expand>fl</expand>/java3
+      </argument>
+      <argument>
+        fl
+      </argument>
+      <argument>
+        jaxb.bgf
+      </argument>
     </extraction>
   </source>