diff options
Diffstat (limited to 'chromium/v8/src/variables.cc')
-rw-r--r-- | chromium/v8/src/variables.cc | 43 |
1 files changed, 10 insertions, 33 deletions
diff --git a/chromium/v8/src/variables.cc b/chromium/v8/src/variables.cc index 488da42ce66..906b6ab7d58 100644 --- a/chromium/v8/src/variables.cc +++ b/chromium/v8/src/variables.cc @@ -1,35 +1,12 @@ // 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: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. -#include "v8.h" +#include "src/v8.h" -#include "ast.h" -#include "scopes.h" -#include "variables.h" +#include "src/ast.h" +#include "src/scopes.h" +#include "src/variables.h" namespace v8 { namespace internal { @@ -40,9 +17,9 @@ namespace internal { const char* Variable::Mode2String(VariableMode mode) { switch (mode) { case VAR: return "VAR"; - case CONST: return "CONST"; + case CONST_LEGACY: return "CONST_LEGACY"; case LET: return "LET"; - case CONST_HARMONY: return "CONST_HARMONY"; + case CONST: return "CONST"; case MODULE: return "MODULE"; case DYNAMIC: return "DYNAMIC"; case DYNAMIC_GLOBAL: return "DYNAMIC_GLOBAL"; @@ -58,7 +35,7 @@ const char* Variable::Mode2String(VariableMode mode) { Variable::Variable(Scope* scope, Handle<String> name, VariableMode mode, - bool is_valid_LHS, + bool is_valid_ref, Kind kind, InitializationFlag initialization_flag, Interface* interface) @@ -70,7 +47,7 @@ Variable::Variable(Scope* scope, index_(-1), initializer_position_(RelocInfo::kNoPosition), local_if_not_shadowed_(NULL), - is_valid_LHS_(is_valid_LHS), + is_valid_ref_(is_valid_ref), force_context_allocation_(false), is_used_(false), initialization_flag_(initialization_flag), |