Changeset 10

Timestamp:

02/11/05 12:08:35 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

1041

Message:

fix op0 prim dispatching

Location:

src

Files:

• Pretty.hs (modified) (1 diff)
• Prim.hs (modified) (2 diffs)

src/Pretty.hs

@@ -43 +43 @@
     pretty (VError x y) = "*** Error: " ++ x ++ "\n    in " ++ show y
     pretty (VArray (MkArray x)) = pretty (VList x)
+    pretty (VHash (MkHash x)) = show x
     pretty VUndef = "undef"
 

src/Prim.hs

@@ -177 +177 @@
     f :: [Val] -> Val
     f    = case arity of
-        0 -> op0 sym
+        0 -> \(x:_) -> op0 sym (vCast x)
         1 -> \[x]   -> op1 sym (vCast x)
         2 -> \[x,y] -> op2 sym (vCast x) (vCast y)
@@ -198 +198 @@
     prms = map takeWord prms'
 
-doFoldParam cxt [] []       = [buildParam cxt "" "$x" (Val VUndef)]
+doFoldParam cxt [] []       = [buildParam cxt "" "$a" (Val VUndef)]
 doFoldParam cxt [] (p:ps)   = (buildParam cxt "" (strInc $ paramName p) (Val VUndef):p:ps)
 doFoldParam cxt (s:name) ps = (buildParam cxt [s] name (Val VUndef) : ps)
 
 foldParam :: String -> Params -> Params
-foldParam "List" = doFoldParam "List" "*@_"
+foldParam "List" = doFoldParam "List" "*@x"
 foldParam _      = doFoldParam "Scalar" ""