From b79245dc6ccc3ba89a4fbdf5ef29b8a6d9ea86d4 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Fri, 1 May 2009 07:21:56 -0500
Subject: [PATCH] Adding and removing vocabs now updates all-vocabs-seq

---
 basis/tools/vocabs/vocabs.factor | 11 +++++++++--
 core/vocabs/vocabs.factor        | 23 ++++++++++++++++++++---
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/basis/tools/vocabs/vocabs.factor b/basis/tools/vocabs/vocabs.factor
index ba99a41eba..4b9a72a443 100644
--- a/basis/tools/vocabs/vocabs.factor
+++ b/basis/tools/vocabs/vocabs.factor
@@ -74,8 +74,6 @@ SYMBOL: failures
 
 SYMBOL: changed-vocabs
 
-[ f changed-vocabs set-global ] "tools.vocabs" add-init-hook
-
 : changed-vocab ( vocab -- )
     dup vocab changed-vocabs get and
     [ dup changed-vocabs get set-at ] [ drop ] if ;
@@ -287,3 +285,12 @@ MEMO: all-authors ( -- seq )
     \ all-vocabs-seq reset-memoized
     \ all-authors reset-memoized
     \ all-tags reset-memoized ;
+
+SINGLETON: cache-observer
+
+M: cache-observer vocabs-changed drop reset-cache ;
+
+[
+    f changed-vocabs set-global
+    cache-observer add-vocab-observer
+] "tools.vocabs" add-init-hook
\ No newline at end of file
diff --git a/core/vocabs/vocabs.factor b/core/vocabs/vocabs.factor
index 2b978e8666..73ffd1a80c 100644
--- a/core/vocabs/vocabs.factor
+++ b/core/vocabs/vocabs.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007, 2009 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors assocs strings kernel sorting namespaces
-sequences definitions ;
+sequences definitions init ;
 IN: vocabs
 
 SYMBOL: dictionary
@@ -65,8 +65,24 @@ M: object vocab-main vocab vocab-main ;
 
 M: f vocab-main ;
 
+SYMBOL: vocab-observers
+
+GENERIC: vocabs-changed ( obj -- )
+
+[ V{ } clone vocab-observers set-global ] "vocabs" add-init-hook
+
+: add-vocab-observer ( obj -- )
+    vocab-observers get push ;
+
+: remove-vocab-observer ( obj -- )
+    vocab-observers get delq ;
+
+: notify-vocab-observers ( -- )
+    vocab-observers get [ vocabs-changed ] each ;
+
 : create-vocab ( name -- vocab )
-    dictionary get [ <vocab> ] cache ;
+    dictionary get [ <vocab> ] cache
+    notify-vocab-observers ;
 
 ERROR: no-vocab name ;
 
@@ -99,7 +115,8 @@ M: string >vocab-link dup vocab [ ] [ <vocab-link> ] ?if ;
 
 : forget-vocab ( vocab -- )
     dup words forget-all
-    vocab-name dictionary get delete-at ;
+    vocab-name dictionary get delete-at
+    notify-vocab-observers ;
 
 M: vocab-spec forget* forget-vocab ;