Conflicts:
	stdx/lexer.d
This commit is contained in:
Hackerpilot 2014-03-03 23:11:41 -08:00
commit 1536ed722b
1 changed files with 6 additions and 1 deletions

View File

@ -819,6 +819,11 @@ public:
* amount of work necessary when lexing dynamic tokens. * amount of work necessary when lexing dynamic tokens.
*/ */
string intern(const(ubyte)[] str, uint hash) pure nothrow @safe string intern(const(ubyte)[] str, uint hash) pure nothrow @safe
in
{
assert (str.length > 0);
}
body
{ {
return _intern(str, hash); return _intern(str, hash);
} }
@ -882,7 +887,7 @@ private:
shared(Node)* node = buckets[index]; shared(Node)* node = buckets[index];
while (node !is null) while (node !is null)
{ {
if (node.hash >= hash && bytes == cast(ubyte[]) node.str) if (node.hash >= hash && bytes.equal(cast(ubyte[]) node.str))
{ {
found = true; found = true;
return node; return node;