Changeset 6 for trunk/YamlReference/yaml2yeast-test

Timestamp:

04/06/08 04:24:28 (9 months ago)

Author:

oren

Message:

Version 0.9 - compatible with the April 06, 2008 draft.

Files:

• trunk/YamlReference/yaml2yeast-test/Main.hs (modified) (4 diffs)

trunk/YamlReference/yaml2yeast-test/Main.hs

@@ -75 +75 @@
               | WithN  -- ^ Production requiring $n$ argument.
               | WithC  -- ^ Production requiring $c$ argument.
-              | WithS  -- ^ Production requiring $s$ argument.
               | WithT  -- ^ Production requiring $t$ argument.
               | WithNC -- ^ Production requiring $n$ and $c$ arguments.
-              | WithNS -- ^ Production requiring $n$ and $s$ arguments.
               | WithNT -- ^ Production requiring $n$ and $t$ arguments.
   deriving Eq
@@ -90 +88 @@
            WithN  -> " n"
            WithC  -> " c"
-           WithS  -> " s"
            WithT  -> " t"
            WithNC -> " n c"
-           WithNS -> " n s"
            WithNT -> " n t"
 
@@ -118 +114 @@
 testType file = do withN <- isWith "n" file
                    withC <- isWith "c" file
-                   withS <- isWith "s" file
                    withT <- isWith "t" file
-                   case (withN, withC, withS, withT) of
-                        (False, False, False, False) -> return Plain
-                        (True,  False, False, False) -> return WithN
-                        (False, False, True,  False) -> return WithS
-                        (False, True,  False, False) -> return WithC
-                        (False, False, False, True)  -> return WithT
-                        (True,  True,  False, False) -> return WithNC
-                        (True,  False, True,  False) -> return WithNS
-                        (True,  False, False, True)  -> return WithNT
-                        (_,     _,     _,     _)     -> error $ file ++ ": unknown parameters combination"
+                   case (withN, withC, withT) of
+                        (False, False, False) -> return Plain
+                        (True,  False, False) -> return WithN
+                        (False, True,  False) -> return WithC
+                        (False, False, True)  -> return WithT
+                        (True,  True,  False) -> return WithNC
+                        (True,  False, True)  -> return WithNT
+                        (_,     _,     _)     -> error $ file ++ ": unknown parameters combination"
 
 -- | @testProduction file@ extracts the production name from a test input
@@ -178 +171 @@
                        WithN  -> tokenizerWithN (testProduction inputFile)  (testParameter "n" inputFile)
                        WithC  -> tokenizerWithC (testProduction inputFile)  (testParameter "c" inputFile)
-                       WithS  -> tokenizerWithS (testProduction inputFile)  (testParameter "s" inputFile)
                        WithT  -> tokenizerWithT (testProduction inputFile)  (testParameter "t" inputFile)
                        WithNC -> tokenizerWithNC (testProduction inputFile) (testParameter "n" inputFile) (testParameter "c" inputFile)
-                       WithNS -> tokenizerWithNS (testProduction inputFile) (testParameter "n" inputFile) (testParameter "s" inputFile)
                        WithNT -> tokenizerWithNT (testProduction inputFile) (testParameter "n" inputFile) (testParameter "t" inputFile)
      case result of