From 78eea5071bb8c5ca67394383ba3c34b7d5f60529 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Sat, 2 Dec 2017 08:06:38 -0600
Subject: [PATCH] annotations: Use SAME-FUNCTOR: to put in the annotations
 vocab.

---
 extra/annotations/annotations-docs.factor |  3 ++
 extra/annotations/annotations.factor      | 45 ++++++++++++-----------
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/extra/annotations/annotations-docs.factor b/extra/annotations/annotations-docs.factor
index 0d37672fe3..a3c8c7208b 100644
--- a/extra/annotations/annotations-docs.factor
+++ b/extra/annotations/annotations-docs.factor
@@ -3,6 +3,7 @@ help help.markup help.topics kernel sequences sorting vocabs
 words combinators.smart tools.crossref ;
 IN: annotations
 
+![=[
 <PRIVATE
 : comment-word ( base -- word ) "!" prepend "annotations" lookup-word ;
 : comment-usage-word ( base -- word ) "s" append "annotations" lookup-word ;
@@ -66,3 +67,5 @@ annotation-tags [
         [ [ comment-word ] [ comment-usage-word ] [ comment-usage.-word ] tri 3array related-words ]
     } cleave
 ] each
+
+]=]
\ No newline at end of file
diff --git a/extra/annotations/annotations.factor b/extra/annotations/annotations.factor
index 0fa4b5b0be..428dd58a9b 100644
--- a/extra/annotations/annotations.factor
+++ b/extra/annotations/annotations.factor
@@ -1,7 +1,7 @@
 ! (c)2009 Joe Groff, Doug Coleman. see BSD license
-USING: accessors combinators.short-circuit definitions functors
-kernel lexer namespaces parser prettyprint tools.crossref
-sequences words ;
+USING: accessors combinators.short-circuit kernel lexer
+namespaces sequences tools.crossref words ;
+FROM: functors2 => new-word SAME-FUNCTOR: ;
 IN: annotations
 
 <<
@@ -14,30 +14,31 @@ IN: annotations
     [ { [ word? ] [ vocabulary>> "annotations" = ] } 1&& not ]
     filter ;
 
-<FUNCTOR: define-annotation ( NAME -- )
+SAME-FUNCTOR: annotation ( NAME: new-word -- ) [[
 
-(NAME) DEFINES (${NAME})
-!NAME  DEFINES !${NAME}
-NAMEs  DEFINES ${NAME}s
-NAMEs. DEFINES ${NAME}s.
+USING: annotations kernel sequences tools.crossref ;
 
-WHERE
+: (${NAME}) ( str -- ) drop ; inline
 
-: (NAME) ( str -- ) drop ; inline
-SYNTAX: !NAME (parse-annotation) \ (NAME) suffix! ;
+SYNTAX: !${NAME} (parse-annotation) \ (${NAME}) suffix! ;
 
-: NAMEs ( -- usages )
-    \ (NAME) (non-annotation-usage) ;
-: NAMEs. ( -- )
-    NAMEs sorted-definitions. ;
+: ${NAME}s ( -- usages )
+    \ (${NAME}) (non-annotation-usage) ;
 
-;FUNCTOR>
+: ${NAME}s. ( -- )
+    ${NAME}s sorted-definitions. ;
 
-CONSTANT: annotation-tags {
-    "XXX" "TODO" "FIXME" "BUG" "REVIEW" "LICENSE"
-    "AUTHOR" "BROKEN" "HACK" "LOL" "NOTE"
-}
-
-annotation-tags [ define-annotation ] each
+]]
 
+SYNTAX: \ANNOTATIONS: ";" [ define-annotation ] each-token ;
 >>
+
+! SYMBOLS: XXX TODO FIXME BUG REVIEW LICENSE
+    ! AUTHOR BROKEN HACK LOL NOTE ;
+
+! CONSTANT: annotation-tags {
+    ! XXX TODO FIXME BUG REVIEW LICENSE
+    ! AUTHOR BROKEN HACK LOL NOTE
+! }
+
+ANNOTATIONS: XXX TODO FIXME BUG REVIEW LICENSE AUTHOR BROKEN HACK LOL NOTE ;