Remove the lexer-factory because nothing uses it. Update usages.

diff --git a/basis/tools/deploy/shaker/shaker.factor b/basis/tools/deploy/shaker/shaker.factor
index 348bc3be0ed8b2a91d16770c2dbf00bbc74af3d5..23bc7f4df36fe5a01f4ed6c189e61b847923c3b2 100755 (executable)
--- a/basis/tools/deploy/shaker/shaker.factor
+++ b/basis/tools/deploy/shaker/shaker.factor
@@ -364,7 +364,6 @@ IN: tools.deploy.shaker
                 compiler.crossref:generic-call-site-crossref
                 compiler-impl
                 compiler.errors:compiler-errors
-                lexer-factory
                 print-use-hook
                 root-cache
                 require-when-vocabs

diff --git a/core/lexer/lexer-docs.factor b/core/lexer/lexer-docs.factor
index c5ce3a39ad04342eef8f6b8dca0cb9494c87dbe8..9d3a43223be253b6f3cc9cb4d3b147e6813038e4 100644 (file)
--- a/core/lexer/lexer-docs.factor
+++ b/core/lexer/lexer-docs.factor
@@ -104,10 +104,6 @@ HELP: with-lexer
 { $values { "lexer" lexer } { "quot" quotation } { "newquot" quotation } }
 { $description "Calls the quotation with the " { $link lexer } " variable set to the given lexer. The quotation can make use of words such as " { $link scan-token } ". Any errors thrown by the quotation are wrapped in " { $link lexer-error } " instances." } ;
 
-HELP: lexer-factory
-{ $var-description "A variable holding a quotation with stack effect " { $snippet "( lines -- lexer )" } ". This quotation is called by the parser to create " { $link lexer } " instances. This variable can be rebound to a quotation which outputs a custom tuple delegating to " { $link lexer } " to customize syntax." } ;
-
-
 ARTICLE: "parser-lexer" "The lexer"
 "A variable that encapsulate internal parser state:"
 { $subsections lexer }

diff --git a/core/lexer/lexer.factor b/core/lexer/lexer.factor
index ad755003cb3fe05c516b4f22bdc1c3f93ad4b517..af3d7813c6bfed0a7697ba23830c61c75a3bb37e 100644 (file)
--- a/core/lexer/lexer.factor
+++ b/core/lexer/lexer.factor
@@ -150,7 +150,3 @@ M: lexer-error error-line [ error>> error-line ] [ line>> ] bi or ;
 
 : with-lexer ( lexer quot -- newquot )
     [ lexer set ] dip [ <lexer-error> rethrow ] recover ; inline
-
-SYMBOL: lexer-factory
-
-[ <lexer> ] lexer-factory set-global

diff --git a/core/parser/parser.factor b/core/parser/parser.factor
index c3af80eb750bb5cda1880cd95b4a9ab4542505c8..f402d84941d0880fd4e354338061f17baf2bcda6 100644 (file)
--- a/core/parser/parser.factor
+++ b/core/parser/parser.factor
@@ -125,7 +125,7 @@ M: f parse-quotation \ ] parse-until >quotation ;
     [ f parse-until >quotation ] with-lexer ;
 
 : parse-lines ( lines -- quot )
-    lexer-factory get call( lines -- lexer ) (parse-lines) ;
+    <lexer> (parse-lines) ;
 
 : parse-literal ( accum end quot -- accum )
     [ parse-until ] dip call suffix! ; inline