Update of /cvsroot/easycalc/easycalc
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv8587
Modified Files:
result.c solver.c
Log Message:
debugged and simplified _item functions. LitemType removed
Index: solver.c
===================================================================
RCS file: /cvsroot/easycalc/easycalc/solver.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** solver.c 28 Sep 2007 01:23:25 -0000 1.15
--- solver.c 24 Dec 2007 01:08:58 -0000 1.16
***************
*** 308,313 ****
varcount = 0;
for (i=0;i<stack->size;i++) {
! if (stack->stack[i].type == variable ||
! stack->stack[i].type == litem)
varcount++;
}
--- 308,312 ----
varcount = 0;
for (i=0;i<stack->size;i++) {
! if (stack->stack[i].type == variable)
varcount++;
}
***************
*** 318,323 ****
if (stack->stack[i].type == variable)
slv_add_variable(stack->stack[i].u.varname);
- else if (stack->stack[i].type == litem)
- slv_add_variable(stack->stack[i].u.litemval.name);
}
--- 317,320 ----
Index: result.c
===================================================================
RCS file: /cvsroot/easycalc/easycalc/result.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** result.c 18 Dec 2007 09:12:31 -0000 1.33
--- result.c 24 Dec 2007 01:08:58 -0000 1.34
***************
*** 199,232 ****
{
char *text;
- CError err;
- Boolean freeitem = false;
! if (item.type==variable) {
! err = rpn_eval_variable(&item,item);
! if (err) {
! result_error(err);
! return;
! }
! /* Do not display complete matrices */
! if (((item.type == matrix || item.type == cmatrix)
! && item.u.matrixval->cols * item.u.matrixval->rows > 9)
! || (item.type == list && item.u.listval->size > 6))
! text = display_default(item,false);
! else
! text = display_default(item,true);
! resultPrefs.ansType = item.type;
! resultPrefs.dispBase = dispPrefs.base;
! freeitem = true;
! }
! else {
! resultPrefs.ansType = item.type;
! resultPrefs.dispBase = dispPrefs.base;
! if (((item.type == matrix || item.type == cmatrix )
! && item.u.matrixval->cols * item.u.matrixval->rows > 9)
! || (item.type == list && item.u.listval->size > 6))
! text = display_default(item,false);
! else
! text = display_default(item,true);
! }
/* Save the text for later use or Copy&Paste */
if (displayedText)
--- 199,212 ----
{
char *text;
! resultPrefs.ansType = item.type;
! resultPrefs.dispBase = dispPrefs.base;
! if (((item.type == matrix || item.type == cmatrix )
! && item.u.matrixval->cols * item.u.matrixval->rows > 9)
! || (item.type == list && item.u.listval->size > 6))
! text = display_default(item,false);
! else
! text = display_default(item,true);
!
/* Save the text for later use or Copy&Paste */
if (displayedText)
***************
*** 244,249 ****
MemPtrFree(text);
- if (freeitem)
- rpn_delete(item);
}
--- 224,227 ----
|
