objecthandler-cvs

[Ferdinando A. <na...@us...>]

Update of /cvsroot/objecthandler/ObjectHandler/ohxl/Functions
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv709/ohxl/Functions

Modified Files:
	manual.cpp 
Log Message:
use pre-increment where appropriate

Index: manual.cpp
===================================================================
RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/Functions/manual.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** manual.cpp	2 Jan 2007 11:08:16 -0000	1.14
--- manual.cpp	3 Jan 2007 14:24:30 -0000	1.15
***************
*** 106,109 ****
--- 106,110 ----
          static std::map<std::string, long> iterators;
          static long returnValue;
+         // what is ++ used for?
          returnValue = iterators[ObjHandler::FunctionCall::instance().getAddressString()]++;
          return &returnValue;
***************
*** 121,126 ****
  
  int countValidRows(const OPER &xMulti) {
!     for (int numValidRows=xMulti.val.array.rows; numValidRows; numValidRows--) {
!         for (int i=0; i<xMulti.val.array.columns; i++) {
              int index = (numValidRows - 1) * xMulti.val.array.columns + i;
              if (!(xMulti.val.array.lparray[index].xltype & (xltypeErr | xltypeNil)))
--- 122,127 ----
  
  int countValidRows(const OPER &xMulti) {
!     for (int numValidRows=xMulti.val.array.rows; numValidRows; --numValidRows) {
!         for (int i=0; i<xMulti.val.array.columns; ++i) {
              int index = (numValidRows - 1) * xMulti.val.array.columns + i;
              if (!(xMulti.val.array.lparray[index].xltype & (xltypeErr | xltypeNil)))
***************
*** 132,137 ****
  
  int countValidCols(const OPER &xMulti) {
!     for (int numValidCols=xMulti.val.array.columns; numValidCols; numValidCols--) {
!         for (int i=0; i<xMulti.val.array.rows; i++) {
              int index = (numValidCols - 1) + i * xMulti.val.array.columns;
              if (!(xMulti.val.array.lparray[index].xltype & (xltypeErr | xltypeNil)))
--- 133,138 ----
  
  int countValidCols(const OPER &xMulti) {
!     for (int numValidCols=xMulti.val.array.columns; numValidCols; --numValidCols) {
!         for (int i=0; i<xMulti.val.array.rows; ++i) {
              int index = (numValidCols - 1) + i * xMulti.val.array.columns;
              if (!(xMulti.val.array.lparray[index].xltype & (xltypeErr | xltypeNil)))
***************
*** 165,170 ****
          xRet.xltype = xltypeMulti | xlbitDLLFree;
  
!         for (int i=0; i<numValidRows; i++) {
!             for (int j=0; j<numValidCols; j++) {
                  int indexSource = i * xMulti.val.array.columns + j;
                  int indexTarget = i * numValidCols + j;
--- 166,171 ----
          xRet.xltype = xltypeMulti | xlbitDLLFree;
  
!         for (int i=0; i<numValidRows; ++i) {
!             for (int j=0; j<numValidCols; ++j) {
                  int indexSource = i * xMulti.val.array.columns + j;
                  int indexTarget = i * numValidCols + j;
***************
*** 183,187 ****
  
          if (xRet.xltype & xltypeMulti && xRet.val.array.lparray) {
!             for (int i=0; i<xRet.val.array.columns * xRet.val.array.rows; i++) {
                  if (xRet.val.array.lparray[i].xltype & xltypeStr && xRet.val.array.lparray[i].val.str)
                      delete [] xRet.val.array.lparray[i].val.str;
--- 184,188 ----
  
          if (xRet.xltype & xltypeMulti && xRet.val.array.lparray) {
!             for (int i=0; i<xRet.val.array.columns * xRet.val.array.rows; ++i) {
                  if (xRet.val.array.lparray[i].xltype & xltypeStr && xRet.val.array.lparray[i].val.str)
                      delete [] xRet.val.array.lparray[i].val.str;