Commit eea59292 authored by lrn@chromium.org's avatar lrn@chromium.org

Avoid conflict between method and type name.

Make builder happy.

Review URL: http://codereview.chromium.org/7046004

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@7954 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 7db97de8
// Copyright 2010 the V8 project authors. All rights reserved. // Copyright 2011 the V8 project authors. All rights reserved.
// Redistribution and use in source and binary forms, with or without // Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are // modification, are permitted provided that the following conditions are
// met: // met:
...@@ -981,7 +981,7 @@ PreParser::Expression PreParser::ParsePrimaryExpression(bool* ok) { ...@@ -981,7 +981,7 @@ PreParser::Expression PreParser::ParsePrimaryExpression(bool* ok) {
// FALLTHROUGH // FALLTHROUGH
case i::Token::IDENTIFIER: { case i::Token::IDENTIFIER: {
Identifier id = ParseIdentifier(CHECK_OK); Identifier id = ParseIdentifier(CHECK_OK);
result = Expression::Identifier(id); result = Expression::FromIdentifier(id);
break; break;
} }
......
// Copyright 2010 the V8 project authors. All rights reserved. // Copyright 2011 the V8 project authors. All rights reserved.
// Redistribution and use in source and binary forms, with or without // Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are // modification, are permitted provided that the following conditions are
// met: // met:
...@@ -124,7 +124,7 @@ class PreParser { ...@@ -124,7 +124,7 @@ class PreParser {
return Expression(kUnknownExpression); return Expression(kUnknownExpression);
} }
static Expression Identifier(Identifier id) { static Expression FromIdentifier(Identifier id) {
return Expression(kIdentifierFlag | (id.type_ << kIdentifierShift)); return Expression(kIdentifierFlag | (id.type_ << kIdentifierShift));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment