Changeset 13827 for src/Pugs/Eval

Timestamp:

10/03/06 16:24:40 (2 years ago)

Author:

audreyt

Message:

* Further tweaks to the slurpy-param model. The quicksort

example was broken all along, and this commit removes the
previous made-it-work kluge:

multi quicksort () { () }
multi quicksort (*$x, *@xs) { ... }

my @x;
quicksort(@x); # this should not have succeeded!

It was binding to variant #1, but there's really nothing
there that would cause it to bind that way. I think rewriting
the example to "quicksort(|@x)" is the sanest approach, but
that'll have to wait till tomorrow as |@x doesn't work at this
moment...

Files:

• src/Pugs/Eval/Var.hs (modified) (5 diffs)

src/Pugs/Eval/Var.hs

@@ -290 +290 @@
         subSyms     <- findSyms var
         lens        <- mapM argSlurpLen _invs_args
-        doFindSub (sum lens) subSyms
+        doFindSub lens subSyms
 
     argSlurpLen :: Exp -> Eval Int
@@ -309 +309 @@
     -- doFindSub :: (_var :: Var, _invs :: Maybe Exp, _args :: [Exp])
     --     => Int -> [(Var, Val)] -> Eval (Maybe VCode)
-    doFindSub slurpLen subSyms = do
-        subs' <- subs slurpLen subSyms
+    doFindSub slurpLens subSyms = do
+        subs' <- subs slurpLens subSyms
         -- let foo (x, sub) = show x ++ show (map paramContext $ subParams sub)
         -- trace (unlines $ map foo $ sort subs') return ()
@@ -321 +321 @@
     -- subs :: (_invs :: Maybe Exp, _args :: [Exp])
     --     => Int -> [(Var, Val)] -> Eval [((Bool, Bool, Int, Int), VCode)]
-    subs slurpLen subSyms = fmap catMaybes . forM subSyms $ \(_, val) -> do
+    subs slurpLens subSyms = fmap catMaybes . forM subSyms $ \(_, val) -> do
         sub@(MkCode{ subReturns = ret, subParams = prms }) <- fromVal val
         let (named, positional) = partition isNamedArg _invs_args
             isNamedArg (Syn "named" _) = True
             isNamedArg _               = False
-            rv = return $ arityMatch sub (length positional) (length named) slurpLen
+            rv = return $ arityMatch sub (length positional) (length named) slurpLens
 
         maybeM rv $ \fun -> do
@@ -655 +655 @@
             Nothing -> mzero
         
-arityMatch :: VCode -> Int -> Int -> Int -> Maybe VCode
-arityMatch sub@MkCode{ subAssoc = assoc, subParams = prms } posLen namLen argSlurpLen
+arityMatch :: VCode -> Int -> Int -> [Int] -> Maybe VCode
+arityMatch sub@MkCode{ subAssoc = assoc, subParams = prms } posLen namLen argSlurpLens
     | A_list    <- assoc = Just sub
     | A_chain   <- assoc = Just sub
 
+{-
     | isNothing $ find (not . isSlurpy) prms -- XXX - what about empty ones?
     , slurpLen  <- length $ filter (\p -> isSlurpy p && v_sigil (paramName p) == SScalar) prms
@@ -665 +666 @@
     , if hasArray then slurpLen <= argSlurpLen else slurpLen == argSlurpLen
     = Just sub
-
-    | reqLen    <- length $ filter (\p -> not (isOptional p || (isSlurpy p && v_sigil (paramName p) /= SScalar))) prms
+-}
+
+    | reqLen    <- length $ filter (\p -> not (isOptional p || isSlurpy p)) prms
     , optLen    <- length $ filter (\p -> isOptional p) prms
     , hasArray  <- isJust $ find (\p -> isSlurpy p && v_sigil (paramName p) == SArray) prms
     , hasHash   <- isJust $ find (\p -> isSlurpy p && v_sigil (paramName p) == SHash) prms
+    , slurpLen  <- length $ filter (\p -> isSlurpy p && v_sigil (paramName p) == SScalar) prms
     , argLen >= reqLen && (hasArray || (if hasHash then posLen else argLen) <= (reqLen + optLen))
+    , if hasArray then slurpLen <= sum (drop reqLen argSlurpLens) else slurpLen == sum (drop argLen argSlurpLens)
     = Just sub