Changeset 3210

Timestamp:

05/14/05 12:35:26 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

4718

Message:

* fix regression reported by gaal: my $s = <a>; my @a = <<$s>>;

Location:

src/Pugs

Files:

• Eval.hs (modified) (3 diffs)
• Parser.hs (modified) (2 diffs)
• Prim/Match.hs (modified) (1 diff)
• Types.hs (modified) (1 diff)

src/Pugs/Eval.hs

@@ -536 +536 @@
         flag_g  <- fromAdverb hv ["g", "global"]
         flag_i  <- fromAdverb hv ["i", "ignorecase"]
-        let rx | p5 = (`MkRulePCRE` g) . mkRegexWithPCRE (encodeUTF8 str) $
+        flag_s  <- fromAdverb hv ["stringify"] -- XXX hack
+        let rx | p5 = MkRulePCRE p5re g flag_s 
+               | otherwise = MkRulePGE str g flag_s
+            g = ('g' `elem` p5flags || flag_g)
+            p5re = mkRegexWithPCRE (encodeUTF8 str) $
                         [ pcreUtf8
                         , ('i' `elem` p5flags || flag_i) `implies` pcreCaseless
@@ -543 +547 @@
                         , ('x' `elem` p5flags) `implies` pcreExtended
                         ]
-               | otherwise = MkRulePGE str g
-            g = ('g' `elem` p5flags || flag_g)
         retVal $ VRule rx
         where
@@ -808 +810 @@
     val <- evalExp exp
     evalValType val
-evalExpType exp =
-    let exp' = unwrap exp in
-    if exp == exp'
-        then return $ mkType "Any"
-        else evalExpType exp'
+evalExpType (Cxt cxt _) = return $ typeOfCxt cxt
+evalExpType (Pos _ exp) = evalExpType exp
+evalExpType (Pad _ _ exp) = evalExpType exp
+evalExpType (Sym _ _ exp) = evalExpType exp
+evalExpType (Stmts _ exp) = evalExpType exp
+evalExpType _ = return $ mkType "Any"
 
 -- OK... Now let's implement the hideously clever autothreading algorithm.

src/Pugs/Parser.hs

@@ -1403 +1403 @@
     doSplit (Cxt (CxtItem _) (Val (VStr str))) = doSplitStr str
     
-    doSplit expr = Cxt cxtSlurpyAny $ App (Var "&infix:~~") [expr, rxSplit] []
+    doSplit expr = App (Var "&infix:~~") [expr, rxSplit] []
     rxSplit = Syn "rx" $
         [ Val $ VStr "(\\S+)"
@@ -1409 +1409 @@
             [ castV (VStr "P5", VInt 1)
             , castV (VStr "g", VInt 1)
+            , castV (VStr "stringify", VInt 1)
             ]
         ]

src/Pugs/Prim/Match.hs

@@ -120 +120 @@
     str     <- fromVal x
     rv      <- matchOnce str
-    ifListContext
-        (return $ VList rv)
-        (return . VInt $ genericLength rv)
+    cxt     <- asks envContext
+    if (not $ isSlurpyCxt cxt)
+        then return (VInt $ genericLength rv)
+        else return . VList $ if rxStringify rx
+            then map (VStr . vCast) rv
+            else rv
     where
     matchOnce :: String -> Eval [Val]

src/Pugs/Types.hs

@@ -128 +128 @@
         { rxRegex     :: !Regex -- ^ The \'regular\' expression
         , rxGlobal    :: !Bool  -- ^ Flag indicating \'global\' (match-all)
+        , rxStringify :: !Bool
         }
     | MkRulePGE
         { rxRule      :: !String -- ^ The \'rule\' expression
         , rxGlobal    :: !Bool   -- ^ Flag indicating \'global\' (match-all)
+        , rxStringify :: !Bool
         }
     deriving (Show, Eq, Ord, Typeable)