Changeset 6 for trunk/YamlReference/yaml2yeast

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/Main.hs (modified) (6 diffs)

trunk/YamlReference/yaml2yeast/Main.hs

@@ -164 +164 @@
           | ParamN (Maybe Int)     -- ^ Specify $n$ parameter.
           | ParamT (Maybe Chomp)   -- ^ Specify $t$ parameter.
-          | ParamS (Maybe Style)   -- ^ Specify $s$ parameter.
           | ParamC (Maybe Context) -- ^ Specify $c$ parameter.
           | Input String           -- ^ Specify input file name.
@@ -193 +192 @@
              (ReqArg (ParamC . readParameter) "context")
              "c parameter value (context)",
-      Option ['s'] ["style"]
-             (ReqArg (ParamS . readParameter) "style")
-             "s parameter value (style)",
       Option ['t'] ["chomp"]
              (ReqArg (ParamT . readParameter) "chomp")
@@ -230 +226 @@
       oN             :: Maybe Int,     -- ^ N parameter, if any.
       oC             :: Maybe Context, -- ^ C parameter, if any.
-      oS             :: Maybe Style,   -- ^ S parameter, if any.
       oT             :: Maybe Chomp    -- ^ T parameter, if any.
   }
@@ -244 +239 @@
       oN             = Nothing,
       oC             = Nothing,
-      oS             = Nothing,
       oT             = Nothing
   }
@@ -260 +254 @@
        ParamN value    -> applyFlags flags options { oN = value }
        ParamC value    -> applyFlags flags options { oC = value }
-       ParamS value    -> applyFlags flags options { oS = value }
        ParamT value    -> applyFlags flags options { oT = value }
        Production name -> applyFlags flags options { oProduction = name }
@@ -283 +276 @@
 runWith :: Options -> IO ()
 runWith options =
-  do let resolved = case ((oN options), (oC options), (oS options), (oT options)) of
-                         (Nothing,    Nothing,    Nothing,    Nothing) -> tokenizer       (oProduction options)
-                         (Just n,     Nothing,    Nothing,    Nothing) -> tokenizerWithN  (oProduction options) n
-                         (Nothing,    Just c,     Nothing,    Nothing) -> tokenizerWithC  (oProduction options) c
-                         (Nothing,    Nothing,    Just s,     Nothing) -> tokenizerWithS  (oProduction options) s
-                         (Nothing,    Nothing,    Nothing,    Just t)  -> tokenizerWithT  (oProduction options) t
-                         (Just n,     Just c,     Nothing,    Nothing) -> tokenizerWithNC (oProduction options) n c
-                         (Just n,     Nothing,    Just s,     Nothing) -> tokenizerWithNS (oProduction options) n s
-                         (Just n,     Nothing,    Nothing,    Just t)  -> tokenizerWithNT (oProduction options) n t
-                         _                                             -> error "No production with this combination of parameters"
+  do let resolved = case ((oN options), (oC options), (oT options)) of
+                         (Nothing,    Nothing,    Nothing) -> tokenizer       (oProduction options)
+                         (Just n,     Nothing,    Nothing) -> tokenizerWithN  (oProduction options) n
+                         (Nothing,    Just c,     Nothing) -> tokenizerWithC  (oProduction options) c
+                         (Nothing,    Nothing,    Just t)  -> tokenizerWithT  (oProduction options) t
+                         (Just n,     Just c,     Nothing) -> tokenizerWithNC (oProduction options) n c
+                         (Just n,     Nothing,    Just t)  -> tokenizerWithNT (oProduction options) n t
+                         _                                 -> error "No production with this combination of parameters"
      case resolved of
           Nothing     -> error $ "No production " ++ (oProduction options) ++ " or it doesn't take this combination of parameters"