Skip to content

V
V8
Commit 9c503a83 authored by kmillikin@chromium.org's avatar kmillikin@chromium.org
Browse files
Options

Fix some inconsistent formatting. 

I noticed we sometimes had extra spaces before and after the "const"
keyword.  Probably the result of a search and replace gone wrong.

This is a whitespace only change.

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

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@5519 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent cfbc1eed
Hide whitespace changes
Inline Side-by-side
Showing with 119 additions and 120 deletions
src/arm/assembler-arm.h
View file @ 9c503a83
...@@ -69,13 +69,13 @@ namespace internal { ...@@ -69,13 +69,13 @@ namespace internal {
// //
// Core register // Core register
struct Register { struct Register {
bool is_valid() const { return 0 <= code_ && code_ < 16; } bool is_valid() const { return 0 <= code_ && code_ < 16; }
bool is(Register reg) const { return code_ == reg.code_; } bool is(Register reg) const { return code_ == reg.code_; }
int code() const { int code() const {
ASSERT(is_valid()); ASSERT(is_valid());
return code_; return code_;
} }
int bit() const { int bit() const {
ASSERT(is_valid()); ASSERT(is_valid());
return 1 << code_; return 1 << code_;
} }
...@@ -110,17 +110,17 @@ const Register pc = { 15 }; ...@@ -110,17 +110,17 @@ const Register pc = { 15 };
// Single word VFP register. // Single word VFP register.
struct SwVfpRegister { struct SwVfpRegister {
bool is_valid() const { return 0 <= code_ && code_ < 32; } bool is_valid() const { return 0 <= code_ && code_ < 32; }
bool is(SwVfpRegister reg) const { return code_ == reg.code_; } bool is(SwVfpRegister reg) const { return code_ == reg.code_; }
int code() const { int code() const {
ASSERT(is_valid()); ASSERT(is_valid());
return code_; return code_;
} }
int bit() const { int bit() const {
ASSERT(is_valid()); ASSERT(is_valid());
return 1 << code_; return 1 << code_;
} }
void split_code(int* vm, int* m) const { void split_code(int* vm, int* m) const {
ASSERT(is_valid()); ASSERT(is_valid());
*m = code_ & 0x1; *m = code_ & 0x1;
*vm = code_ >> 1; *vm = code_ >> 1;
...@@ -133,31 +133,31 @@ struct SwVfpRegister { ...@@ -133,31 +133,31 @@ struct SwVfpRegister {
// Double word VFP register. // Double word VFP register.
struct DwVfpRegister { struct DwVfpRegister {
// Supporting d0 to d15, can be later extended to d31. // Supporting d0 to d15, can be later extended to d31.
bool is_valid() const { return 0 <= code_ && code_ < 16; } bool is_valid() const { return 0 <= code_ && code_ < 16; }
bool is(DwVfpRegister reg) const { return code_ == reg.code_; } bool is(DwVfpRegister reg) const { return code_ == reg.code_; }
SwVfpRegister low() const { SwVfpRegister low() const {
SwVfpRegister reg; SwVfpRegister reg;
reg.code_ = code_ * 2; reg.code_ = code_ * 2;
ASSERT(reg.is_valid()); ASSERT(reg.is_valid());
return reg; return reg;
} }
SwVfpRegister high() const { SwVfpRegister high() const {
SwVfpRegister reg; SwVfpRegister reg;
reg.code_ = (code_ * 2) + 1; reg.code_ = (code_ * 2) + 1;
ASSERT(reg.is_valid()); ASSERT(reg.is_valid());
return reg; return reg;
} }
int code() const { int code() const {
ASSERT(is_valid()); ASSERT(is_valid());
return code_; return code_;
} }
int bit() const { int bit() const {
ASSERT(is_valid()); ASSERT(is_valid());
return 1 << code_; return 1 << code_;
} }
void split_code(int* vm, int* m) const { void split_code(int* vm, int* m) const {
ASSERT(is_valid()); ASSERT(is_valid());
*m = (code_ & 0x10) >> 4; *m = (code_ & 0x10) >> 4;
*vm = code_ & 0x0F; *vm = code_ & 0x0F;
...@@ -222,13 +222,13 @@ const DwVfpRegister d15 = { 15 }; ...@@ -222,13 +222,13 @@ const DwVfpRegister d15 = { 15 };
// Coprocessor register // Coprocessor register
struct CRegister { struct CRegister {
bool is_valid() const { return 0 <= code_ && code_ < 16; } bool is_valid() const { return 0 <= code_ && code_ < 16; }
bool is(CRegister creg) const { return code_ == creg.code_; } bool is(CRegister creg) const { return code_ == creg.code_; }
int code() const { int code() const {
ASSERT(is_valid()); ASSERT(is_valid());
return code_; return code_;
} }
int bit() const { int bit() const {
ASSERT(is_valid()); ASSERT(is_valid());
return 1 << code_; return 1 << code_;
} }
......
src/arm/codegen-arm.h
View file @ 9c503a83
...@@ -307,9 +307,9 @@ class CodeGenerator: public AstVisitor { ...@@ -307,9 +307,9 @@ class CodeGenerator: public AstVisitor {
int NumberOfSlot(Slot* slot); int NumberOfSlot(Slot* slot);
// State // State
bool has_cc() const { return cc_reg_ != al; } bool has_cc() const { return cc_reg_ != al; }
JumpTarget* true_target() const { return state_->true_target(); } JumpTarget* true_target() const { return state_->true_target(); }
JumpTarget* false_target() const { return state_->false_target(); } JumpTarget* false_target() const { return state_->false_target(); }
// Track loop nesting level. // Track loop nesting level.
int loop_nesting() const { return loop_nesting_; } int loop_nesting() const { return loop_nesting_; }
......
src/assembler.h
View file @ 9c503a83
...@@ -57,7 +57,7 @@ class Label BASE_EMBEDDED { ...@@ -57,7 +57,7 @@ class Label BASE_EMBEDDED {
INLINE(void Unuse()) { pos_ = 0; } INLINE(void Unuse()) { pos_ = 0; }
INLINE(bool is_bound() const) { return pos_ < 0; } INLINE(bool is_bound() const) { return pos_ < 0; }
INLINE(bool is_unused() const) { return pos_ == 0; } INLINE(bool is_unused() const) { return pos_ == 0; }
INLINE(bool is_linked() const) { return pos_ > 0; } INLINE(bool is_linked() const) { return pos_ > 0; }
...@@ -232,10 +232,10 @@ class RelocInfo BASE_EMBEDDED { ...@@ -232,10 +232,10 @@ class RelocInfo BASE_EMBEDDED {
static inline int ModeMask(Mode mode) { return 1 << mode; } static inline int ModeMask(Mode mode) { return 1 << mode; }
// Accessors // Accessors
byte* pc() const { return pc_; } byte* pc() const { return pc_; }
void set_pc(byte* pc) { pc_ = pc; } void set_pc(byte* pc) { pc_ = pc; }
Mode rmode() const { return rmode_; } Mode rmode() const { return rmode_; }
intptr_t data() const { return data_; } intptr_t data() const { return data_; }
// Apply a relocation by delta bytes // Apply a relocation by delta bytes
INLINE(void apply(intptr_t delta)); INLINE(void apply(intptr_t delta));
...@@ -390,7 +390,7 @@ class RelocIterator: public Malloced { ...@@ -390,7 +390,7 @@ class RelocIterator: public Malloced {
explicit RelocIterator(const CodeDesc& desc, int mode_mask = -1); explicit RelocIterator(const CodeDesc& desc, int mode_mask = -1);
// Iteration // Iteration
bool done() const { return done_; } bool done() const { return done_; }
void next(); void next();
// Return pointer valid until next next(). // Return pointer valid until next next().
......
src/ast.h
View file @ 9c503a83
...@@ -330,7 +330,7 @@ class Block: public BreakableStatement { ...@@ -330,7 +330,7 @@ class Block: public BreakableStatement {
void AddStatement(Statement* statement) { statements_.Add(statement); } void AddStatement(Statement* statement) { statements_.Add(statement); }
ZoneList<Statement*>* statements() { return &statements_; } ZoneList<Statement*>* statements() { return &statements_; }
bool is_initializer_block() const { return is_initializer_block_; } bool is_initializer_block() const { return is_initializer_block_; }
private: private:
ZoneList<Statement*> statements_; ZoneList<Statement*> statements_;
...@@ -351,9 +351,9 @@ class Declaration: public AstNode { ...@@ -351,9 +351,9 @@ class Declaration: public AstNode {
virtual void Accept(AstVisitor* v); virtual void Accept(AstVisitor* v);
VariableProxy* proxy() const { return proxy_; } VariableProxy* proxy() const { return proxy_; }
Variable::Mode mode() const { return mode_; } Variable::Mode mode() const { return mode_; }
FunctionLiteral* fun() const { return fun_; } // may be NULL FunctionLiteral* fun() const { return fun_; } // may be NULL
private: private:
VariableProxy* proxy_; VariableProxy* proxy_;
...@@ -454,11 +454,11 @@ class ForStatement: public IterationStatement { ...@@ -454,11 +454,11 @@ class ForStatement: public IterationStatement {
virtual void Accept(AstVisitor* v); virtual void Accept(AstVisitor* v);
Statement* init() const { return init_; } Statement* init() const { return init_; }
void set_init(Statement* stmt) { init_ = stmt; } void set_init(Statement* stmt) { init_ = stmt; }
Expression* cond() const { return cond_; } Expression* cond() const { return cond_; }
void set_cond(Expression* expr) { cond_ = expr; } void set_cond(Expression* expr) { cond_ = expr; }
Statement* next() const { return next_; } Statement* next() const { return next_; }
void set_next(Statement* stmt) { next_ = stmt; } void set_next(Statement* stmt) { next_ = stmt; }
bool may_have_function_literal() const { bool may_have_function_literal() const {
...@@ -531,7 +531,7 @@ class ContinueStatement: public Statement { ...@@ -531,7 +531,7 @@ class ContinueStatement: public Statement {
virtual void Accept(AstVisitor* v); virtual void Accept(AstVisitor* v);
IterationStatement* target() const { return target_; } IterationStatement* target() const { return target_; }
private: private:
IterationStatement* target_; IterationStatement* target_;
...@@ -545,7 +545,7 @@ class BreakStatement: public Statement { ...@@ -545,7 +545,7 @@ class BreakStatement: public Statement {
virtual void Accept(AstVisitor* v); virtual void Accept(AstVisitor* v);
BreakableStatement* target() const { return target_; } BreakableStatement* target() const { return target_; }
private: private:
BreakableStatement* target_; BreakableStatement* target_;
...@@ -576,7 +576,7 @@ class WithEnterStatement: public Statement { ...@@ -576,7 +576,7 @@ class WithEnterStatement: public Statement {
virtual void Accept(AstVisitor* v); virtual void Accept(AstVisitor* v);
Expression* expression() const { return expression_; } Expression* expression() const { return expression_; }
bool is_catch_block() const { return is_catch_block_; } bool is_catch_block() const { return is_catch_block_; }
...@@ -598,13 +598,13 @@ class CaseClause: public ZoneObject { ...@@ -598,13 +598,13 @@ class CaseClause: public ZoneObject {
public: public:
CaseClause(Expression* label, ZoneList<Statement*>* statements); CaseClause(Expression* label, ZoneList<Statement*>* statements);
bool is_default() const { return label_ == NULL; } bool is_default() const { return label_ == NULL; }
Expression* label() const { Expression* label() const {
CHECK(!is_default()); CHECK(!is_default());
return label_; return label_;
} }
JumpTarget* body_target() { return &body_target_; } JumpTarget* body_target() { return &body_target_; }
ZoneList<Statement*>* statements() const { return statements_; } ZoneList<Statement*>* statements() const { return statements_; }
private: private:
Expression* label_; Expression* label_;
...@@ -624,8 +624,8 @@ class SwitchStatement: public BreakableStatement { ...@@ -624,8 +624,8 @@ class SwitchStatement: public BreakableStatement {
virtual void Accept(AstVisitor* v); virtual void Accept(AstVisitor* v);
Expression* tag() const { return tag_; } Expression* tag() const { return tag_; }
ZoneList<CaseClause*>* cases() const { return cases_; } ZoneList<CaseClause*>* cases() const { return cases_; }
private: private:
Expression* tag_; Expression* tag_;
...@@ -719,8 +719,8 @@ class TryCatchStatement: public TryStatement { ...@@ -719,8 +719,8 @@ class TryCatchStatement: public TryStatement {
virtual void Accept(AstVisitor* v); virtual void Accept(AstVisitor* v);
VariableProxy* catch_var() const { return catch_var_; } VariableProxy* catch_var() const { return catch_var_; }
Block* catch_block() const { return catch_block_; } Block* catch_block() const { return catch_block_; }
private: private:
VariableProxy* catch_var_; VariableProxy* catch_var_;
...@@ -987,10 +987,10 @@ class VariableProxy: public Expression { ...@@ -987,10 +987,10 @@ class VariableProxy: public Expression {
return (variable == NULL) ? false : variable->is_arguments(); return (variable == NULL) ? false : variable->is_arguments();
} }
Handle<String> name() const { return name_; } Handle<String> name() const { return name_; }
Variable* var() const { return var_; } Variable* var() const { return var_; }
bool is_this() const { return is_this_; } bool is_this() const { return is_this_; }
bool inside_with() const { return inside_with_; } bool inside_with() const { return inside_with_; }
void MarkAsTrivial() { is_trivial_ = true; } void MarkAsTrivial() { is_trivial_ = true; }
...@@ -1457,9 +1457,9 @@ class FunctionLiteral: public Expression { ...@@ -1457,9 +1457,9 @@ class FunctionLiteral: public Expression {
// Type testing & conversion // Type testing & conversion
virtual FunctionLiteral* AsFunctionLiteral() { return this; } virtual FunctionLiteral* AsFunctionLiteral() { return this; }
Handle<String> name() const { return name_; } Handle<String> name() const { return name_; }
Scope* scope() const { return scope_; } Scope* scope() const { return scope_; }
ZoneList<Statement*>* body() const { return body_; } ZoneList<Statement*>* body() const { return body_; }
void set_function_token_position(int pos) { function_token_position_ = pos; } void set_function_token_position(int pos) { function_token_position_ = pos; }
int function_token_position() const { return function_token_position_; } int function_token_position() const { return function_token_position_; }
int start_position() const { return start_position_; } int start_position() const { return start_position_; }
...@@ -1479,7 +1479,7 @@ class FunctionLiteral: public Expression { ...@@ -1479,7 +1479,7 @@ class FunctionLiteral: public Expression {
bool AllowsLazyCompilation(); bool AllowsLazyCompilation();
Handle<String> inferred_name() const { return inferred_name_; } Handle<String> inferred_name() const { return inferred_name_; }
void set_inferred_name(Handle<String> inferred_name) { void set_inferred_name(Handle<String> inferred_name) {
inferred_name_ = inferred_name; inferred_name_ = inferred_name;
} }
......
src/hashmap.h
View file @ 9c503a83
...@@ -83,12 +83,12 @@ class HashMap { ...@@ -83,12 +83,12 @@ class HashMap {
void Clear(); void Clear();
// The number of (non-empty) entries in the table. // The number of (non-empty) entries in the table.
uint32_t occupancy() const { return occupancy_; } uint32_t occupancy() const { return occupancy_; }
// The capacity of the table. The implementation // The capacity of the table. The implementation
// makes sure that occupancy is at most 80% of // makes sure that occupancy is at most 80% of
// the table capacity. // the table capacity.
uint32_t capacity() const { return capacity_; } uint32_t capacity() const { return capacity_; }
// Iteration // Iteration
// //
...@@ -108,7 +108,7 @@ class HashMap { ...@@ -108,7 +108,7 @@ class HashMap {
uint32_t capacity_; uint32_t capacity_;
uint32_t occupancy_; uint32_t occupancy_;
Entry* map_end() const { return map_ + capacity_; } Entry* map_end() const { return map_ + capacity_; }
Entry* Probe(void* key, uint32_t hash); Entry* Probe(void* key, uint32_t hash);
void Initialize(uint32_t capacity); void Initialize(uint32_t capacity);
void Resize(); void Resize();
......
src/ia32/assembler-ia32.h
View file @ 9c503a83
...@@ -64,15 +64,15 @@ namespace internal { ...@@ -64,15 +64,15 @@ namespace internal {
// and best performance in optimized code. // and best performance in optimized code.
// //
struct Register { struct Register {
bool is_valid() const { return 0 <= code_ && code_ < 8; } bool is_valid() const { return 0 <= code_ && code_ < 8; }
bool is(Register reg) const { return code_ == reg.code_; } bool is(Register reg) const { return code_ == reg.code_; }
// eax, ebx, ecx and edx are byte registers, the rest are not. // eax, ebx, ecx and edx are byte registers, the rest are not.
bool is_byte_register() const { return code_ <= 3; } bool is_byte_register() const { return code_ <= 3; }
int code() const { int code() const {
ASSERT(is_valid()); ASSERT(is_valid());
return code_; return code_;
} }
int bit() const { int bit() const {
ASSERT(is_valid()); ASSERT(is_valid());
return 1 << code_; return 1 << code_;
} }
...@@ -93,8 +93,8 @@ const Register no_reg = { -1 }; ...@@ -93,8 +93,8 @@ const Register no_reg = { -1 };
struct XMMRegister { struct XMMRegister {
bool is_valid() const { return 0 <= code_ && code_ < 8; } bool is_valid() const { return 0 <= code_ && code_ < 8; }
int code() const { int code() const {
ASSERT(is_valid()); ASSERT(is_valid());
return code_; return code_;
} }
...@@ -855,9 +855,9 @@ class Assembler : public Malloced { ...@@ -855,9 +855,9 @@ class Assembler : public Malloced {
// Used for inline tables, e.g., jump-tables. // Used for inline tables, e.g., jump-tables.
void dd(uint32_t data, RelocInfo::Mode reloc_info); void dd(uint32_t data, RelocInfo::Mode reloc_info);
int pc_offset() const { return pc_ - buffer_; } int pc_offset() const { return pc_ - buffer_; }
int current_statement_position() const { return current_statement_position_; } int current_statement_position() const { return current_statement_position_; }
int current_position() const { return current_position_; } int current_position() const { return current_position_; }
// Check if there is less than kGap bytes available in the buffer. // Check if there is less than kGap bytes available in the buffer.
// If this is the case, we need to grow the buffer before emitting // If this is the case, we need to grow the buffer before emitting
......
src/list.h
View file @ 9c503a83
...@@ -67,12 +67,12 @@ class List { ...@@ -67,12 +67,12 @@ class List {
// Returns a reference to the element at index i. This reference is // Returns a reference to the element at index i. This reference is
// not safe to use after operations that can change the list's // not safe to use after operations that can change the list's
// backing store (eg, Add). // backing store (eg, Add).
inline T& operator[](int i) const { inline T& operator[](int i) const {
ASSERT(0 <= i); ASSERT(0 <= i);
ASSERT(i < length_); ASSERT(i < length_);
return data_[i]; return data_[i];
} }
inline T& at(int i) const { return operator[](i); } inline T& at(int i) const { return operator[](i); }
inline T& last() const { return at(length_ - 1); } inline T& last() const { return at(length_ - 1); }
inline T& first() const { return at(0); } inline T& first() const { return at(0); }
......
src/mips/assembler-mips.h
View file @ 9c503a83
...@@ -73,13 +73,13 @@ namespace internal { ...@@ -73,13 +73,13 @@ namespace internal {
// Core register. // Core register.
struct Register { struct Register {
bool is_valid() const { return 0 <= code_ && code_ < kNumRegisters; } bool is_valid() const { return 0 <= code_ && code_ < kNumRegisters; }
bool is(Register reg) const { return code_ == reg.code_; } bool is(Register reg) const { return code_ == reg.code_; }
int code() const { int code() const {
ASSERT(is_valid()); ASSERT(is_valid());
return code_; return code_;
} }
int bit() const { int bit() const {
ASSERT(is_valid()); ASSERT(is_valid());
return 1 << code_; return 1 << code_;
} }
...@@ -129,13 +129,13 @@ Register ToRegister(int num); ...@@ -129,13 +129,13 @@ Register ToRegister(int num);
// Coprocessor register. // Coprocessor register.
struct FPURegister { struct FPURegister {
bool is_valid() const { return 0 <= code_ && code_ < kNumFPURegister ; } bool is_valid() const { return 0 <= code_ && code_ < kNumFPURegister ; }
bool is(FPURegister creg) const { return code_ == creg.code_; } bool is(FPURegister creg) const { return code_ == creg.code_; }
int code() const { int code() const {
ASSERT(is_valid()); ASSERT(is_valid());
return code_; return code_;
} }
int bit() const { int bit() const {
ASSERT(is_valid()); ASSERT(is_valid());
return 1 << code_; return 1 << code_;
} }
...@@ -665,4 +665,3 @@ class Assembler : public Malloced { ...@@ -665,4 +665,3 @@ class Assembler : public Malloced {
} } // namespace v8::internal } } // namespace v8::internal
#endif // V8_ARM_ASSEMBLER_MIPS_H_ #endif // V8_ARM_ASSEMBLER_MIPS_H_
src/mips/codegen-mips.h
View file @ 9c503a83
...@@ -240,10 +240,10 @@ class CodeGenerator: public AstVisitor { ...@@ -240,10 +240,10 @@ class CodeGenerator: public AstVisitor {
void ProcessDeferred(); void ProcessDeferred();
// State // State
bool has_cc() const { return cc_reg_ != cc_always; } bool has_cc() const { return cc_reg_ != cc_always; }
TypeofState typeof_state() const { return state_->typeof_state(); } TypeofState typeof_state() const { return state_->typeof_state(); }
JumpTarget* true_target() const { return state_->true_target(); } JumpTarget* true_target() const { return state_->true_target(); }
JumpTarget* false_target() const { return state_->false_target(); } JumpTarget* false_target() const { return state_->false_target(); }
// We don't track loop nesting level on mips yet. // We don't track loop nesting level on mips yet.
int loop_nesting() const { return 0; } int loop_nesting() const { return 0; }
...@@ -280,7 +280,7 @@ class CodeGenerator: public AstVisitor { ...@@ -280,7 +280,7 @@ class CodeGenerator: public AstVisitor {
MemOperand SlotOperand(Slot* slot, Register tmp); MemOperand SlotOperand(Slot* slot, Register tmp);
// Expressions // Expressions
MemOperand GlobalObject() const { MemOperand GlobalObject() const {
return ContextOperand(cp, Context::GLOBAL_INDEX); return ContextOperand(cp, Context::GLOBAL_INDEX);
} }
......
src/parser.cc
View file @ 9c503a83
...@@ -156,12 +156,12 @@ class Parser { ...@@ -156,12 +156,12 @@ class Parser {
ScriptDataImpl* pre_data_; ScriptDataImpl* pre_data_;
FuncNameInferrer* fni_; FuncNameInferrer* fni_;
bool inside_with() const { return with_nesting_level_ > 0; } bool inside_with() const { return with_nesting_level_ > 0; }
ParserFactory* factory() const { return factory_; } ParserFactory* factory() const { return factory_; }
ParserLog* log() const { return log_; } ParserLog* log() const { return log_; }
Scanner& scanner() { return scanner_; } Scanner& scanner() { return scanner_; }
Mode mode() const { return mode_; } Mode mode() const { return mode_; }
ScriptDataImpl* pre_data() const { return pre_data_; } ScriptDataImpl* pre_data() const { return pre_data_; }
// All ParseXXX functions take as the last argument an *ok parameter // All ParseXXX functions take as the last argument an *ok parameter
// which is set to false if parsing failed; it is unchanged otherwise. // which is set to false if parsing failed; it is unchanged otherwise.
......
src/rewriter.cc
View file @ 9c503a83
...@@ -692,7 +692,7 @@ class Processor: public AstVisitor { ...@@ -692,7 +692,7 @@ class Processor: public AstVisitor {
} }
void Process(ZoneList<Statement*>* statements); void Process(ZoneList<Statement*>* statements);
bool result_assigned() const { return result_assigned_; } bool result_assigned() const { return result_assigned_; }
private: private:
VariableProxy* result_; VariableProxy* result_;
......
src/scanner.h
View file @ 9c503a83
...@@ -297,7 +297,7 @@ class Scanner { ...@@ -297,7 +297,7 @@ class Scanner {
Token::Value Next(); Token::Value Next();
// One token look-ahead (past the token returned by Next()). // One token look-ahead (past the token returned by Next()).
Token::Value peek() const { return next_.token; } Token::Value peek() const { return next_.token; }
// Returns true if there was a line terminator before the peek'ed token. // Returns true if there was a line terminator before the peek'ed token.
bool has_line_terminator_before_next() const { bool has_line_terminator_before_next() const {
...@@ -313,8 +313,8 @@ class Scanner { ...@@ -313,8 +313,8 @@ class Scanner {
// Returns the location information for the current token // Returns the location information for the current token
// (the token returned by Next()). // (the token returned by Next()).
Location location() const { return current_.location; } Location location() const { return current_.location; }
Location peek_location() const { return next_.location; } Location peek_location() const { return next_.location; }
// Returns the literal string, if any, for the current token (the // Returns the literal string, if any, for the current token (the
// token returned by Next()). The string is 0-terminated and in // token returned by Next()). The string is 0-terminated and in
......
src/scopeinfo.h
View file @ 9c503a83
...@@ -63,13 +63,13 @@ class ScopeInfo BASE_EMBEDDED { ...@@ -63,13 +63,13 @@ class ScopeInfo BASE_EMBEDDED {
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
// Lookup // Lookup
Handle<String> function_name() const { return function_name_; } Handle<String> function_name() const { return function_name_; }
Handle<String> parameter_name(int i) const { return parameters_[i]; } Handle<String> parameter_name(int i) const { return parameters_[i]; }
int number_of_parameters() const { return parameters_.length(); } int number_of_parameters() const { return parameters_.length(); }
Handle<String> stack_slot_name(int i) const { return stack_slots_[i]; } Handle<String> stack_slot_name(int i) const { return stack_slots_[i]; }
int number_of_stack_slots() const { return stack_slots_.length(); } int number_of_stack_slots() const { return stack_slots_.length(); }
Handle<String> context_slot_name(int i) const { Handle<String> context_slot_name(int i) const {
return context_slots_[i - Context::MIN_CONTEXT_SLOTS]; return context_slots_[i - Context::MIN_CONTEXT_SLOTS];
......
src/scopes.h
View file @ 9c503a83
...@@ -187,21 +187,21 @@ class Scope: public ZoneObject { ...@@ -187,21 +187,21 @@ class Scope: public ZoneObject {
// Predicates. // Predicates.
// Specific scope types. // Specific scope types.
bool is_eval_scope() const { return type_ == EVAL_SCOPE; } bool is_eval_scope() const { return type_ == EVAL_SCOPE; }
bool is_function_scope() const { return type_ == FUNCTION_SCOPE; } bool is_function_scope() const { return type_ == FUNCTION_SCOPE; }
bool is_global_scope() const { return type_ == GLOBAL_SCOPE; } bool is_global_scope() const { return type_ == GLOBAL_SCOPE; }
// Information about which scopes calls eval. // Information about which scopes calls eval.
bool calls_eval() const { return scope_calls_eval_; } bool calls_eval() const { return scope_calls_eval_; }
bool outer_scope_calls_eval() const { return outer_scope_calls_eval_; } bool outer_scope_calls_eval() const { return outer_scope_calls_eval_; }
// Is this scope inside a with statement. // Is this scope inside a with statement.
bool inside_with() const { return scope_inside_with_; } bool inside_with() const { return scope_inside_with_; }
// Does this scope contain a with statement. // Does this scope contain a with statement.
bool contains_with() const { return scope_contains_with_; } bool contains_with() const { return scope_contains_with_; }
// The scope immediately surrounding this scope, or NULL. // The scope immediately surrounding this scope, or NULL.
Scope* outer_scope() const { return outer_scope_; } Scope* outer_scope() const { return outer_scope_; }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// Accessors. // Accessors.
...@@ -217,27 +217,27 @@ class Scope: public ZoneObject { ...@@ -217,27 +217,27 @@ class Scope: public ZoneObject {
// The variable holding the function literal for named function // The variable holding the function literal for named function
// literals, or NULL. // literals, or NULL.
// Only valid for function scopes. // Only valid for function scopes.
Variable* function() const { Variable* function() const {
ASSERT(is_function_scope()); ASSERT(is_function_scope());
return function_; return function_;
} }
// Parameters. The left-most parameter has index 0. // Parameters. The left-most parameter has index 0.
// Only valid for function scopes. // Only valid for function scopes.
Variable* parameter(int index) const { Variable* parameter(int index) const {
ASSERT(is_function_scope()); ASSERT(is_function_scope());
return params_[index]; return params_[index];
} }
int num_parameters() const { return params_.length(); } int num_parameters() const { return params_.length(); }
// The local variable 'arguments' if we need to allocate it; NULL otherwise. // The local variable 'arguments' if we need to allocate it; NULL otherwise.
// If arguments() exist, arguments_shadow() exists, too. // If arguments() exist, arguments_shadow() exists, too.
Variable* arguments() const { return arguments_; } Variable* arguments() const { return arguments_; }
// The '.arguments' shadow variable if we need to allocate it; NULL otherwise. // The '.arguments' shadow variable if we need to allocate it; NULL otherwise.
// If arguments_shadow() exist, arguments() exists, too. // If arguments_shadow() exist, arguments() exists, too.
Variable* arguments_shadow() const { return arguments_shadow_; } Variable* arguments_shadow() const { return arguments_shadow_; }
// Declarations list. // Declarations list.
ZoneList<Declaration*>* declarations() { return &decls_; } ZoneList<Declaration*>* declarations() { return &decls_; }
...@@ -262,8 +262,8 @@ class Scope: public ZoneObject { ...@@ -262,8 +262,8 @@ class Scope: public ZoneObject {
void AllocateVariables(Handle<Context> context); void AllocateVariables(Handle<Context> context);
// Result of variable allocation. // Result of variable allocation.
int num_stack_slots() const { return num_stack_slots_; } int num_stack_slots() const { return num_stack_slots_; }
int num_heap_slots() const { return num_heap_slots_; } int num_heap_slots() const { return num_heap_slots_; }
// Make sure this scope and all outer scopes are eagerly compiled. // Make sure this scope and all outer scopes are eagerly compiled.
void ForceEagerCompilation() { force_eager_compilation_ = true; } void ForceEagerCompilation() { force_eager_compilation_ = true; }
......
src/variables.h
View file @ 9c503a83
...@@ -131,11 +131,11 @@ class Variable: public ZoneObject { ...@@ -131,11 +131,11 @@ class Variable: public ZoneObject {
// in an outer scope about which we don't know anything (it may not // in an outer scope about which we don't know anything (it may not
// be the global scope). scope() is NULL in that case. Currently the // be the global scope). scope() is NULL in that case. Currently the
// scope is only used to follow the context chain length. // scope is only used to follow the context chain length.
Scope* scope() const { return scope_; } Scope* scope() const { return scope_; }
Handle<String> name() const { return name_; } Handle<String> name() const { return name_; }
Mode mode() const { return mode_; } Mode mode() const { return mode_; }
bool is_accessed_from_inner_scope() const { bool is_accessed_from_inner_scope() const {
return is_accessed_from_inner_scope_; return is_accessed_from_inner_scope_;
} }
bool is_used() { return is_used_; } bool is_used() { return is_used_; }
...@@ -172,7 +172,7 @@ class Variable: public ZoneObject { ...@@ -172,7 +172,7 @@ class Variable: public ZoneObject {
local_if_not_shadowed_ = local; local_if_not_shadowed_ = local;
} }
Expression* rewrite() const { return rewrite_; } Expression* rewrite() const { return rewrite_; }
StaticType* type() { return &type_; } StaticType* type() { return &type_; }
......
src/x64/assembler-x64.h
View file @ 9c503a83
...@@ -92,13 +92,13 @@ struct Register { ...@@ -92,13 +92,13 @@ struct Register {
Register r = { code }; Register r = { code };
return r; return r;
} }
bool is_valid() const { return 0 <= code_ && code_ < 16; } bool is_valid() const { return 0 <= code_ && code_ < 16; }
bool is(Register reg) const { return code_ == reg.code_; } bool is(Register reg) const { return code_ == reg.code_; }
int code() const { int code() const {
ASSERT(is_valid()); ASSERT(is_valid());
return code_; return code_;
} }
int bit() const { int bit() const {
return 1 << code_; return 1 << code_;
} }
...@@ -138,8 +138,8 @@ const Register no_reg = { -1 }; ...@@ -138,8 +138,8 @@ const Register no_reg = { -1 };
struct XMMRegister { struct XMMRegister {
bool is_valid() const { return 0 <= code_ && code_ < 16; } bool is_valid() const { return 0 <= code_ && code_ < 16; }
int code() const { int code() const {
ASSERT(is_valid()); ASSERT(is_valid());
return code_; return code_;
} }
...@@ -1178,9 +1178,9 @@ class Assembler : public Malloced { ...@@ -1178,9 +1178,9 @@ class Assembler : public Malloced {
void RecordStatementPosition(int pos); void RecordStatementPosition(int pos);
bool WriteRecordedPositions(); bool WriteRecordedPositions();
int pc_offset() const { return static_cast<int>(pc_ - buffer_); } int pc_offset() const { return static_cast<int>(pc_ - buffer_); }
int current_statement_position() const { return current_statement_position_; } int current_statement_position() const { return current_statement_position_; }
int current_position() const { return current_position_; } int current_position() const { return current_position_; }
// Check if there is less than kGap bytes available in the buffer. // Check if there is less than kGap bytes available in the buffer.
// If this is the case, we need to grow the buffer before emitting // If this is the case, we need to grow the buffer before emitting
......
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