Changeset 14547 for src/Pugs/Prim.hs

Timestamp:

10/30/06 04:04:52 (2 years ago)

Author:

audreyt

Message:

* Pugs.Prim: Also export IO::close and Socket::close so that

close $fh;
close $dh;
close $sh;

all DWIM.

* Also fix the parser error that mistook "(IO::Dir:)" in the

Prim.hs decl table as "(IO : Dir)".

Files:

• src/Pugs/Prim.hs (modified) (3 diffs)

src/Pugs/Prim.hs

@@ -458 +458 @@
     obj <- createObject (mkType "IO::Dir") []
     return . VObject $ obj{ objOpaque = Just $ toDyn dir }
-op1 "IO::Dir::close" = \v -> 
-    ifValTypeIsa v "IO::Dir" (op1 "IO::Dir::closedir" v) $ case v of
-        VHandle{}   -> op1 "IO::close" v
-        VSocket{}   -> op1 "Socket::close" v
-        _           -> die "Close" v
+op1 "IO::Dir::close" = op1 "IO::Dir::closedir"
 op1 "IO::Dir::closedir" = guardedIO (closeDirStream . fromObject)
 op1 "IO::Dir::rewind" = op1 "IO::Dir::rewinddir"
@@ -1681 +1677 @@
         ("export" `isSuffixOf` traits)
     (ret:assoc:sym:traits:prms) = words str
-    takeWord = takeWhile isWord . dropWhile (not . isWord)
+    takeWord = takeWord' . dropWhile (not . isWord)
+    takeWord' "" = ""
+    takeWord' (':':':':xs) = (':':':':takeWord' xs)
+    takeWord' (x:xs) | isWord x = (x:takeWord' xs)
+    takeWord' _ = ""
     isWord = not . (`elem` "(),:")
     prms'  = map takeWord prms
@@ -1966 +1966 @@
 \\n   Bool      pre     Pugs::Safe::safe_print     safe     (Str)\
 \\n   Bool      pre     flush   unsafe (IO)\
-\\n   Bool      pre     IO::close   unsafe (IO:)\
-\\n   Bool      pre     Socket::close   unsafe (Socket:)\
+\\n   Bool      pre     IO::close   unsafe,export (IO:)\
+\\n   Bool      pre     Socket::close   unsafe,export (Socket:)\
 \\n   Bool      pre     die     safe   (?Object)\
 \\n   Bool      pre     warn    safe   (List)\