diff options
| author | Deven Bansod <devenbansod.bits@gmail.com> | 2016-09-26 14:36:47 +0530 |
|---|---|---|
| committer | Deven Bansod <devenbansod.bits@gmail.com> | 2016-09-26 14:36:47 +0530 |
| commit | 9da859827b973babb6c856d91d36a3dd5f101c05 (patch) | |
| tree | 1fe1e76ee89472542e422137d6fb18e60061000a /src | |
| parent | 7f4702adeab4a852ffc724971a601e28668fa6fe (diff) | |
| download | sql-parser-9da859827b973babb6c856d91d36a3dd5f101c05.zip sql-parser-9da859827b973babb6c856d91d36a3dd5f101c05.tar.gz sql-parser-9da859827b973babb6c856d91d36a3dd5f101c05.tar.bz2 | |
Fix some issue with error reports and added testcases
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/Components/CaseExpression.php | 35 |
1 files changed, 8 insertions, 27 deletions
diff --git a/src/Components/CaseExpression.php b/src/Components/CaseExpression.php index 6195cd8..1b5aa71 100644 --- a/src/Components/CaseExpression.php +++ b/src/Components/CaseExpression.php @@ -15,8 +15,6 @@ use SqlParser\Token; use SqlParser\TokensList; - - /** * Parses a reference to a CASE expression * @@ -84,20 +82,6 @@ class CaseExpression extends Component $ret = new CaseExpression(); /** - * Counts brackets. - * - * @var int $brackets - */ - $brackets = 0; - - /** - * Keeps track of the last two previous tokens. - * - * @var Token[] $prev - */ - $prev = array(null, null); - - /** * State of parser * * @var int $parser @@ -157,7 +141,7 @@ class CaseExpression extends Component ++$list->idx; break; } elseif ($token->type === Token::TYPE_KEYWORD) { - $parser->error(__('Unexpected keyword'), $token); + $parser->error(__('Unexpected keyword.'), $token); break; } else { $ret->value = Expression::parse($parser, $list); @@ -187,10 +171,10 @@ class CaseExpression extends Component ++$list->idx; break; } elseif ($token->type === Token::TYPE_KEYWORD) { - $parser->error(__('Unexpected keyword'), $token); + $parser->error(__('Unexpected keyword.'), $token); break; } else { - $parser->error(__('Unexpected token'), $token); + $parser->error(__('Unexpected token.'), $token); break; } } else { @@ -202,10 +186,10 @@ class CaseExpression extends Component $state = 0; $ret->results[] = $new_result; } elseif ($token->type === Token::TYPE_KEYWORD) { - $parser->error(__('Unexpected keyword'), $token); + $parser->error(__('Unexpected keyword.'), $token); break; } else { - $parser->error(__('Unexpected token'), $token); + $parser->error(__('Unexpected token.'), $token); break; } } @@ -219,15 +203,12 @@ class CaseExpression extends Component $ret->results[] = $new_result; $state = 1; } elseif ($token->type === Token::TYPE_KEYWORD) { - $parser->error(__('Unexpected keyword'), $token); + $parser->error(__('Unexpected keyword.'), $token); break; } else { - $parser->error(__('Unexpected token'), $token); + $parser->error(__('Unexpected token.'), $token); break; } - } else { - $parser->error(__('Unexpected token'), $token); - break; } } } @@ -235,7 +216,7 @@ class CaseExpression extends Component if ($state !== 3) { $parser->error( __('Unexpected end of CASE expression'), - $list->list[$list->idx - 1] + $list->tokens[$list->idx - 1] ); } |