From 364b3a94c434de4094caa65f894f380405ba1af1 Mon Sep 17 00:00:00 2001 From: Doug Coleman <doug.coleman@gmail.com> Date: Mon, 21 Apr 2008 15:06:39 -0500 Subject: [PATCH] fix circular dependency --- extra/db/queries/queries.factor | 1 - extra/db/tuples/tuples.factor | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/extra/db/queries/queries.factor b/extra/db/queries/queries.factor index 9aa29bbb73..c9fd9a38a4 100644 --- a/extra/db/queries/queries.factor +++ b/extra/db/queries/queries.factor @@ -6,7 +6,6 @@ math.bitfields.lib namespaces.lib db db.tuples db.types math.intervals ; IN: db.queries -GENERIC: eval-generator ( singleton -- obj ) GENERIC: where ( specs obj -- ) : maybe-make-retryable ( statement -- statement ) diff --git a/extra/db/tuples/tuples.factor b/extra/db/tuples/tuples.factor index d91e9b2758..fd4cfb906f 100755 --- a/extra/db/tuples/tuples.factor +++ b/extra/db/tuples/tuples.factor @@ -3,7 +3,7 @@ USING: arrays assocs classes db kernel namespaces classes.tuple words sequences slots math accessors math.parser io prettyprint db.types continuations -mirrors sequences.lib tools.walker combinators.lib db.queries ; +mirrors sequences.lib tools.walker combinators.lib ; IN: db.tuples : define-persistent ( class table columns -- ) @@ -50,6 +50,7 @@ HOOK: <select-by-slots-statement> db ( tuple class -- tuple ) HOOK: insert-tuple* db ( tuple statement -- ) +GENERIC: eval-generator ( singleton -- obj ) SINGLETON: retryable : make-retryable ( obj -- obj' )