Update of /cvsroot/q-lang/qcalc
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26385
Modified Files:
qcalc.q
Log Message:
major code cleanup, add support for custom table items, add preliminary support for cells spanning multiple rows and columns
Index: qcalc.q
===================================================================
RCS file: /cvsroot/q-lang/qcalc/qcalc.q,v
retrieving revision 1.127
retrieving revision 1.128
diff -C2 -d -r1.127 -r1.128
*** qcalc.q 11 Nov 2007 00:42:54 -0000 1.127
--- qcalc.q 12 Nov 2007 09:59:29 -0000 1.128
***************
*** 60,63 ****
--- 60,65 ----
"editReturn()", accept2;
"editCancel()", cancel;
+ "editMergeCells()", merge_cells;
+ "editDissociateCells()", dissociate_cells;
"editInsertRow()", insert_row;
"editInsertCol()", insert_col;
***************
*** 122,125 ****
--- 124,128 ----
[...1195 lines suppressed...]
'X = parse S, DEPS = deps 'X,
(CELLS,EVAL) =
! (insert_elem CELLS (I,J),insert EVAL (I,J;S,'X,DEPS));
= clear_cell (I,J) || set_cell (I,J) S1 || (CELLS,EVAL)
where S0 = CELLS!(I,J),
***************
*** 3090,3095 ****
where W:List = get XREF!X,
(V,Xs) = foldl (search (cst true))
! (insert V (X,true),Xs) W;
! = (V,[X|Xs]) otherwise;
/* Inferior Q process. *****************************************************/
--- 3299,3304 ----
where W:List = get XREF!X,
(V,Xs) = foldl (search (cst true))
! (insert_elem V X,Xs) W;
! = (V,if P X then [X|Xs] else Xs) otherwise;
/* Inferior Q process. *****************************************************/
|
