1
0
mirror of synced 2025-01-20 07:21:40 +03:00

Reverted extensibility of Lexer. This is not ideal.

This commit is contained in:
Guilherme Blanco 2010-07-27 01:19:51 -03:00
parent b477211b4b
commit 2a7a72b3f9

View File

@ -151,7 +151,7 @@ class Lexer extends \Doctrine\Common\Lexer
$value = str_replace("''", "'", substr($value, 1, strlen($value) - 2)); $value = str_replace("''", "'", substr($value, 1, strlen($value) - 2));
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 = $this->getLexerClassName() . '::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) {
@ -172,7 +172,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::T_MULTIPLY; case '*': return self::Ts_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;
@ -185,14 +185,4 @@ class Lexer extends \Doctrine\Common\Lexer
return $type; return $type;
} }
/**
* Retrieve the class name (allows extensibility through Late Static Binding)
*
* @return string This class name
*/
protected function getLexerClassName()
{
return __CLASS__;
}
} }