[q-lang-cvs] qcalc qcalc.q,1.161,1.162

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

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

Modified Files:
	qcalc.q 
Log Message:
bugfixes

Index: qcalc.q
===================================================================
RCS file: /cvsroot/q-lang/qcalc/qcalc.q,v
retrieving revision 1.161
retrieving revision 1.162
diff -C2 -d -r1.161 -r1.162
*** qcalc.q	17 Nov 2007 12:54:58 -0000	1.161
--- qcalc.q	17 Nov 2007 13:52:39 -0000	1.162
***************
*** 1040,1044 ****
  
  is_spanned (I,J)
! 		= (N>1) or else (M>1) where (N,M) = cell_span (I,J);
  
  is_empty (I,J)	= false if member (get EVAL) (I,J);
--- 1040,1047 ----
  
  is_spanned (I,J)
! 		= (N>1) or else (M>1)
! 		    where (N,M) = cell_span (I,J)
! 		    if (I,J) = real_index (I,J);
! 		= false otherwise;
  
  is_empty (I,J)	= false if member (get EVAL) (I,J);
***************
*** 1431,1436 ****
  get_spans SEL	= sort indexcmp SEL
  		    where (I,J,V) = unzip3 SEL, K = zip I J,
! 		      K = map real_index K,
! 		      SEL = filter is_spanned $ keys $ hdict $ zip K V;
  
  move_spans (DI,DJ) SEL
--- 1434,1438 ----
  get_spans SEL	= sort indexcmp SEL
  		    where (I,J,V) = unzip3 SEL, K = zip I J,
! 		      SEL = filter is_spanned K;
  
  move_spans (DI,DJ) SEL