Merge branch 'master' of https://github.com/krakjoe/phpdbg into opline_num_support

Conflicts:
	phpdbg.c
	phpdbg_bp.c

diff --cc phpdbg.c
Simple merge

diff --cc phpdbg_bp.c
index a84be3e378ac9724e573ac6d25b55bc72a48200a,3c0f198526757ca4aafddecfcd53993517654a9b..128c9c17f3d1eded59c975be0b2309d24466abc5
--- 1/phpdbg_bp.c
--- 2/phpdbg_bp.c
+++ b/phpdbg_bp.c
@@@ -926,12 -599,12 +926,12 @@@ static inline zend_bool phpdbg_find_bre
                                }
                        }
                } break;
-               
+ 
                case FILE_PARAM: {
 -                      if ((param->file.line == zend_get_executed_lineno(TSRMLS_C))) {
 +                      if (param->file.line == zend_get_executed_lineno(TSRMLS_C)) {
                                const char *str = zend_get_executed_filename(TSRMLS_C);
                                size_t lengths[2] = {strlen(param->file.name), strlen(str)};
-                               
+ 
                                if (lengths[0] == lengths[1]) {
                                        return (memcmp(
                                                param->file.name, str, lengths[0]) == SUCCESS);
@@@ -965,14 -638,14 +965,14 @@@
                                }
                        }
                } break;
-               
+ 
                case ADDR_PARAM: {
 -                      return ((phpdbg_opline_ptr_t)execute_data->opline == param->addr);
 +                      return ((zend_ulong)(phpdbg_opline_ptr_t)execute_data->opline == param->addr);
 +              } break;
 +              
 +              default: {
 +                      /* do nothing */
                } break;
 -
 -              case NUMERIC_PARAM:
 -              case EMPTY_PARAM: {
 -                      /* do nothing */ } break;
        }
        return 0;
  } /* }}} */
@@@ -1588,12 -1120,11 +1602,12 @@@ PHPDBG_API void phpdbg_print_breakpoint
                                                break;
  
                                                default:
 -                                              break;
 +                                                      phpdbg_error("Invalid parameter type for conditional breakpoint");
 +                                              return;
                                        }
                                } else {
-                                       phpdbg_writeln("#%d\t\tif %s%s",        
-                                               brake->id, brake->code, 
+                                       phpdbg_writeln("#%d\t\tif %s%s",
+                                               brake->id, brake->code,
                                                ((phpdbg_breakbase_t*)brake)->disabled ? " [disabled]" : "");
                                }
                        }

diff --cc phpdbg_cmd.c
Simple merge

diff --cc phpdbg_cmd.h
Simple merge

diff --cc phpdbg_prompt.c
Simple merge