calendar.format now depends on present instead of the other way around

diff --git a/basis/calendar/format/format.factor b/basis/calendar/format/format.factor
index 8d34e8a3a4ee15dc76dc74d109227bd5ba4644b1..a7c4410aa560516d1239b5fde1eccda750b9d14b 100644 (file)
--- a/basis/calendar/format/format.factor
+++ b/basis/calendar/format/format.factor
@@ -1,7 +1,8 @@
-USING: math math.order math.parser math.functions kernel sequences io\r
-accessors arrays io.streams.string splitting\r
-combinators accessors debugger\r
-calendar calendar.format.macros ;\r
+! Copyright (C) 2008 Slava Pestov.\r
+! See http://factorcode.org/license.txt for BSD license.\r
+USING: math math.order math.parser math.functions kernel\r
+sequences io accessors arrays io.streams.string splitting\r
+combinators accessors calendar calendar.format.macros present ;\r
 IN: calendar.format\r
 \r
 : pad-00 ( n -- str ) number>string 2 CHAR: 0 pad-left ;\r
@@ -288,3 +289,5 @@ ERROR: invalid-timestamp-format ;
             ]\r
         } formatted\r
     ] with-string-writer ;\r
+\r
+M: timestamp present timestamp>string ;\r

diff --git a/basis/present/present.factor b/basis/present/present.factor
index 519e995fe579806067dab0954d1b39990636b6e6..fe7025d559a05987a993b6c04f3c8680185dc834 100644 (file)
--- a/basis/present/present.factor
+++ b/basis/present/present.factor
@@ -1,15 +1,12 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors math math.parser calendar calendar.format
-strings words kernel effects ;
+USING: accessors math math.parser strings words kernel effects ;
 IN: present
 
 GENERIC: present ( object -- string )
 
 M: real present number>string ;
 
-M: timestamp present timestamp>string ;
-
 M: string present ;
 
 M: word present name>> ;