Changeset 5843

Timestamp:

07/27/05 16:27:42 (3 years ago)

Author:

autrijus

svk:copy_cache_prev:

7758

Message:

* Primitive listops now handles Pairs as regular arguments

instead of named bindings.

Location:

src/Pugs

Files:

• Context.hs (modified) (1 diff)
• Eval.hs (modified) (1 diff)
• Prim/Param.hs (modified) (1 diff)

src/Pugs/Context.hs

@@ -15 +15 @@
     deltaType,
     isaType,
+    isaType',
     addNode,
     initTree

src/Pugs/Eval.hs

@@ -921 +921 @@
     -- check invs and args for Pair types; if they are, reduce them fully
     -- to stringified normal form.
-    let isPairs = (map isPairParam (subParams sub)) ++ repeat False
-        isPairParam = isaType cls "Pair" . typeOfCxt . paramContext
+    let isPairs = (map (isPairParam . typeOfCxt . paramContext) (subParams sub)) ++ repeat False
+        isPairParam typ = isaType' cls typ (MkType "Pair")
         cls = envClasses env
         argsPairs = if isJust invs then tail isPairs else isPairs

src/Pugs/Prim/Param.hs

@@ -15 +15 @@
     (buildParam "Hash" "*" "@?0" (Val VUndef)):
     (buildParam "Hash" "*" "%?0" (Val VUndef)):ps)
-foldParam "List"    = doFoldParam "List" "*@?1"
+foldParam "List"    = doFoldParam "Any" "*@?1"
 foldParam ('r':'w':'!':"List") = \ps -> ((buildParam "List" "" "@?0" (Val VUndef)) { isLValue = True }:ps)
 foldParam ('r':'w':'!':str) = \ps -> ((buildParam str "" "$?1" (Val VUndef)) { isLValue = True }:ps)