issue #358: Make a word lookup-article so that article is just a tuple.

diff --git a/basis/help/definitions/definitions.factor b/basis/help/definitions/definitions.factor
index 076fa593524a3f1d884a3911c707d65c53478a08..f8162d62357971c30e56bc85d8628e8db73d55fe 100644 (file)
--- a/basis/help/definitions/definitions.factor
+++ b/basis/help/definitions/definitions.factor
@@ -9,9 +9,9 @@ IN: help.definitions
 
 M: link definer drop \ ARTICLE: \ ; ;
 
-M: link where name>> article loc>> ;
+M: link where name>> lookup-article loc>> ;
 
-M: link set-where name>> article loc<< ;
+M: link set-where name>> lookup-article loc<< ;
 
 M: link forget* name>> remove-article ;
 

diff --git a/basis/help/help-docs.factor b/basis/help/help-docs.factor
index bce44ca8e81fd7f02ce839bed1ee50c47a3c6969..bc1cbd7f64462c65ad2f796d65b27427c73f67b4 100644 (file)
--- a/basis/help/help-docs.factor
+++ b/basis/help/help-docs.factor
@@ -131,7 +131,7 @@ ARTICLE: "help-impl" "Help system implementation"
 }
 "Help article implementation:"
 { $subsections
-    article
+    lookup-article
     articles
 }
 "Links:"

diff --git a/basis/help/lint/lint.factor b/basis/help/lint/lint.factor
index 2172500ebeab795544a40a6128ca3c795642e6d6..73decf2d7416febc17c5566d9e0c0806d14817b6 100644 (file)
--- a/basis/help/lint/lint.factor
+++ b/basis/help/lint/lint.factor
@@ -68,7 +68,7 @@ PRIVATE>
 
 : check-about ( vocab -- )
     vocab-link boa dup
-    '[ _ vocab-help [ article drop ] when* ] check-something ;
+    '[ _ vocab-help [ lookup-article drop ] when* ] check-something ;
 
 : check-vocab ( vocab -- )
     "Checking " write dup write "..." print flush

diff --git a/basis/help/topics/topics-docs.factor b/basis/help/topics/topics-docs.factor
index 720991a609a70b87da9956a7e0a57608cab21e5f..82cf78e70d9e759d8759bf3fb7c2d1daa83294f4 100644 (file)
--- a/basis/help/topics/topics-docs.factor
+++ b/basis/help/topics/topics-docs.factor
@@ -10,7 +10,7 @@ HELP: no-article
 { $description "Throws a " { $link no-article } " error." }
 { $error-description "Thrown by " { $link help } " if the given help topic does not exist, or if the help topic being displayed links to a help topic which does not exist." } ;
 
-HELP: article
+HELP: lookup-article
 { $values { "name" "an article name" } { "article" "an " { $link article } " object" } }
 { $description "Outputs a named " { $link article } " object." } ;
 

diff --git a/basis/help/topics/topics.factor b/basis/help/topics/topics.factor
index d12138ea3e1611d9c2d6de4a1d373a58e3ff5f31..fafbf14274c262047e3d5c0a38961ca595881c9d 100644 (file)
--- a/basis/help/topics/topics.factor
+++ b/basis/help/topics/topics.factor
@@ -61,12 +61,12 @@ ERROR: no-article name ;
 M: no-article summary
     drop "Help article does not exist" ;
 
-: article ( name -- article )
+: lookup-article ( name -- article )
     articles get ?at [ no-article ] unless ;
 
 M: object valid-article? articles get key? ;
-M: object article-title article article-title ;
-M: object article-content article article-content ;
+M: object article-title lookup-article article-title ;
+M: object article-content lookup-article article-content ;
 M: object article-parent article-xref get at ;
 M: object set-article-parent article-xref get set-at ;
 

diff --git a/extra/fuel/fuel.factor b/extra/fuel/fuel.factor
index 7673b96a697bf490e4c630d90a24668f53cfc0f6..b60f837707c2f9a70382ae92d33327801033fbb1 100644 (file)
--- a/extra/fuel/fuel.factor
+++ b/extra/fuel/fuel.factor
@@ -107,7 +107,7 @@ PRIVATE>
 
 ! Help support
 
-: fuel-get-article ( name -- ) article fuel-eval-set-result ;
+: fuel-get-article ( name -- ) lookup-article fuel-eval-set-result ;
 
 : fuel-get-article-title ( name -- )
     articles get at [ article-title ] [ f ] if* fuel-eval-set-result ;

diff --git a/extra/fuel/xref/xref.factor b/extra/fuel/xref/xref.factor
index 649081ff03f1c80ea5626347ec949d4e25e59d38..eeec3b260ce1eeab0c00776be21b2fef6be2166e 100644 (file)
--- a/extra/fuel/xref/xref.factor
+++ b/extra/fuel/xref/xref.factor
@@ -62,7 +62,7 @@ PRIVATE>
 
 : doc-location ( word -- loc ) props>> "help-loc" swap at get-loc ;
 
-: article-location ( name -- loc ) article loc>> get-loc ;
+: article-location ( name -- loc ) lookup-article loc>> get-loc ;
 
 : get-vocabs ( -- seq ) all-vocab-names ;