Commit 09823077 authored by malenov's avatar malenov
Browse files

move funcId_where_last_call_to_else_occurred, ... to WMC

parent 9748f925

lib_com/control.c

+0 −6
Original line number Diff line number Diff line
@@ -20,12 +20,6 @@ 


#include "stl.h"



#ifdef WMOPS

int funcId_where_last_call_to_else_occurred;

long funcid_total_wmops_at_last_call_to_else;

int call_occurred = 1;

#endif



#ifdef CONTROL_CODE_OPS



Flag LT_16( Word16 var1, Word16 var2 )

lib_com/control.h

+0 −34
Original line number Diff line number Diff line
@@ -35,40 +35,6 @@ 


#include "stl.h"





/*****************************************************************************

 *

 *  Constants and Globals

 *

 *****************************************************************************/

#ifdef WMOPS

/* Technical note :

 * The following 3 variables are only used for correct complexity

 * evaluation of the following structure :

 *   IF{

 *     ...

 *   } ELSE IF {

 *     ...

 *   } ELSE IF {

 *     ...

 *   }

 *   ...

 *   } ELSE {

 *     ...

 *   }

 */

extern int funcId_where_last_call_to_else_occurred;

extern long funcid_total_wmops_at_last_call_to_else;

extern int call_occurred;

#endif /* ifdef WMOPS */





/*****************************************************************************

 *

 *  Function Macros

 *

 *****************************************************************************/



/*****************************************************************************

 *

 *  Function Name : FOR

lib_debug/wmc_auto.c

+3 −0
Original line number Diff line number Diff line
@@ -2135,4 +2135,7 @@ int cntr_push_pop = 0; /* global counter for checking balanced push_wmops()/pop_ 
/* Global counter for the calculation of BASOP complexity */

BASIC_OP *multiCounter = NULL;

int currCounter = 0;

int funcId_where_last_call_to_else_occurred;

long funcid_total_wmops_at_last_call_to_else;

int call_occurred = 1;

#endif

lib_debug/wmc_auto.h

+20 −0
Original line number Diff line number Diff line
@@ -1313,6 +1313,26 @@ typedef struct 


extern BASIC_OP *multiCounter;   /* Global counter variable for calculation of complexity weight */

extern int currCounter;



/* Technical note :

   * The following 3 variables are only used for correct complexity

   * evaluation of the following structure :

   *   IF{

   *     ...

   *   } ELSE IF {

   *     ...

   *   } ELSE IF {

   *     ...

   *   }

   *   ...

   *   } ELSE {

   *     ...

   *   }

   */

    

extern int funcId_where_last_call_to_else_occurred;

extern long funcid_total_wmops_at_last_call_to_else;

extern int call_occurred;

#endif



#endif /* WMOPS_H */