core: subseq-index? -> subseq-of?

[factor.git] / basis / fixups / fixups.factor

diff --git a/basis/fixups/fixups.factor b/basis/fixups/fixups.factor
index f4fa556ce88d647ec09c4a79c5fb8b2b354d8358..d2d069497add65fe5ba0547c655750f9e46749e0 100644 (file)
--- a/basis/fixups/fixups.factor
+++ b/basis/fixups/fixups.factor
@@ -1,29 +1,34 @@
 ! Copyright (C) 2021 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs continuations formatting kernel
-sequences ui.tools.debugger vocabs vocabs.parser ;
+USING: accessors assocs classes.tuple continuations kernel sequences
+slots.private vocabs vocabs.parser ;
 IN: fixups
 
 CONSTANT: vocab-renames {
     { "math.intervals" { "intervals" "0.99" } }
     { "math.ranges" { "ranges" "0.99" } }
-    { "asdfasdf" { "asdfasdf2" "0.99" } }
 }
 
 CONSTANT: word-renames {
+    { "32bit?" { "layouts:32-bit?" "0.99" } }
+    { "64bit?" { "layouts:64-bit?" "0.99" } }
     { "lines" { "io:read-lines" "0.99" } }
-    { "lines" { "splitting:split-lines" "0.99" } }
     { "words" { "splitting:split-words" "0.99" } }
     { "contents" { "io:read-contents" "0.99" } }
     { "exists?" { "io.files:file-exists?" "0.99" } }
     { "string-lines" { "splitting:split-lines" "0.99" } }
-    { "split-lines" { "documents.private:?split-lines" "0.99" } }
     { "[-inf,a)" { "math.intervals:[-inf,b)" "0.99" } }
     { "[-inf,a]" { "math.intervals:[-inf,b]" "0.99" } }
-    { "(a,b)" { "math.ranges:(a..b)" "0.99" } }
-    { "(a,b]" { "math.ranges:(a..b]" "0.99" } }
-    { "[a,b)" { "math.ranges:[a..b)" "0.99" } }
-    { "[a,b]" { "math.ranges:[a..b]" "0.99" } }
+    { "(a,b)" { "ranges:(a..b)" "0.99" } }
+    { "(a,b]" { "ranges:(a..b]" "0.99" } }
+    { "[a,b)" { "ranges:[a..b)" "0.99" } }
+    { "[a,b]" { "ranges:[a..b]" "0.99" } }
+    { "[0,b)" { "ranges:[0..b)" "0.99" } }
+    { "[0,b]" { "ranges:[0..b]" "0.99" } }
+    { "[1,b)" { "ranges:[1..b)" "0.99" } }
+    { "[1,b]" { "ranges:[1..b]" "0.99" } }
+    { "assoc-combine" { "assocs:assoc-union-all" "0.99" } }
+    { "assoc-refine" { "assocs:assoc-intersect-all" "0.99" } }
     { "assoc-merge" { "assocs.extras:assoc-collect" "0.99" } }
     { "assoc-merge!" { "assocs.extras:assoc-collect!" "0.99" } }
     { "peek-from" { "modern.html:peek1-from" "0.99" } }
@@ -32,7 +37,18 @@ CONSTANT: word-renames {
     { "combine" { "sets:union-all" "0.99" } }
     { "refine" { "sets:intersect-all" "0.99" } }
     { "read-json-objects" { "json.reader:read-json" "0.99" } }
+    { "init-namespaces" { "namespaces:init-namestack" "0.99" } }
     { "iota" { "sequences:<iota>" ".98" } }
+    { "git-checkout-existing-branch" { "git-checkout-existing" "0.99" } }
+    { "git-checkout-existing-branch*" { "git-checkout-existing*" "0.99" } }
+    { "tags" { "chloe-tags" "0.99" } }
+    { "(each)" { "sequence-operator" "0.99" } }
+    { "(each-integer)" { "each-integer-from" "0.99" } }
+    { "(find-integer)" { "find-integer-from" "0.99" } }
+    { "(all-integers?)" { "all-integers-from?" "0.99" } }
+    { "short" { "index-or-length" "0.99" } }
+    { "map-integers" { "map-integers-as" "0.99" } }
+    { "deep-subseq?" { "deep-subseq-of?" "0.99" } }
 }
 
 : compute-assoc-fixups ( continuation name assoc -- seq )
@@ -40,8 +56,9 @@ CONSTANT: word-renames {
         drop { }
     ] [
         swap '[
-            first2 dupd first2 "Fixup: %s renamed to %s in Factor %s" sprintf
-            swap drop no-op-action
+            first2 dupd first2
+            " in Factor " glue " renamed to " glue "Fixup: " prepend
+            swap drop no-op-restart
             _ <restart>
         ] map
     ] if-empty ;
@@ -49,12 +66,13 @@ CONSTANT: word-renames {
 GENERIC: compute-fixups ( continuation error -- seq )
 
 M: object compute-fixups
-    [ error>> compute-fixups ] [ 3drop { } ] recover ;
+    "error" over ?offset-of-slot
+    [ slot compute-fixups ] [ 2drop { } ] if* ;
 
 M: f compute-fixups 2drop { } ;
 
 M: no-vocab compute-fixups
-    name>> vocab-renames compute-assoc-fixups ;
+    [ name>> vocab-renames compute-assoc-fixups ] [ drop { } ] if* ;
 
 M: no-word-error compute-fixups
-    name>> word-renames compute-assoc-fixups ;
+    [ name>> word-renames compute-assoc-fixups ] [ drop { } ] if* ;