[xdebug-dev] xdebug xdebug/xdebug.c xdebug/xdebug_code_coverage.c - Two more code coverage fixes: elseif and return.

Date: Wed Feb 13 15:57:00 CET 2008
User: Derick Rethans
Directory: xdebug

Log Message:
[0.50]
- Two more code coverage fixes: elseif and return.

Modified files:
           xdebug/xdebug.c (version: 1.417)
           xdebug/xdebug_code_coverage.c (version: 1.42)

[FILE: /xdebug/xdebug.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.416
retrieving revision 1.417
diff -u -r1.416 -r1.417
--- xdebug/xdebug.c:1.416 Sun Feb 03 12:04:48 2008 GMT
+++ xdebug/xdebug.c Wed Feb 13 13:57:00 2008 GMT
@@ -538,6 +538,7 @@
 XDEBUG_OPCODE_OVERRIDE(fetch_class)
 XDEBUG_OPCODE_OVERRIDE(fetch_constant)
 XDEBUG_OPCODE_OVERRIDE(concat)
+XDEBUG_OPCODE_OVERRIDE(isset_isempty_dim_obj)
 #endif
 
 
@@ -608,6 +609,7 @@
         XDEBUG_SET_OPCODE_OVERRIDE(fetch_class, ZEND_FETCH_CLASS);
         XDEBUG_SET_OPCODE_OVERRIDE(fetch_constant, ZEND_FETCH_CONSTANT);
         XDEBUG_SET_OPCODE_OVERRIDE(concat, ZEND_CONCAT);
+ XDEBUG_SET_OPCODE_OVERRIDE(isset_isempty_dim_obj, ZEND_ISSET_ISEMPTY_DIM_OBJ);
 #endif
 
         if (zend_xdebug_initialised == 0) {

[FILE: /xdebug/xdebug_code_coverage.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- xdebug/xdebug_code_coverage.c:1.41 Wed Feb 13 12:59:28 2008 GMT
+++ xdebug/xdebug_code_coverage.c Wed Feb 13 13:57:00 2008 GMT
@@ -176,7 +176,7 @@
         /* Loop over the opcodes until the end of the array, or until a jump point has been found */
         xdebug_set_add(set, position);
         /*(fprintf(stderr, "XDEBUG Adding %d\n", position);)*/
- while (position < opa->size - 1) {
+ while (position < opa->size) {
 
                 /* See if we have a jump instruction */
                 if (xdebug_find_jump(opa, position, &jump_pos1, &jump_pos2)) {
@@ -198,7 +198,7 @@
                         /* fprintf(stderr, "Throw found at %d\n", position); */
                         /* Now we need to go forward to the first
                          * zend_fetch_class/zend_catch combo */
- while (position < opa->size - 1) {
+ while (position < opa->size) {
                                 if (opa->opcodes[position].opcode == ZEND_CATCH) {
                                         /* fprintf(stderr, "Found catch at %d\n", position); */
                                         position--;
Received on Wed Feb 13 2008 - 15:57:06 GMT