generic: finish renaming order to dispatch-order

diff --git a/basis/compiler/tests/redefine19.factor b/basis/compiler/tests/redefine19.factor
index af70e3cf00fe762d941bec57929d90fcec84ac1a..33699a7102aa1aaeba09b3b583bab73d056ab046 100644 (file)
--- a/basis/compiler/tests/redefine19.factor
+++ b/basis/compiler/tests/redefine19.factor
@@ -16,7 +16,7 @@ INSTANCE: c m2
 
 { } [ [ c m1 add-mixin-instance ] with-compilation-unit ] unit-test
 
-{ { m2 m1 } } [ \ g order ] unit-test
+{ { m2 m1 } } [ \ g dispatch-order ] unit-test
 
 { 1 } [ foo ] unit-test
 

diff --git a/basis/ui/baseline-alignment/baseline-alignment-tests.factor b/basis/ui/baseline-alignment/baseline-alignment-tests.factor
index 86a2b9527cd3651fba4c88dc6079f21e25ccbe06..038b4ec3701ee42b7ff0bd13c355edd8c99a976f 100644 (file)
--- a/basis/ui/baseline-alignment/baseline-alignment-tests.factor
+++ b/basis/ui/baseline-alignment/baseline-alignment-tests.factor
@@ -13,4 +13,4 @@ ui.baseline-alignment ui.baseline-alignment.private ;
 { 15 40 } [ 20 10 40 10 combine-metrics ] unit-test
 { 12 3 } [ 0 12 3 9 combine-metrics ] unit-test
 
-{ t } [ \ baseline \ cap-height [ order ] bi@ set= ] unit-test
+{ t } [ \ baseline \ cap-height [ dispatch-order ] bi@ set= ] unit-test

diff --git a/core/generic/standard/standard-tests.factor b/core/generic/standard/standard-tests.factor
index fcfd8c0a03ba5814a0c69bff57162443bf567e24..f372af26a261972e94dd7b5ff1e5d589e9f08369 100644 (file)
--- a/core/generic/standard/standard-tests.factor
+++ b/core/generic/standard/standard-tests.factor
@@ -391,7 +391,7 @@ GENERIC: move-method-generic ( a -- b )
 
 [ "IN: generic.standard.tests.a" <string-reader> "move-method-test-1" parse-stream ] must-not-fail
 
-{ { string } } [ \ move-method-generic order ] unit-test
+{ { string } } [ \ move-method-generic generic-order ] unit-test
 
 ! FORGET: on method wrappers
 GENERIC: forget-test ( a -- b )

diff --git a/core/parser/parser-tests.factor b/core/parser/parser-tests.factor
index 2cf68b816fbd7c08928996b499d632f5b7e54300..fc78c1603f366be1c8ff83df72e6bf47ec3ddec9 100644 (file)
--- a/core/parser/parser-tests.factor
+++ b/core/parser/parser-tests.factor
@@ -150,15 +150,15 @@ DEFER: foo
 ] unit-test
 
 { t } [
-    array "smudge-me" "parser.tests" lookup-word order member-eq?
+    array "smudge-me" "parser.tests" lookup-word dispatch-order member-eq?
 ] unit-test
 
 { t } [
-    integer "smudge-me" "parser.tests" lookup-word order member-eq?
+    integer "smudge-me" "parser.tests" lookup-word dispatch-order member-eq?
 ] unit-test
 
 { f } [
-    string "smudge-me" "parser.tests" lookup-word order member-eq?
+    string "smudge-me" "parser.tests" lookup-word dispatch-order member-eq?
 ] unit-test
 
 { } [