Merge branch 'master' of git://factorcode.org/git/factor

diff --git a/basis/debugger/debugger.factor b/basis/debugger/debugger.factor
index 0e7a56ee5f471cdef17e0332e7fac74d70fed825..94ceff8a23870f67daa9796d9ab2da9cffe4f393 100644 (file)
--- a/basis/debugger/debugger.factor
+++ b/basis/debugger/debugger.factor
@@ -3,13 +3,13 @@
 USING: slots arrays definitions generic hashtables summary io
 kernel math namespaces make prettyprint prettyprint.config
 sequences assocs sequences.private strings io.styles io.files
-vectors words system splitting math.parser classes.tuple
-continuations continuations.private combinators generic.math
-classes.builtin classes compiler.units generic.standard vocabs
-init kernel.private io.encodings accessors math.order
-destructors source-files parser classes.tuple.parser
-effects.parser lexer compiler.errors generic.parser
-strings.parser ;
+vectors words system splitting math.parser classes.mixin
+classes.tuple continuations continuations.private combinators
+generic.math classes.builtin classes compiler.units
+generic.standard vocabs init kernel.private io.encodings
+accessors math.order destructors source-files parser
+classes.tuple.parser effects.parser lexer compiler.errors
+generic.parser strings.parser ;
 IN: debugger
 
 GENERIC: error. ( error -- )
@@ -327,3 +327,5 @@ M: bad-effect summary
 M: bad-escape summary drop "Bad escape code" ;
 
 M: bad-literal-tuple summary drop "Bad literal tuple" ;
+
+M: check-mixin-class summary drop "Not a mixin class" ;

diff --git a/core/classes/mixin/mixin.factor b/core/classes/mixin/mixin.factor
index 65726cf6e895f58de464ed2f2f6188ca9218cfff..2470c0087526e0ccf60c9906208a3b3489e66259 100644 (file)
--- a/core/classes/mixin/mixin.factor
+++ b/core/classes/mixin/mixin.factor
@@ -25,7 +25,7 @@ M: mixin-class rank-class drop 3 ;
         bi
     ] if ;
 
-TUPLE: check-mixin-class mixin ;
+TUPLE: check-mixin-class class ;
 
 : check-mixin-class ( mixin -- mixin )
     dup mixin-class? [