extra: remove rest of 'word' names.

diff --git a/extra/parser-combinators/simple/simple.factor b/extra/parser-combinators/simple/simple.factor
index a90bd5494ac385f9a333c1ec57194acc707098f9..fa5705679f57584b219cc08da3051f0d64a13ae3 100644 (file)
--- a/extra/parser-combinators/simple/simple.factor
+++ b/extra/parser-combinators/simple/simple.factor
@@ -4,23 +4,23 @@ USING: kernel strings math sequences lists.lazy words
 math.parser promises parser-combinators unicode.categories ;
 IN: parser-combinators.simple
 
-: 'digit' ( -- parser )
+: digit-parser ( -- parser )
   [ digit? ] satisfy [ digit> ] <@ ;
 
-: 'integer' ( -- parser )
+: integer-parser ( -- parser )
   [ digit? ] satisfy <*> [ string>number ] <@ ;
 
-: 'string' ( -- parser )
+: string-parser ( -- parser )
   [ CHAR: " = ] satisfy
   [ CHAR: " = not ] satisfy <*> &>
   [ CHAR: " = ] satisfy <& [ >string ] <@  ;
 
-: 'bold' ( -- parser )
+: bold-parser ( -- parser )
   "*" token
   [ CHAR: * = not  ] satisfy <*> [ >string ] <@ &>
   "*" token <& ;
 
-: 'italic' ( -- parser )
+: italic-parser ( -- parser )
   "_" token
   [ CHAR: _ = not ] satisfy <*> [ >string ] <@ &>
   "_" token <& ;

diff --git a/extra/webapps/fjsc/fjsc.factor b/extra/webapps/fjsc/fjsc.factor
index 3aac0ff7322dbbd459107aa86f05a3b9d323b373..32d702e961fd9e91392b67af644ef6d0b76b0bae 100644 (file)
--- a/extra/webapps/fjsc/fjsc.factor
+++ b/extra/webapps/fjsc/fjsc.factor
@@ -38,7 +38,7 @@ TUPLE: fjsc < dispatcher ;
 
 : do-compile-url ( url -- response )
     [
-        absolute-url http-get nip 'expression' parse
+        absolute-url http-get nip expression-parser parse
         fjsc-compile write "();" write
     ] with-string-writer
     <javascript-content> ;
@@ -59,7 +59,7 @@ TUPLE: fjsc < dispatcher ;
 
 : do-compile ( code -- response )
     [
-        'expression' parse fjsc-compile write
+        expression-parser parse fjsc-compile write
     ] with-string-writer
     <javascript-content> ;