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

Conflicts:

	core/classes/tuple/tuple.factor

diff --cc core/classes/tuple/tuple.factor
index fcce6a7b454900a9b296ef937e1bb14556b39b9e,a3d0238d1c013bd2f1b91da9eb7f436375698169..de1e3bddb8c56d47963628e285521d3cfc4b8e66
--- 1/core/classes/tuple/tuple.factor
--- 2/core/classes/tuple/tuple.factor
+++ b/core/classes/tuple/tuple.factor
@@@ -32,20 -40,21 +40,21 @@@ PRIVATE
      [ drop ] [ no-tuple-class ] if ;
  
  : tuple>array ( tuple -- array )
-     dup tuple-layout
-     [ layout-size swap [ array-nth ] curry map ] keep
-     layout-class prefix ;
- 
- : >tuple ( seq -- tuple )
-     dup first tuple-layout <tuple> [
-         >r 1 tail-slice dup length r>
-         [ tuple-size min ] keep
-         [ set-array-nth ] curry
-         2each
 -    prepare-tuple>array >r copy-tuple-slots r> layout-class add* ;
++    prepare-tuple>array >r copy-tuple-slots r> layout-class prefix ;
+ 
+ : tuple-slots ( tuple -- array )
+     prepare-tuple>array drop copy-tuple-slots ;
+ 
+ : slots>tuple ( tuple class -- array )
+     tuple-layout <tuple> [
+         [ tuple-size ] [ [ set-array-nth ] curry ] bi 2each
      ] keep ;
  
+ : >tuple ( tuple -- array )
+     unclip slots>tuple ;
+ 
  : slot-names ( class -- seq )
-     "slots" word-prop [ name>> ] map ;
+     "slot-names" word-prop ;
  
  <PRIVATE
  

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

diff --cc extra/help/markup/markup.factor
Simple merge

diff --cc extra/peg/peg.factor
Simple merge