[Easycalc-commits] easycalc/mlib stack.c,1.32,1.33

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/easycalc/easycalc/mlib
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv31007

Modified Files:
	stack.c 
Log Message:
Formatting changes. No code changes.

Index: stack.c
===================================================================
RCS file: /cvsroot/easycalc/easycalc/mlib/stack.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** stack.c	23 Aug 2006 17:52:49 -0000	1.32
--- stack.c	3 Sep 2006 18:47:59 -0000	1.33
***************
*** 40,44 ****
   * FUNCTION:     rpn_pack_record
   * 
!  * DESCRIPTION:  Pack a record so that it can be stored in the databse
   *
   * PARAMETERS:   item
--- 40,44 ----
   * FUNCTION:     rpn_pack_record
   * 
!  * DESCRIPTION:  Pack a record so that it can be stored in the database
   *
   * PARAMETERS:   item
***************
*** 54,63 ****
  	packed = MemPtrNew(item.allocsize + sizeof(*packed));
  	if (!packed)
! 	    return NULL;

  	packed->rpn = item;
  	packed->datasize = item.allocsize;
  	if (item.allocsize)
! 	  memcpy(packed->data,item.u.data,item.allocsize);

  	return packed;
--- 54,63 ----
  	packed = MemPtrNew(item.allocsize + sizeof(*packed));
  	if (!packed)
! 		return NULL;

  	packed->rpn = item;
  	packed->datasize = item.allocsize;
  	if (item.allocsize)
! 		memcpy(packed->data,item.u.data,item.allocsize);

  	return packed;
***************
*** 83,87 ****
  {
  	if (item.allocsize)
! 	  MemPtrFree(item.u.stringval);
  }

--- 83,87 ----
  {
  	if (item.allocsize)
! 		MemPtrFree(item.u.stringval);
  }

***************
*** 207,213 ****
  	Int16 i;
  	if (dest->allocated < orig->size) 
! 	  ErrFatalDisplayIf(1,"Trying to copy larger stack into smaller.");
  	for (i=0;i<orig->size;i++)
! 	  rpn_duplicate(&dest->stack[i],orig->stack[i]);
  	dest->size = orig->size;
  }
--- 207,213 ----
  	Int16 i;
  	if (dest->allocated < orig->size) 
! 		ErrFatalDisplayIf(1,"Trying to copy larger stack into smaller.");
  	for (i=0;i<orig->size;i++)
! 		rpn_duplicate(&dest->stack[i],orig->stack[i]);
  	dest->size = orig->size;
  }
***************
*** 237,241 ****

  	if (stack->size<1)
! 	  return c_noarg;

  	tmpitem = stack_pop(stack);
--- 237,241 ----

  	if (stack->size<1)
! 		return c_noarg;

  	tmpitem = stack_pop(stack);
***************
*** 243,247 ****
  		err = rpn_eval_variable(&tmpitem,tmpitem);
  		if (err)
! 		  return err;
  	}

--- 243,247 ----
  		err = rpn_eval_variable(&tmpitem,tmpitem);
  		if (err)
! 			return err;
  	}

***************
*** 381,388 ****
  				}
  				else 
! 				  err = c_badarg;
  			}
  			else
! 			  err = c_badarg;
  			break;
  		 default:
--- 381,388 ----
  				}
  				else 
! 					err = c_badarg;
  			}
  			else
! 				err = c_badarg;
  			break;
  		 default:
***************
*** 391,395 ****
  	}
  	else	  
! 	  err=c_badarg;

  	rpn_delete(tmpitem);	
--- 391,395 ----
  	}
  	else	  
! 		err=c_badarg;

  	rpn_delete(tmpitem);	
***************
*** 416,422 ****

  	if ((err=stack_get_val(stack,arg2,reqtype)))
! 	  return err;       
  	err=stack_get_val(stack,arg1,reqtype);
! 	return err;;
  }

--- 416,422 ----

  	if ((err=stack_get_val(stack,arg2,reqtype)))
! 		return err;       
  	err=stack_get_val(stack,arg1,reqtype);
! 	return err;
  }

***************
*** 489,493 ****
  		value.u.listval = list_dup(*((List **)arg));
  		if (!value.u.listval)
! 		    return c_memory;
  		value.allocsize = sizeof(*value.u.listval) +
  			sizeof(value.u.listval->item[0]) * value.u.listval->size;
--- 489,493 ----
  		value.u.listval = list_dup(*((List **)arg));
  		if (!value.u.listval)
! 			return c_memory;
  		value.allocsize = sizeof(*value.u.listval) +
  			sizeof(value.u.listval->item[0]) * value.u.listval->size;
***************
*** 495,499 ****
  		value.u.matrixval = matrix_dup(*((Matrix **)arg));
  		if (!value.u.matrixval)
! 		    return c_memory;
  		value.allocsize = sizeof(*value.u.matrixval) +
  			sizeof(value.u.matrixval->item[0]) * \
--- 495,499 ----
  		value.u.matrixval = matrix_dup(*((Matrix **)arg));
  		if (!value.u.matrixval)
! 			return c_memory;
  		value.allocsize = sizeof(*value.u.matrixval) +
  			sizeof(value.u.matrixval->item[0]) * \
***************
*** 502,506 ****
  		value.u.cmatrixval = cmatrix_dup(*((CMatrix **)arg));
  		if (!value.u.cmatrixval)
! 		    return c_memory;
  		value.allocsize = sizeof(*value.u.cmatrixval) +
  			sizeof(value.u.cmatrixval->item[0]) *
--- 502,506 ----
  		value.u.cmatrixval = cmatrix_dup(*((CMatrix **)arg));
  		if (!value.u.cmatrixval)
! 			return c_memory;
  		value.allocsize = sizeof(*value.u.cmatrixval) +
  			sizeof(value.u.cmatrixval->item[0]) *
***************
*** 558,562 ****
  	err = rpn_eval_variable(&tmp,tmp);
  	if (err)
! 	  return err;

  	*type = tmp.type;
--- 558,562 ----
  	err = rpn_eval_variable(&tmp,tmp);
  	if (err)
! 		return err;

  	*type = tmp.type;
***************
*** 623,628 ****
  	lstres = list_new(listsize);
  	if (!lstres) {
! 	    stack_delete(tmpstack);
! 	    return c_memory;
  	}
  	cmpstack = stack_new(funcval->paramcount);
--- 623,628 ----
  	lstres = list_new(listsize);
  	if (!lstres) {
! 		stack_delete(tmpstack);
! 		return c_memory;
  	}
  	cmpstack = stack_new(funcval->paramcount);
***************
*** 653,657 ****

  	if (!err)
! 	    err = stack_add_val(varstack,&lstres,list);
  	list_delete(lstres);
  	stack_delete(tmpstack);
--- 653,657 ----

  	if (!err)
! 		err = stack_add_val(varstack,&lstres,list);
  	list_delete(lstres);
  	stack_delete(tmpstack);
***************
*** 831,839 ****
  		/* Handle non-operator types */
  		if (item.type==integer || item.type==real ||
! 		    item.type==variable || item.type==funcempty
! 		    || item.type==string || item.type == complex ||
! 			item.type == list || item.type == matrix ||
! 			item.type == litem || item.type == cmatrix) {
! 
  			stack_push(varstack,item);
  		} else if (item.type==function) {
--- 831,838 ----
  		/* Handle non-operator types */
  		if (item.type==integer || item.type==real ||
! 		    item.type==variable || item.type==funcempty ||
! 		    item.type==string || item.type == complex ||
! 		    item.type == list || item.type == matrix ||
! 		    item.type == litem || item.type == cmatrix) {
  			stack_push(varstack,item);
  		} else if (item.type==function) {
***************
*** 845,853 ****
  #ifdef SPECFUN_ENABLED
  			listsimul = false;
! 			if (defined_funcs[fce].listsimul || \
  			    defined_funcs[fce].matrixsimul) {
  				for (i=0;i < item.u.funcval.paramcount;i++) {
! 					err=stack_item_type(varstack,&type,
! 							    i);
  					if (!err && type==list) {
  						listsimul = true;
--- 844,851 ----
  #ifdef SPECFUN_ENABLED
  			listsimul = false;
! 			if (defined_funcs[fce].listsimul ||
  			    defined_funcs[fce].matrixsimul) {
  				for (i=0;i < item.u.funcval.paramcount;i++) {
! 					err=stack_item_type(varstack,&type,i);
  					if (!err && type==list) {
  						listsimul = true;
***************
*** 867,871 ****
  			 * algorithms.
  			 */
! 			else if (defined_funcs[fce].matrixsimul && \
  				 matrixcount == 1) 
  				retval = stack_matrixsimul(fce,&item.u.funcval,
--- 865,869 ----
  			 * algorithms.
  			 */
! 			else if (defined_funcs[fce].matrixsimul &&
  				 matrixcount == 1) 
  				retval = stack_matrixsimul(fce,&item.u.funcval,