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

diff --git a/src/preparser.cc b/src/preparser.cc
index eaadb58915425f755e1cefc57e7681dd9ade900e..3c48d14bab72835ac7ffefb2c02afb6801e0b162 100644 (file)
--- a/src/preparser.cc
+++ b/src/preparser.cc
@@ -1,4 +1,4 @@
-// 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
 // modification, are permitted provided that the following conditions are
 // met:
@@ -981,7 +981,7 @@ PreParser::Expression PreParser::ParsePrimaryExpression(bool* ok) {
       // FALLTHROUGH
     case i::Token::IDENTIFIER: {
       Identifier id = ParseIdentifier(CHECK_OK);
-      result = Expression::Identifier(id);
+      result = Expression::FromIdentifier(id);
       break;
     }
 

diff --git a/src/preparser.h b/src/preparser.h
index 241d81a01a00f4edf95887aa48a6c625babc916b..2a2a49a0fb475e13cb3d213893c64b7ef78fe500 100644 (file)
--- a/src/preparser.h
+++ b/src/preparser.h
@@ -1,4 +1,4 @@
-// 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
 // modification, are permitted provided that the following conditions are
 // met:
@@ -124,7 +124,7 @@ class PreParser {
       return Expression(kUnknownExpression);
     }
 
-    static Expression Identifier(Identifier id) {
+    static Expression FromIdentifier(Identifier id) {
       return Expression(kIdentifierFlag | (id.type_ << kIdentifierShift));
     }