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

diff --cc core/tuples/tuples.factor
index 6f94d034fac4f9bfd787e482ceba32ece2e78e89,d2d3d01c37ba126153109e94539158f0efd677b3..02ce49d779a1b4db9b20cc390e64c028739bc612
--- 1/core/tuples/tuples.factor
--- 2/core/tuples/tuples.factor
+++ b/core/tuples/tuples.factor
@@@ -85,9 -86,10 +86,10 @@@ PRIVATE
      dupd 4 simple-slots
      2dup [ slot-spec-name ] map "slot-names" set-word-prop
      2dup delegate-slot-spec add* "slots" set-word-prop
-     define-slots ;
+     2dup define-slots
+     define-accessors ;
  
 -TUPLE: check-tuple class ;
 +ERROR: no-tuple-class class ;
  
  : check-tuple ( class -- )
      dup tuple-class?

diff --cc core/vocabs/vocabs.factor
Simple merge