1
0
mirror of synced 2024-12-14 15:16:04 +03:00

Reverted extensibility of Lexer. This is not ideal.

This commit is contained in:
Guilherme Blanco 2010-07-27 01:20:31 -03:00
parent 2a7a72b3f9
commit d2740f0e77

View File

@ -152,12 +152,15 @@ class Lexer extends \Doctrine\Common\Lexer
return self::T_STRING; return self::T_STRING;
} else if (ctype_alpha($value[0]) || $value[0] === '_') { } else if (ctype_alpha($value[0]) || $value[0] === '_') {
$name = 'Doctrine\ORM\Query\Lexer::T_' . strtoupper($value); $name = 'Doctrine\ORM\Query\Lexer::T_' . strtoupper($value);
if (defined($name)) { if (defined($name)) {
$type = constant($name); $type = constant($name);
if ($type > 100) { if ($type > 100) {
return $type; return $type;
} }
} }
return self::T_IDENTIFIER; return self::T_IDENTIFIER;
} else if ($value[0] === '?' || $value[0] === ':') { } else if ($value[0] === '?' || $value[0] === ':') {
return self::T_INPUT_PARAMETER; return self::T_INPUT_PARAMETER;
@ -172,7 +175,7 @@ class Lexer extends \Doctrine\Common\Lexer
case '<': return self::T_LOWER_THAN; case '<': return self::T_LOWER_THAN;
case '+': return self::T_PLUS; case '+': return self::T_PLUS;
case '-': return self::T_MINUS; case '-': return self::T_MINUS;
case '*': return self::Ts_MULTIPLY; case '*': return self::T_MULTIPLY;
case '/': return self::T_DIVIDE; case '/': return self::T_DIVIDE;
case '!': return self::T_NEGATE; case '!': return self::T_NEGATE;
case '{': return self::T_OPEN_CURLY_BRACE; case '{': return self::T_OPEN_CURLY_BRACE;