[q-lang-cvs] qcalc qcalc.q,1.106,1.107

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

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

Modified Files:
	qcalc.q 
Log Message:
more bugfixes

Index: qcalc.q
===================================================================
RCS file: /cvsroot/q-lang/qcalc/qcalc.q,v
retrieving revision 1.106
retrieving revision 1.107
diff -C2 -d -r1.106 -r1.107
*** qcalc.q	7 Nov 2007 09:24:48 -0000	1.106
--- qcalc.q	7 Nov 2007 10:04:26 -0000	1.107
***************
*** 404,412 ****
  		= CELLS := Xs;
  insert_cells ((I,J),X)
! 		= chk (I,J) || CELLS := insert (get CELLS) ((I,J),X);
  insert_cells Xs:List
  		= CELLS := foldl insert (get CELLS) Xs;
  delete_cells (I,J)
! 		= chk (I,J) || CELLS := delete (get CELLS) (I,J);
  delete_cells Xs:List
  		= CELLS := foldl delete (get CELLS) Xs;
--- 404,412 ----
  		= CELLS := Xs;
  insert_cells ((I,J),X)
! 		= CELLS := insert (get CELLS) ((I,J),X);
  insert_cells Xs:List
  		= CELLS := foldl insert (get CELLS) Xs;
  delete_cells (I,J)
! 		= CELLS := delete (get CELLS) (I,J);
  delete_cells Xs:List
  		= CELLS := foldl delete (get CELLS) Xs;
***************
*** 416,433 ****
  		= EVAL := Xs;
  insert_eval ((I,J),X)
! 		= chk (I,J) || EVAL := insert (get EVAL) ((I,J),X);
  insert_eval Xs:List
  		= EVAL := foldl insert (get EVAL) Xs;
  delete_eval (I,J)
! 		= chk (I,J) || EVAL := delete (get EVAL) (I,J);
  delete_eval Xs:List
  		= EVAL := foldl delete (get EVAL) Xs;
  filter_eval P	= EVAL := hdict $ filter P $ list $ get EVAL;
  
- chk (I,J)	= printf "warning: overwriting GUI object %s at %s\n"
- 		  (str X,str (I,J))
- 		    if not is_nil X
- 		    where X:QtObject = get CELLS!(I,J);
- 
  /* Dialogs. */
  
--- 416,428 ----
  		= EVAL := Xs;
  insert_eval ((I,J),X)
! 		= EVAL := insert (get EVAL) ((I,J),X);
  insert_eval Xs:List
  		= EVAL := foldl insert (get EVAL) Xs;
  delete_eval (I,J)
! 		= EVAL := delete (get EVAL) (I,J);
  delete_eval Xs:List
  		= EVAL := foldl delete (get EVAL) Xs;
  filter_eval P	= EVAL := hdict $ filter P $ list $ get EVAL;
  
  /* Dialogs. */
  
***************
*** 695,699 ****
  		  else insert_cells ((I,J),S0) ||
  		  clear_cell (I,J) || set_cell (I,J) S ||
! 		  delete_eval (I,J) || S0
  		    where (S0,S1) = unquote S;
  
--- 690,695 ----
  		  else insert_cells ((I,J),S0) ||
  		  clear_cell (I,J) || set_cell (I,J) S ||
! 		  //delete_eval (I,J) ||
! 		  S0
  		    where (S0,S1) = unquote S;