[q-lang-cvs] qcalc qcalc.q,1.140,1.141

[Albert G. <ag...@us...>]

Update of /cvsroot/q-lang/qcalc
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12434

Modified Files:
	qcalc.q 
Log Message:
code refactoring

Index: qcalc.q
===================================================================
RCS file: /cvsroot/q-lang/qcalc/qcalc.q,v
retrieving revision 1.140
retrieving revision 1.141
diff -C2 -d -r1.140 -r1.141
*** qcalc.q	13 Nov 2007 09:56:28 -0000	1.140
--- qcalc.q	13 Nov 2007 10:03:06 -0000	1.141
***************
*** 1377,1386 ****
  
  dissociate_cells _ _ _ if is_global:
! 		= do dissociate_cell SEL
! 		    where SEL = check_editing || sel_cellvals selection,
! 		      (I,J,V) = unzip3 $ cat SEL, K = zip I J,
! 		      K = map real_index K,
! 		      SEL = filter is_spanned $ keys $ hdict $ zip K V,
! 		      SEL = sort indexcmp SEL
  		    if qt TABW "currentPageIndex" () = 0;
  
--- 1377,1382 ----
  
  dissociate_cells _ _ _ if is_global:
! 		= do dissociate_cell $ get_spans SEL
! 		    where SEL = check_editing || sel_cellvals selection
  		    if qt TABW "currentPageIndex" () = 0;
  
***************
*** 1390,1393 ****
--- 1386,1394 ----
  		    where IT = get_table_item (I,J);
  
+ get_spans SEL	= sort indexcmp SP
+ 		    where (I,J,V) = unzip3 $ cat SEL, K = zip I J,
+ 		      K = map real_index K,
+ 		      SP = filter is_spanned $ keys $ hdict $ zip K V;
+ 
  insert_row _ _ _ if is_global:
  		= adjust_rows (N+2) || EDITED := true ||