Changeset 13273 for src/Pugs/Val

Timestamp:

09/13/06 22:55:25 (2 years ago)

Author:

gaal

Message:

* partial support for stringifying unpacky sigs; fails some tests.

(touch src/Pugs/Val.hs to get this to compile)

Files:

• src/Pugs/Val/Code.hs (modified) (2 diffs)

src/Pugs/Val/Code.hs

@@ -161 +161 @@
 
 prettyParam :: Param -> Bool -> Bool -> Doc
-prettyParam p isReq isPos = staticTypes <+> varName <> defaultHint <+>
-    (if haveDefault then equals <+> text "..." else empty) <+> acc <+> ref <+> lazy <+>
-    slots <+> constraints <+> debugDump
+prettyParam p isReq isPos = staticTypes <+> varName <> defaultHint <+> sep
+    [ traits, unpacking, constraints, debugDump ]
     where
     varName
@@ -173 +172 @@
     defaultHint = if not isReq && not haveDefault then text "?" else empty
     haveDefault = isJust $ unDefault $ p_default p
-    acc = case p_hasAccess p of
+    defaultVal  = if haveDefault then equals <+> text "..." else empty
+    traits      = sep [acc, ref, lazy, slots]
+    unpacking   = case p_unpacking p of
+        (Just s)   -> purePretty s
+        _          -> empty
+    acc         = case p_hasAccess p of
         AccessRO   -> empty
         AccessRW   -> text "is rw"
         AccessCopy -> text "is copy"
-    ref   = if p_isRef  p then text "is ref"  else empty
-    lazy  = if p_isLazy p then text "is lazy" else empty
+    ref         = if p_isRef  p then text "is ref"  else empty
+    lazy        = if p_isLazy p then text "is lazy" else empty
     -- slots = hsep [text ("is " ++ (cast aux)) <+> text "..." | (aux, val) <- Map.toList $ p_slots p] XXX: for when traits have args
-    slots = hsep [text ("is " ++ (cast $ fst trait)) | trait <- Map.toList $ p_slots p]
+    slots       = hsep [text ("is " ++ (cast $ fst trait)) | trait <- Map.toList $ p_slots p]
     constraints = hsep $ replicate (length $ p_constraints p) (text "where {...}")
-    debugDump = if True then empty else braces $ text $ show p -- XXX delme
+    debugDump   = if True then empty else braces $ text $ show p -- XXX delme
 --------------------------------------------------------------------------------------