Changeset 14599 for src/Pugs/Prim.hs

Timestamp:

11/03/06 05:30:51 (2 years ago)

Author:

allbery_b

svk:copy_cache_prev:

41990

Message:

AUTHORS: hello, world\n :)
src/Pugs/Compat.hs: added file time tests
src/Pugs/Internals.hs, src/Pugs/Prim.hs: abstract out guts of "time" for

use in $*BASETIME and file tests

src/Pugs/Run.hs: add $*BASETIME
src/Pugs/AST.hs: document _reserved and filterUserDefinedPad; add $*BASETIME

to _reserved

src/Pugs/Prim.hs: add file time operators -M, -C, -A
src/Pugs/Prim/FileTest.hs: add implementation of file time operators
t/operators/filetest.t: correct existing file time operator tests, add a few

more, add all of them to the plan

Files:

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

src/Pugs/Prim.hs

@@ -73 +73 @@
 op0 "time"  = const $ do
     clkt <- guardIO getClockTime
-    return $ VRat $ fdiff $ diffClockTimes clkt epochClkT
-    where
-       epochClkT = toClockTime epoch
-       epoch = CalendarTime 2000 January 1 0 0 0 0 Saturday 0 "UTC" 0 False
-       -- 10^12 is expanded because the alternatives tried gave type warnings.
-       fdiff = \d -> (fromInteger $ tdPicosec d)
-                   / (clocksPerSecond * clocksPerSecond)
-                   + (fromIntegral $ tdSec d)
+    return $ VRat $ pugsTimeSpec clkt
 op0 "times"  = const $ do
     ProcessTimes _ u s cu cs <- guardIO getProcessTimes
@@ -430 +423 @@
 op1 "-z"    = FileTest.sizeIsZero
 op1 "-s"    = FileTest.fileSize
+op1 "-M"    = FileTest.fileMTime
+op1 "-A"    = FileTest.fileATime
+op1 "-C"    = FileTest.fileCTime
 op1 "-f"    = FileTest.isFile
 op1 "-d"    = FileTest.isDirectory
@@ -1824 +1820 @@
 \\n   Bool      spre    -e      unsafe (Str)\
 \\n   Int       spre    -s      unsafe (Str)\
+\\n   Num       spre    -M      unsafe (Str)\
+\\n   Num       spre    -A      unsafe (Str)\
+\\n   Num       spre    -C      unsafe (Str)\
 \\n   Bool      spre    -f      unsafe (Str)\
 \\n   Bool      spre    -d      unsafe (Str)\