summaryrefslogtreecommitdiff
path: root/dev/phpdbg_parser.y
diff options
context:
space:
mode:
authorkrakjoe <joe.watkins@live.co.uk>2014-02-18 19:48:33 +0000
committerkrakjoe <joe.watkins@live.co.uk>2014-02-18 19:48:33 +0000
commite392e730ea7cd006a9933cb088179c9a6a46d246 (patch)
treecb542085de81e2be28f8300065a844f03ded7089 /dev/phpdbg_parser.y
parent29e74ebf650dd11a0c83b980b21ee39ee5720ca6 (diff)
downloadphp-git-e392e730ea7cd006a9933cb088179c9a6a46d246.tar.gz
execute new stack now
Diffstat (limited to 'dev/phpdbg_parser.y')
-rw-r--r--dev/phpdbg_parser.y26
1 files changed, 4 insertions, 22 deletions
diff --git a/dev/phpdbg_parser.y b/dev/phpdbg_parser.y
index 24bcc68537..49925f6709 100644
--- a/dev/phpdbg_parser.y
+++ b/dev/phpdbg_parser.y
@@ -111,7 +111,7 @@ static void phpdbg_stack_push(phpdbg_param_t *stack, phpdbg_param_t *param) {
next->top = stack->top;
stack->top = next;
}
- phpdbg_debug_param(next, "push ->");
+
stack->len++;
}
@@ -146,16 +146,10 @@ phpdbg_command_t* phpdbg_stack_resolve(const phpdbg_command_t *commands, phpdbg_
if (matched[0]->subs && (*top) && ((*top)->type == STR_PARAM)) {
command = phpdbg_stack_resolve(matched[0]->subs, top, why);
if (command) {
- phpdbg_notice(
- "Command matching with sub command %s %s",
- matched[0]->name, command->name);
return command;
}
}
- phpdbg_notice(
- "Command matching with %s",
- matched[0]->name);
return matched[0];
} break;
@@ -191,29 +185,17 @@ int phpdbg_stack_execute(phpdbg_param_t *stack, char **why) {
switch (command->type) {
case EVAL_PARAM:
- PHPDBG_COMMAND_HANDLER(eval)(command, NULL TSRMLS_CC);
- break;
+ return PHPDBG_COMMAND_HANDLER(eval)(command, NULL TSRMLS_CC);
case SHELL_PARAM:
- PHPDBG_COMMAND_HANDLER(shell)(command, NULL TSRMLS_CC);
- break;
+ return PHPDBG_COMMAND_HANDLER(shell)(command, NULL TSRMLS_CC);
case STR_PARAM: {
- /* do resolve command(s) */
handler = phpdbg_stack_resolve(
phpdbg_prompt_commands, &command, why);
if (handler) {
- /* get top of stack */
- params = command;
-
- /* prepare params */
- while (params) {
- phpdbg_debug_param(params, "-> ...");
- params = params->next;
- }
-
- return SUCCESS;
+ return handler->handler(command, NULL TSRMLS_CC);
} else {
return FAILURE;
}