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

Side by Side Diff: src/parser.h

Issue 7584005: Revert "Fix a bug in scope analysis." (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 9 years, 4 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/objects-inl.h ('k') | src/parser.cc » ('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 536 matching lines...) Expand 10 before | Expand all | Expand 10 after
547 bool IsBoilerplateProperty(ObjectLiteral::Property* property); 547 bool IsBoilerplateProperty(ObjectLiteral::Property* property);
548 // If the expression is a literal, return the literal value; 548 // If the expression is a literal, return the literal value;
549 // if the expression is a materialized literal and is simple return a 549 // if the expression is a materialized literal and is simple return a
550 // compile time value as encoded by CompileTimeValue::GetValue(). 550 // compile time value as encoded by CompileTimeValue::GetValue().
551 // Otherwise, return undefined literal as the placeholder 551 // Otherwise, return undefined literal as the placeholder
552 // in the object literal boilerplate. 552 // in the object literal boilerplate.
553 Handle<Object> GetBoilerplateValue(Expression* expression); 553 Handle<Object> GetBoilerplateValue(Expression* expression);
554 554
555 enum FunctionLiteralType { 555 enum FunctionLiteralType {
556 EXPRESSION, 556 EXPRESSION,
557 DECLARATION 557 DECLARATION,
558 NESTED
558 }; 559 };
559 560
560 ZoneList<Expression*>* ParseArguments(bool* ok); 561 ZoneList<Expression*>* ParseArguments(bool* ok);
561 FunctionLiteral* ParseFunctionLiteral(Handle<String> var_name, 562 FunctionLiteral* ParseFunctionLiteral(Handle<String> var_name,
562 bool name_is_reserved, 563 bool name_is_reserved,
563 int function_token_position, 564 int function_token_position,
564 FunctionLiteralType type, 565 FunctionLiteralType type,
565 bool* ok); 566 bool* ok);
566 567
567 568
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
751 private: 752 private:
752 static const int kTypeSlot = 0; 753 static const int kTypeSlot = 0;
753 static const int kElementsSlot = 1; 754 static const int kElementsSlot = 1;
754 755
755 DISALLOW_IMPLICIT_CONSTRUCTORS(CompileTimeValue); 756 DISALLOW_IMPLICIT_CONSTRUCTORS(CompileTimeValue);
756 }; 757 };
757 758
758 } } // namespace v8::internal 759 } } // namespace v8::internal
759 760
760 #endif // V8_PARSER_H_ 761 #endif // V8_PARSER_H_
OLDNEW
« no previous file with comments | « src/objects-inl.h ('k') | src/parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698