tables selected-values type error fixed

diff --git a/basis/inverse/vectors/vectors.factor b/basis/inverse/vectors/vectors.factor
index 5cb2258c4f69cadfccc995acf0b846c98d8a610f..d2cca00af009964f45056841ea71f433681e7426 100644 (file)
--- a/basis/inverse/vectors/vectors.factor
+++ b/basis/inverse/vectors/vectors.factor
@@ -5,7 +5,7 @@ IN: inverse.vectors
 
 : undo-nvector ( array n -- ... )
     [ assure-vector ] dip
-    [ assure-length ] [ firstn ] 2bi ; inline
+    firstn ; inline
 
 \ 1vector [ 1 undo-nvector ] define-inverse
 

diff --git a/basis/models/illusion/illusion.factor b/basis/models/illusion/illusion.factor
index 78998e9ab09ec51dfef5c9a79dba82474f5718fb..6cab6e6371a77b3745ecd48ab8ee69282e00969a 100644 (file)
--- a/basis/models/illusion/illusion.factor
+++ b/basis/models/illusion/illusion.factor
@@ -7,6 +7,7 @@ TUPLE: illusion < arrow ;
     illusion new V{ } clone >>connections V{ } clone >>dependencies 0 >>ref
     swap >>quot over >>model [ add-dependency ] keep ;
 
-: backtalk ( value object -- ) [ quot>> [undo] call( a -- b ) ] [ model>> ] bi set-model ;
+: backtalk ( value object -- )
+   [ quot>> [undo] call( a -- b ) ] [ model>> ] bi set-model ;
 
 M: illusion update-model ( model -- ) [ [ value>> ] keep backtalk ] with-locked-model ;
\ No newline at end of file

diff --git a/basis/ui/gadgets/tables/tables.factor b/basis/ui/gadgets/tables/tables.factor
index 52cc26497f01a86ab7950ff6ab69f500afe21a06..ae8102f63e804392055fa62c8f2e148714bc33eb 100644 (file)
--- a/basis/ui/gadgets/tables/tables.factor
+++ b/basis/ui/gadgets/tables/tables.factor
@@ -6,7 +6,7 @@ models.illusion namespaces opengl sequences ui.gadgets ui.gadgets.scrollers
 ui.gadgets.status-bar ui.gadgets.worlds ui.gestures ui.render ui.pens.solid
 ui.text ui.commands ui.images ui.gadgets.menus ui.gadgets.line-support
 math.rectangles models math.ranges sequences combinators
-combinators.short-circuit fonts locals strings vectors tools.continuations ;
+combinators.short-circuit fonts locals strings vectors ;
 IN: ui.gadgets.tables
 
 ! Row rendererer protocol
@@ -67,6 +67,7 @@ IN: ui.gadgets.tables
     new-line-gadget
         swap >>renderer
         swap >>model
+        V{ } clone >>selected-indices
         V{ } clone <model> >>selected-values
         sans-serif-font >>font
         focus-border-color >>focus-border-color
@@ -255,7 +256,7 @@ PRIVATE>
 
 : (selected-rows) ( table -- {row} )
     [ selected-indices>> ] keep
-    [ nth-row [ 1array ] [ drop { } ] if ] curry map concat ;
+    [ nth-row [ 1vector ] [ drop V{ } clone ] if ] curry map concat ;
 
 : selected-rows ( table -- {value} )
     [ (selected-rows) ] [ renderer>> ] bi [ row-value ] curry map ;