use correct param types

diff --git a/dev/phpdbg_parser.y b/dev/phpdbg_parser.y
index 9d7149ff83f14c604742bf8b78e1336819075c92..24bcc685372745ac6fac24314c4c63b2337e0265 100644 (file)
--- a/dev/phpdbg_parser.y
+++ b/dev/phpdbg_parser.y
@@ -191,11 +191,11 @@ int phpdbg_stack_execute(phpdbg_param_t *stack, char **why) {
        
        switch (command->type) {
                case EVAL_PARAM:
-                       phpdbg_notice("eval (%s)", command->str);
+                       PHPDBG_COMMAND_HANDLER(eval)(command, NULL TSRMLS_CC);
                break;
                
                case SHELL_PARAM:
-                       phpdbg_notice("shell (%s)", command->str);
+                       PHPDBG_COMMAND_HANDLER(shell)(command, NULL TSRMLS_CC);
                break;
                
                case STR_PARAM: {
@@ -228,7 +228,6 @@ int phpdbg_stack_execute(phpdbg_param_t *stack, char **why) {
        return SUCCESS;
 }
 
-
 %}
  
 %code requires {

diff --git a/phpdbg_parser.c b/phpdbg_parser.c
index ef9d4f4333581fa6dc5cce304a0d451be9bf6515..79745cef8be73653a1a7b3a2628a8fec0fa7c2aa 100644 (file)
--- a/phpdbg_parser.c
+++ b/phpdbg_parser.c
@@ -259,11 +259,11 @@ int phpdbg_stack_execute(phpdbg_param_t *stack, char **why) {
        
        switch (command->type) {
                case EVAL_PARAM:
-                       phpdbg_notice("eval (%s)", command->str);
+                       PHPDBG_COMMAND_HANDLER(eval)(command, NULL TSRMLS_CC);
                break;
                
                case SHELL_PARAM:
-                       phpdbg_notice("shell (%s)", command->str);
+                       PHPDBG_COMMAND_HANDLER(shell)(command, NULL TSRMLS_CC);
                break;
                
                case STR_PARAM: {

diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c
index e53a5e68b1947ac2006b65e244dca3d84736a1d8..632ceb9761127aff8e500d67f82265b6c4fd1f65 100644 (file)
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@ -617,7 +617,7 @@ out:
 PHPDBG_COMMAND(eval) /* {{{ */
 {
        switch (param->type) {
-               case STR_PARAM: {
+               case EVAL_PARAM: {
                        zend_bool stepping = ((PHPDBG_G(flags) & PHPDBG_IS_STEPPING)==PHPDBG_IS_STEPPING);
                        zval retval;
 
@@ -780,7 +780,7 @@ PHPDBG_COMMAND(shell) /* {{{ */
 {
        /* don't allow this to loop, ever ... */
        switch (param->type) {
-               case STR_PARAM: {
+               case SHELL_PARAM: {
                        FILE *fd = NULL;
                        if ((fd=VCWD_POPEN((char*)param->str, "w"))) {
                                /* do something perhaps ?? do we want input ?? */