Tiny source file handling cleanup

TODO.FACTOR.txt

@@ -2,8 +2,6 @@
 
 - module operations on module-links, etc
 - empty search list, handle
-- change file, reload it manually, then reload modules; shouldn't this
-  work?
 - variable width word wrap
 - graphical crossref tool
 - http://paste.lisp.org/display/30426

contrib/jedit/jedit.factor

@@ -35,7 +35,4 @@ namespaces parser prettyprint sequences strings words shells ;
 : jedit-file ( file -- )
     1array make-jedit-request send-jedit-request ;
 
-: jedit ( defspec -- )
-    where first2 jedit-location ;
-
 [ jedit-location ] edit-hook set-global

contrib/vim/vim.factor

@@ -15,7 +15,4 @@ SYMBOL: vim-detach
     vim-detach get-global
     [ run-detached ] [ run-process ] if ;
 
-: vim ( spec -- )
-    where first2 vim-location ;
-
 [ vim-location ] edit-hook set-global

library/definitions.factor

@@ -5,7 +5,7 @@ USING: kernel sequences namespaces errors ;
 
 GENERIC: see ( defspec -- )
 
-GENERIC: where* ( defspec -- loc )
+GENERIC: where ( defspec -- loc )
 
 GENERIC: subdefs ( defspec -- seq )
 

library/generic/methods.factor

@@ -46,7 +46,7 @@ TUPLE: check-method class generic ;
 : implementors ( class -- seq )
     [ "methods" word-prop ?hash* nip ] word-subset-with ;
 
-M: method-spec where*
+M: method-spec where
     dup first2 method method-loc [ ] [ second where* ] ?if ;
 
 M: method-spec subdefs drop f ;

library/help/topics.factor

@@ -75,7 +75,7 @@ DEFER: $subsection
     all-articles [ children ] parent-graph get build-graph ;
 
 ! Definition protocol
-M: link where* link-name article article-loc ;
+M: link where link-name article article-loc ;
 
 M: link synopsis*
     \ ARTICLE: pprint-word
@@ -88,7 +88,7 @@ M: link see (see) ;
 
 PREDICATE: link word-link link-name word? ;
 
-M: word-link where* link-name "help-loc" word-prop ;
+M: word-link where link-name "help-loc" word-prop ;
 
 M: word-link synopsis*
     \ HELP: pprint-word

library/modules.factor

@@ -103,7 +103,7 @@ M: module synopsis*
 
 M: module definition module>alist t ;
 
-M: module where* module-loc ;
+M: module where module-loc ;
 
 : module-dir? ( path -- ? )
     "load.factor" path+ resource-path exists? ;

library/tools/definitions.factor

@@ -5,9 +5,6 @@ USING: arrays errors generic hashtables io kernel math
 namespaces parser prettyprint prettyprint-internals sequences
 styles words ;
 
-: where ( defspec -- loc )
-    where* dup [ first2 >r ?resource-path r> 2array ] when ;
-
 : reload ( defspec -- )
     where first [ run-file ] when* ;
 
@@ -16,6 +13,7 @@ TUPLE: no-edit-hook ;
 SYMBOL: edit-hook
 
 : edit-location ( file line -- )
+    >r ?resource-path r>
     edit-hook get [ call ] [ <no-edit-hook> throw ] if* ;
 
 : edit-file ( file -- ) ?resource-path 0 edit-location ;

library/words.factor

@@ -188,7 +188,7 @@ TUPLE: check-create name vocab ;
     all-words [ word-name = ] subset-with ;
 
 ! Definition protocol
-M: word where* "loc" word-prop ;
+M: word where "loc" word-prop ;
 
 M: word subdefs drop f ;