From 3fd1f5652a3af22e90a040a821d244a91a3553a0 Mon Sep 17 00:00:00 2001 From: bjorn Date: Wed, 28 May 2008 15:10:36 +0000 Subject: Switch to new options handling. This changes lots of stuff, let me know if it broke anything. Comments: - We use a local hacked version of GetOpt that allows long forms of commands to start with a single dash. This breaks other parts of GetOpt. For example, arguments to short options now require a =, and does not allo pace after the option character. - The new command parsing is currently only used for the program command line, pragmas and the arguments for the 'i' shell command. - I made a quick hack for the options for showTerm, which currently makes it impossible to use the print style flags for cc. This will be replaced by a facility for parsing command-specific options. - The verbosity handling is broken in some places. I will fix that in a later patch. --- src-3.0/GF/Source/GrammarToSource.hs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src-3.0/GF/Source/GrammarToSource.hs') diff --git a/src-3.0/GF/Source/GrammarToSource.hs b/src-3.0/GF/Source/GrammarToSource.hs index 6926ec202..75446a6e4 100644 --- a/src-3.0/GF/Source/GrammarToSource.hs +++ b/src-3.0/GF/Source/GrammarToSource.hs @@ -51,7 +51,7 @@ trModule (i,mo) = case mo of body = P.MBody (trExtends (extend m)) (mkOpens (map trOpen (opens m))) - (mkTopDefs (concatMap trAnyDef (tree2list (jments m)) ++ map trFlag (flags m))) + (mkTopDefs (concatMap trAnyDef (tree2list (jments m)) ++ trFlags (flags m))) trExtends :: [(Ident,MInclude Ident)] -> P.Extend trExtends [] = P.NoExt @@ -130,11 +130,11 @@ trPerh p = case p of May b -> P.EIndir $ tri b _ -> P.EMeta --- +trFlags :: ModuleOptions -> [P.TopDef] +trFlags = map trFlag . moduleOptionsGFO -trFlag :: Option -> P.TopDef -trFlag o = case o of - Opt (f,[x]) -> P.DefFlag [P.FlagDef (tri $ identC (BS.pack f)) (tri $ identC (BS.pack x))] - _ -> P.DefFlag [] --- warning? +trFlag :: (String,String) -> P.TopDef +trFlag (f,x) = P.DefFlag [P.FlagDef (tri $ identC (BS.pack f)) (tri $ identC (BS.pack x))] trt :: Term -> P.Exp trt trm = case trm of -- cgit v1.2.3