Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Side by Side Diff: src/preparser.cc

Issue 7046004: Avoid conflict between method and type name. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/preparser.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2010 the V8 project authors. All rights reserved. 1 // Copyright 2011 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
11 // with the distribution. 11 // with the distribution.
(...skipping 962 matching lines...) Expand 10 before | Expand all | Expand 10 after
974 Next(); 974 Next();
975 i::Scanner::Location location = scanner_->location(); 975 i::Scanner::Location location = scanner_->location();
976 ReportMessageAt(location.beg_pos, location.end_pos, 976 ReportMessageAt(location.beg_pos, location.end_pos,
977 "strict_reserved_word", NULL); 977 "strict_reserved_word", NULL);
978 *ok = false; 978 *ok = false;
979 return Expression::Default(); 979 return Expression::Default();
980 } 980 }
981 // FALLTHROUGH 981 // FALLTHROUGH
982 case i::Token::IDENTIFIER: { 982 case i::Token::IDENTIFIER: {
983 Identifier id = ParseIdentifier(CHECK_OK); 983 Identifier id = ParseIdentifier(CHECK_OK);
984 result = Expression::Identifier(id); 984 result = Expression::FromIdentifier(id);
985 break; 985 break;
986 } 986 }
987 987
988 case i::Token::NULL_LITERAL: 988 case i::Token::NULL_LITERAL:
989 case i::Token::TRUE_LITERAL: 989 case i::Token::TRUE_LITERAL:
990 case i::Token::FALSE_LITERAL: 990 case i::Token::FALSE_LITERAL:
991 case i::Token::NUMBER: { 991 case i::Token::NUMBER: {
992 Next(); 992 Next();
993 break; 993 break;
994 } 994 }
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after
1409 } 1409 }
1410 return result; 1410 return result;
1411 } 1411 }
1412 1412
1413 bool PreParser::peek_any_identifier() { 1413 bool PreParser::peek_any_identifier() {
1414 i::Token::Value next = peek(); 1414 i::Token::Value next = peek();
1415 return next == i::Token::IDENTIFIER || 1415 return next == i::Token::IDENTIFIER ||
1416 next == i::Token::FUTURE_RESERVED_WORD; 1416 next == i::Token::FUTURE_RESERVED_WORD;
1417 } 1417 }
1418 } } // v8::preparser 1418 } } // v8::preparser
OLDNEW
« no previous file with comments | « src/preparser.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698