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

Side by Side Diff: src/scanner.cc

Issue 9422001: Make 'module' a context-sensitive keyword. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Added missing CHECK_OK; rebased. Created 8 years, 10 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
« src/parser.cc ('K') | « src/parser.cc ('k') | src/token.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 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
(...skipping 832 matching lines...) Expand 10 before | Expand all | Expand 10 after
843 KEYWORD("if", Token::IF) \ 843 KEYWORD("if", Token::IF) \
844 KEYWORD("implements", Token::FUTURE_STRICT_RESERVED_WORD) \ 844 KEYWORD("implements", Token::FUTURE_STRICT_RESERVED_WORD) \
845 KEYWORD("import", harmony_modules \ 845 KEYWORD("import", harmony_modules \
846 ? Token::IMPORT : Token::FUTURE_RESERVED_WORD) \ 846 ? Token::IMPORT : Token::FUTURE_RESERVED_WORD) \
847 KEYWORD("in", Token::IN) \ 847 KEYWORD("in", Token::IN) \
848 KEYWORD("instanceof", Token::INSTANCEOF) \ 848 KEYWORD("instanceof", Token::INSTANCEOF) \
849 KEYWORD("interface", Token::FUTURE_STRICT_RESERVED_WORD) \ 849 KEYWORD("interface", Token::FUTURE_STRICT_RESERVED_WORD) \
850 KEYWORD_GROUP('l') \ 850 KEYWORD_GROUP('l') \
851 KEYWORD("let", harmony_scoping \ 851 KEYWORD("let", harmony_scoping \
852 ? Token::LET : Token::FUTURE_STRICT_RESERVED_WORD) \ 852 ? Token::LET : Token::FUTURE_STRICT_RESERVED_WORD) \
853 KEYWORD_GROUP('m') \
854 KEYWORD("module", harmony_modules \
855 ? Token::MODULE : Token::IDENTIFIER) \
856 KEYWORD_GROUP('n') \ 853 KEYWORD_GROUP('n') \
857 KEYWORD("new", Token::NEW) \ 854 KEYWORD("new", Token::NEW) \
858 KEYWORD("null", Token::NULL_LITERAL) \ 855 KEYWORD("null", Token::NULL_LITERAL) \
859 KEYWORD_GROUP('p') \ 856 KEYWORD_GROUP('p') \
860 KEYWORD("package", Token::FUTURE_STRICT_RESERVED_WORD) \ 857 KEYWORD("package", Token::FUTURE_STRICT_RESERVED_WORD) \
861 KEYWORD("private", Token::FUTURE_STRICT_RESERVED_WORD) \ 858 KEYWORD("private", Token::FUTURE_STRICT_RESERVED_WORD) \
862 KEYWORD("protected", Token::FUTURE_STRICT_RESERVED_WORD) \ 859 KEYWORD("protected", Token::FUTURE_STRICT_RESERVED_WORD) \
863 KEYWORD("public", Token::FUTURE_STRICT_RESERVED_WORD) \ 860 KEYWORD("public", Token::FUTURE_STRICT_RESERVED_WORD) \
864 KEYWORD_GROUP('r') \ 861 KEYWORD_GROUP('r') \
865 KEYWORD("return", Token::RETURN) \ 862 KEYWORD("return", Token::RETURN) \
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
1082 } 1079 }
1083 } 1080 }
1084 } 1081 }
1085 literal.Complete(); 1082 literal.Complete();
1086 1083
1087 next_.location.end_pos = source_pos() - 1; 1084 next_.location.end_pos = source_pos() - 1;
1088 return true; 1085 return true;
1089 } 1086 }
1090 1087
1091 } } // namespace v8::internal 1088 } } // namespace v8::internal
OLDNEW
« src/parser.cc ('K') | « src/parser.cc ('k') | src/token.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698