diff --git a/basis/prettyprint/backend/backend.factor b/basis/prettyprint/backend/backend.factor index f893c61e70..0acb26680f 100644 --- a/basis/prettyprint/backend/backend.factor +++ b/basis/prettyprint/backend/backend.factor @@ -10,7 +10,6 @@ prettyprint.custom prettyprint.sections prettyprint.stylesheet quotations sbufs sequences strings vectors words words.symbol classes.private ; FROM: sets => members ; -! QUALIFIED-WITH: classes.not cn IN: prettyprint.backend M: effect pprint* effect>string text ; diff --git a/basis/prettyprint/prettyprint-tests.factor b/basis/prettyprint/prettyprint-tests.factor index 23d10930e6..f89d44440a 100644 --- a/basis/prettyprint/prettyprint-tests.factor +++ b/basis/prettyprint/prettyprint-tests.factor @@ -413,7 +413,7 @@ TUPLE: fo { a intersection{ fixnum integer } } ; [ """USING: math ; IN: prettyprint.tests -TUPLE: mo { a union{ float integer } initial: 0 } ; +TUPLE: mo { a union{ integer float } initial: 0 } ; """ ] [ [ \ mo see ] with-string-writer @@ -422,7 +422,7 @@ TUPLE: mo { a union{ float integer } initial: 0 } ; [ """USING: math ; IN: prettyprint.tests -TUPLE: fo { a intersection{ fixnum integer } initial: 0 } ; +TUPLE: fo { a intersection{ integer fixnum } initial: 0 } ; """ ] [ [ \ fo see ] with-string-writer @@ -430,22 +430,22 @@ TUPLE: fo { a intersection{ fixnum integer } initial: 0 } ; [ """union{ - union{ float integer } intersection{ string hashtable } + union{ integer float } } """ ] [ [ union{ union{ float integer } intersection{ string hashtable } } . ] with-string-writer ] unit-test [ """intersection{ - union{ float integer } intersection{ string hashtable } + union{ integer float } } """ ] [ [ intersection{ union{ float integer } intersection{ string hashtable } } . ] with-string-writer ] unit-test [ -"""maybe{ union{ float integer } }\n""" +"""maybe{ union{ integer float } }\n""" ] [ [ maybe{ union{ float integer } } . ] with-string-writer ] unit-test