git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@136 ab42f6e…

…0-554d-0410-b580-99e487e6eeb2
grammarware · Aug 5, 2008 · 38c6bfd · 38c6bfd
1 parent bc4b5d5
commit 38c6bfd
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 17 deletions.
diff --git a/shared/xsd/Makefile b/shared/xsd/Makefile
@@ -7,6 +7,13 @@ test:
 	make check
 
 check:
+	make check1 arg=bgf.xsd
+	make check1 arg=xbgf.xsd
+	make check1 arg=xbgf.xsd
+	make check1 arg=btf.xsd
+	make check1 arg=ldf.xsd
+
+check-old:
 	@for file in *.xsd ; \
 	do \
 		echo Validating $$file ... ; \
@@ -15,6 +22,12 @@ check:
 		${viewer} $$file > /dev/null ;\
 	done
 
+check1:
+		echo Validating $$arg ... ; \
+		java -jar ${validator} $$arg ; \
+		echo Translating $$arg to BGF ... ; \
+		${viewer} $$arg > /dev/null ;\
+
 clean:
 	rm -rf bin obj
 	rm -f *.user

diff --git a/shared/xsd/lcf.xsd b/shared/xsd/lcf.xsd
@@ -18,17 +18,17 @@
     <xsd:complexType>
       <xsd:sequence>
         <xsd:choice minOccurs="0" maxOccurs="unbounded">
-          <xsd:element name="shortcut" type="lcf:shortcuttype" />
-          <xsd:element name="action" type="lcf:actiontype" />
-          <xsd:element name="source" type="lcf:sourcetype" />
-          <xsd:element name="target" type="lcf:targettype" />
+          <xsd:element name="shortcut" type="lcf:shortcutType" />
+          <xsd:element name="action" type="lcf:actionType" />
+          <xsd:element name="source" type="lcf:sourceType" />
+          <xsd:element name="target" type="lcf:targetType" />
           <xsd:element name="comment" type="ldf:mixedType" />
         </xsd:choice>
       </xsd:sequence>
     </xsd:complexType>
   </xsd:element>
 
-  <xsd:complexType name="actiontype">
+  <xsd:complexType name="actionType">
     <xsd:sequence>
       <xsd:element name="comment" type="xsd:string" minOccurs="0"/>
       <xsd:element name="name" type="xsd:string" maxOccurs="unbounded"/>
@@ -42,7 +42,7 @@
     </xsd:sequence>
   </xsd:complexType>
 
-  <xsd:complexType name="shortcuttype">
+  <xsd:complexType name="shortcutType">
     <xsd:sequence>
       <xsd:element name="name" type="xsd:string" />
       <xsd:element name="definition">
@@ -95,45 +95,51 @@
     <xsd:attribute name="out" type="xsd:string" use="optional" />
   </xsd:complexType>
 
-  <xsd:complexType name="sourcetype">
+  <xsd:complexType name="sourceType">
     <xsd:sequence>
       <xsd:element name="name" type="xsd:string" />
-      <xsd:element name="type" type="xsd:string" />
-      <xsd:element name="arguments">
+      <xsd:element name="extractor">
         <xsd:complexType>
           <xsd:sequence>
-            <xsd:element maxOccurs="unbounded" name="argument">
-               <xsd:complexType mixed="true">
-                  <xsd:group ref="lcf:expansion" minOccurs="0" maxOccurs="unbounded"/>
+             <xsd:element name="name" type="xsd:string"/>
+             <xsd:element name="arguments">
+               <xsd:complexType>
+                  <xsd:sequence>
+                    <xsd:element maxOccurs="unbounded" name="argument">
+                      <xsd:complexType mixed="true">
+                        <xsd:group ref="lcf:expansion" minOccurs="0" maxOccurs="unbounded"/>
+                      </xsd:complexType>
+                    </xsd:element>
+                  </xsd:sequence>
                </xsd:complexType>
-            </xsd:element>
+	     </xsd:element>
           </xsd:sequence>
         </xsd:complexType>
       </xsd:element>
       <xsd:element name="parser" minOccurs="0">
         <xsd:complexType>
           <xsd:sequence>
-            <xsd:element name="command" type="lcf:commandtype" maxOccurs="unbounded"/>
+            <xsd:element name="command" type="lcf:commandtype"/>
           </xsd:sequence>
         </xsd:complexType>
       </xsd:element>
       <xsd:element name="evaluator" minOccurs="0">
         <xsd:complexType>
           <xsd:sequence>
-            <xsd:element name="command" type="lcf:commandtype" maxOccurs="unbounded"/>
+            <xsd:element name="command" type="lcf:commandtype"/>
           </xsd:sequence>
         </xsd:complexType>
       </xsd:element>
     </xsd:sequence>
   </xsd:complexType>
 
-  <xsd:complexType name="targettype">
+  <xsd:complexType name="targetType">
     <xsd:sequence>
       <xsd:element name="name" type="xsd:string" />
       <xsd:element maxOccurs="unbounded" name="branch">
         <xsd:complexType>
           <xsd:sequence>
-            <xsd:element name="take" type="xsd:string" />
+            <xsd:element name="input" type="xsd:string" />
             <xsd:element name="perform" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
           </xsd:sequence>
         </xsd:complexType>