Changeset 8298 for src/Pugs/Bind.hs

Show
Ignore:
Timestamp:
12/18/05 19:14:47 (3 years ago)
Author:
gaal
Message:

unbreak named args

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • src/Pugs/Bind.hs

    r8153 r8298  
    151151isNamedArg :: Exp -> Bool 
    152152isNamedArg (Syn "named" [(Val (VStr _)), _]) = True 
     153isNamedArg (Syn "named" [Ann _ (Val (VStr _)), _]) = True -- should the Ann reach here? 
    153154isNamedArg arg@(Syn "named" _)               = error $ "malformed named arg: " ++ show arg 
    154155isNamedArg _                                 = False 
     
    156157unwrapNamedArg :: Exp -> (String, Exp) 
    157158unwrapNamedArg (Syn "named" [(Val (VStr key)), val]) = (key, val) 
     159unwrapNamedArg (Syn "named" [Ann _ (Val (VStr key)), val]) = (key, val) -- (see comment in isNamedArg) 
    158160unwrapNamedArg x = error $ "not a well-formed named arg: " ++ show x 
    159161