Changeset 4463 for src/Pugs/Types

Timestamp:

06/08/05 21:55:10 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

6052

Message:

* cosmetic fixes to code to agree with the slides. ;)

Location:

src/Pugs/Types

Files:

• Array.hs (modified) (2 diffs)
• Hash.hs (modified) (1 diff)

src/Pugs/Types/Array.hs

@@ -251 +251 @@
     array_deleteElem a _   = retConstError $ VStr $ show a
 
-evalPerl5Sub :: String -> [PerlSV] -> Eval Val
-evalPerl5Sub code args = do
+perl5EvalApply :: String -> [PerlSV] -> Eval Val
+perl5EvalApply code args = do
     env <- ask
     rv  <- liftIO $ do
@@ -266 +266 @@
     array_fetchVal sv idx = do
         idxSV   <- fromVal $ castV idx
-        evalPerl5Sub "sub { $_[0]->[$_[1]] }" [sv, idxSV]
+        perl5EvalApply "sub { $_[0]->[$_[1]] }" [sv, idxSV]
     array_clear sv = do
-        evalPerl5Sub "sub { undef @{$_[0]} }" [sv]
+        perl5EvalApply "sub { undef @{$_[0]} }" [sv]
         return ()
     array_storeVal sv idx val = do
         idxSV   <- fromVal $ castV idx
         valSV   <- fromVal val
-        evalPerl5Sub "sub { $_[0]->[$_[1]] = $_[2] }" [sv, idxSV, valSV]
+        perl5EvalApply "sub { $_[0]->[$_[1]] = $_[2] }" [sv, idxSV, valSV]
         return ()
     array_deleteElem sv idx = do
         idxSV   <- fromVal $ castV idx
-        evalPerl5Sub "sub { delete $_[0]->[$_[1]] }" [sv, idxSV]
-        return ()
+        perl5EvalApply "sub { delete $_[0]->[$_[1]] }" [sv, idxSV]
+        return ()

src/Pugs/Types/Hash.hs

@@ -122 +122 @@
     hash_fetchVal sv key = do
         keySV   <- fromVal $ castV key
-        evalPerl5Sub "sub { $_[0]->{$_[1]} }" [sv, keySV]
+        perl5EvalApply "sub { $_[0]->{$_[1]} }" [sv, keySV]
     hash_clear sv = do
-        evalPerl5Sub "sub { undef %{$_[0]} }" [sv]
+        perl5EvalApply "sub { undef %{$_[0]} }" [sv]
         return ()
     hash_storeVal sv key val = do
         keySV   <- fromVal $ castV key
         valSV   <- fromVal val
-        evalPerl5Sub "sub { $_[0]->{$_[1]} = $_[2] }" [sv, keySV, valSV]
+        perl5EvalApply "sub { $_[0]->{$_[1]} = $_[2] }" [sv, keySV, valSV]
         return ()
     hash_fetchKeys sv = do
-        keysSV  <- evalPerl5Sub "sub { join $/, keys %{$_[0]} }" [sv]
+        keysSV  <- perl5EvalApply "sub { join $/, keys %{$_[0]} }" [sv]
         keysStr <- fromVal keysSV
         return $ lines keysStr
     hash_deleteElem sv key = do
         keySV   <- fromVal $ castV key
-        evalPerl5Sub "sub { delete $_[0]->{$_[1]} }" [sv, keySV]
+        perl5EvalApply "sub { delete $_[0]->{$_[1]} }" [sv, keySV]
         return ()
     hash_isEmpty sv = do
-        fromVal =<< evalPerl5Sub "sub { !!%{$_[0]} }" [sv]
+        fromVal =<< perl5EvalApply "sub { !!%{$_[0]} }" [sv]