From 63837139cdf72cc2604644765d8162b8b885980b Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Fri, 29 Dec 2017 00:50:16 -0800
Subject: [PATCH] extra: fix word/syntax

---
 extra/modern/out/out.factor | 12 ++++++------
 extra/pcre/pcre.factor      |  7 ++++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/extra/modern/out/out.factor b/extra/modern/out/out.factor
index 7f19eb669a..17b40b39a2 100644
--- a/extra/modern/out/out.factor
+++ b/extra/modern/out/out.factor
@@ -1,10 +1,10 @@
 ! Copyright (C) 2017 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs combinators.short-circuit
-constructors continuations fry io io.encodings.utf8 io.files
+constructors continuations io io.encodings.utf8 io.files
 io.streams.string kernel modern modern.paths modern.slices
-multiline namespaces prettyprint sequences sequences.extras
-splitting strings ;
+prettyprint sequences sequences.extras splitting strings
+vocabs.loader ;
 IN: modern.out
 
 : token? ( obj -- ? )
@@ -53,7 +53,7 @@ DEFER: map-literals
     utf8 [ write-literal nl ] with-file-writer ; inline
 
 : write-modern-vocab ( seq vocab -- )
-    modern-source-path write-modern-path ; inline
+    vocab-source-path write-modern-path ; inline
 
 : rewrite-path ( path quot: ( obj -- obj' ) -- )
     ! dup print
@@ -77,7 +77,7 @@ DEFER: map-literals
     [ path>literals ] [ ] bi write-modern-path ;
 
 : rewrite-vocab-exact ( name -- )
-    modern-source-path rewrite-path-exact ;
+    vocab-source-path rewrite-path-exact ;
 
 : rewrite-paths ( paths -- )
     [ rewrite-path-exact ] each ;
@@ -85,7 +85,7 @@ DEFER: map-literals
 
 : strings-core-to-file ( -- )
     core-bootstrap-vocabs
-    [ ".private" ?tail drop modern-source-path utf8 file-contents ] map-zip
+    [ ".private" ?tail drop vocab-source-path utf8 file-contents ] map-zip
     [ "[========[" dup matching-delimiter-string surround ] assoc-map
     [
         first2 [ "VOCAB: " prepend ] dip " " glue
diff --git a/extra/pcre/pcre.factor b/extra/pcre/pcre.factor
index 2b6aed4864..6f1f760e19 100644
--- a/extra/pcre/pcre.factor
+++ b/extra/pcre/pcre.factor
@@ -1,9 +1,10 @@
 ! Copyright (C) 2013, 2016 Björn Lindqvist
 ! See http://factorcode.org/license.txt for BSD license
 USING: accessors alien alien.accessors alien.c-types alien.data
-alien.enums alien.strings arrays assocs combinators fry
+alien.enums alien.strings arrays assocs combinators
 io.encodings.string io.encodings.utf8 kernel literals math
-math.bitwise math.parser pcre.ffi regexp sequences splitting strings ;
+math.bitwise math.parser pcre.ffi regexp sequences splitting
+strings ;
 IN: pcre
 
 ERROR: bad-option what ;
@@ -149,7 +150,7 @@ M: compiled-pcre findall
 M: string findall
     <compiled-pcre> findall ;
 
-M: regexp:regexp findall
+M: regexp::regexp findall
     raw>> findall ;
 
 : matches? ( subject obj -- ? )