Changeset 12208 for src/Pugs/Eval

Timestamp:

08/14/06 10:04:38 (2 years ago)

Author:

audreyt

Message:

* add hash_fetchSize to unify the "get size from to-be-flattened-thing" logic

Files:

• src/Pugs/Eval/Var.hs (modified) (1 diff)

src/Pugs/Eval/Var.hs

@@ -344 +344 @@
         doFindSub (sum lens) subSyms
     argSlurpLen :: Exp -> Eval Int
-    argSlurpLen (Val val) = join $ doArray val array_fetchSize
+    argSlurpLen (Val val) = valSlurpLen val
     argSlurpLen (Var name) = do
         val <- evalExp (Var name)
-        join $ doArray val array_fetchSize
+        valSlurpLen val
     argSlurpLen (Syn "," list) =  return $ length list
     argSlurpLen _ = return 1 -- XXX
+
+    valSlurpLen :: Val -> Eval Int
+    valSlurpLen (VList list) = return $ length list
+    valSlurpLen (VRef (MkRef (IArray av))) = array_fetchSize av
+    valSlurpLen (VRef (MkRef (IHash hv))) = hash_fetchSize hv
+    valSlurpLen _  = return 1 -- XXX
+
     doFindSub :: Int -> [(String, Val)] -> Eval (Maybe VCode)
     doFindSub slurpLen subSyms = do