Changeset 10356 for src/Pugs/Eval

Timestamp:

05/15/06 21:26:00 (3 years ago)

Author:

gaal

Message:

r10423@sike: roo | 2006-05-15 21:52:25 +0300

• parse and honor [\] metaoperator
• produce builtin
• update tests

Files:

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

src/Pugs/Eval/Var.hs

@@ -219 +219 @@
             }
     possiblyBuildMetaopVCode :: String -> Eval (Maybe VCode)
-    possiblyBuildMetaopVCode op' | "&prefix:[" `isPrefixOf` op', "]" `isSuffixOf` op' = do 
+    possiblyBuildMetaopVCode op'' | "&prefix:[" `isPrefixOf` op'', "]" `isSuffixOf` op'' = do 
         -- Strip the trailing "]" from op
-        let op = drop 9 (init op')
+        let op' = drop 9 (init op'')
+        let (op, keep) | '\\':real <- op' = (real, True)
+                       | otherwise        = (op', False)
         -- We try to find the userdefined sub.
         -- We use the first two elements of invs as invocants, as these are the
@@ -227 +229 @@
             rv = fmap (either (const Nothing) Just) $ findSub ("&infix:" ++ op) Nothing (take 2 $ args ++ [Val undef, Val undef])
         maybeM rv $ \code -> return $ mkPrim
-            { subName     = "&prefix:[" ++ op ++ "]"
+            { subName     = "&prefix:[" ++ (if keep then "\\" else "") ++ op ++ "]"
             , subType     = SubPrim
             , subAssoc    = "spre"
@@ -237 +239 @@
             , subBody     = Prim $ \[vs] -> do
                 list_of_args <- fromVal vs
-                op2Reduce list_of_args (VCode code)
+                op2Reduce keep list_of_args (VCode code)
             }
         -- Now we construct the sub. Is there a more simple way to do it?