Changeset 12466 for src/Pugs/Eval

Timestamp:

08/19/06 17:48:35 (2 years ago)

Author:

audreyt

Message:

* Repair >>+<<. "drop 2" was typo'ed into "take 2"

Files:

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

src/Pugs/Eval/Var.hs

@@ -328 +328 @@
     -- firstArg :: (_args :: [Exp]) => [Exp]
     firstArg = [maybe (Val undef) id (listToMaybe _args)]
+    firstTwoArgs
+        | [] <- _args       = [Val undef, Val undef]
+        | [arg] <- _args    = [arg, Val undef]
+        | otherwise         = take 2 _args
 
     buildPrefixHyper name var = do
@@ -357 +361 @@
     buildInfixHyper name var = do
         let rv = fmap (either (const Nothing) Just) $
-                findSub var Nothing (take 2 (_args ++ [Val undef, Val undef]))
+                findSub var Nothing firstTwoArgs
         maybeM rv $ \code -> return $ mkPrim
             { subName     = name
@@ -380 +384 @@
             buildInfixHyper buf var{ v_name = cast $ Str.init (Str.tail buf) }
         | C_infix <- cat, __">>" `Str.isPrefixOf` buf, __"<<" `Str.isSuffixOf` buf = do
-            buildInfixHyper buf var{ v_name = cast $ Str.take 2 (dropEnd 2 buf) }
+            buildInfixHyper buf var{ v_name = cast $ Str.drop 2 (dropEnd 2 buf) }
         | C_prefix <- cat, '[' <- Str.head buf, ']' <- Str.last buf = do
             -- Strip the trailing "]" from op
@@ -392 +396 @@
                 rv = fmap (either (const Nothing) Just) $
                     findSub (var{ v_categ = C_infix, v_name = cast op }) Nothing
-                        (take 2 $ _args ++ [Val undef, Val undef])
+                        firstTwoArgs
             maybeM rv $ \code -> return $ mkPrim
                 { subName     = buf
@@ -450 +454 @@
     return $ deltaType cls x typ
 
+findAttrs :: Pkg -> Eval (Maybe [Pkg])
 findAttrs pkg = do
     maybeM (findVar $ metaVar pkg) $ \ref -> do