Bug 837773 - Move js/src/jsval.h to js/public/Value.h. r=jorendorff
authorJeff Walden <jwalden@mit.edu>
Fri, 01 Feb 2013 14:24:37 -0800
changeset 120964 dff079686e0bc98784a55b760474e1399856c325
parent 120963 fbc1e196ca875a55b80e75610c5f51009ae7b129
child 120965 7f1ecab23f6f67254c5fb9ea5c1c0384cbeedaf4
push id24269
push useremorley@mozilla.com
push dateWed, 06 Feb 2013 14:27:17 +0000
treeherdermozilla-central@04e13fc9dbff [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjorendorff
bugs837773
milestone21.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 837773 - Move js/src/jsval.h to js/public/Value.h. r=jorendorff
js/public/Value.h
js/src/Makefile.in
js/src/ion/IonCompartment.h
js/src/jsapi-tests/testIntTypesABI.cpp
js/src/jsapi.h
js/src/jsreflect.cpp
js/src/jsval.h
js/src/methodjit/PunboxAssembler.h
js/src/vm/ObjectImpl.h
rename from js/src/jsval.h
rename to js/public/Value.h
--- a/js/src/jsval.h
+++ b/js/public/Value.h
@@ -1,21 +1,19 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=4 sw=4 et tw=99 ft=cpp:
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef jsvalimpl_h__
-#define jsvalimpl_h__
+/* JS::Value implementation. */
 
-/*
- * Implementation details for js::Value in jsapi.h.
- */
+#ifndef js_Value_h___
+#define js_Value_h___
 
 #include "js/Utility.h"
 
 /*
  * Try to get jsvals 64-bit aligned. We could almost assert that all values are
  * aligned, but MSVC and GCC occasionally break alignment.
  */
 #if defined(__GNUC__) || defined(__xlc__) || defined(__xlC__)
@@ -833,9 +831,9 @@ JS_CANONICALIZE_NAN(double d)
     return d;
 }
 
 #ifdef __cplusplus
 static jsval_layout JSVAL_TO_IMPL(JS::Value);
 static JS::Value IMPL_TO_JSVAL(jsval_layout);
 #endif
 
-#endif /* jsvalimpl_h__ */
+#endif /* js_Value_h___ */
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -185,17 +185,16 @@ INSTALLED_HEADERS = \
 		jsprf.h \
 		jsprototypes.h \
 		jsprvtd.h \
 		jspubtd.h \
 		jstypes.h \
 		jsutil.h \
 		jsversion.h \
 		jswrapper.h \
-		jsval.h \
 		$(NULL)
 
 ######################################################
 # BEGIN exported headers that are only exported
 #       because of inclusion by an INSTALLED_HEADER
 #
 EXPORTS_NAMESPACES += ds gc
 
@@ -227,16 +226,17 @@ EXPORTS_js = \
 		CharacterEncoding.h \
 		HashTable.h \
 		HeapAPI.h \
 		GCAPI.h \
 		LegacyIntTypes.h \
 		MemoryMetrics.h \
 		TemplateLib.h \
 		Utility.h \
+		Value.h \
 		Vector.h \
 		$(NULL)
 
 ###############################################
 # BEGIN enable non-releasable features
 #
 ifeq (,$(filter beta release esr,$(MOZ_UPDATE_CHANNEL)))
 DEFINES += -DENABLE_TYPEDARRAY_MOVE
--- a/js/src/ion/IonCompartment.h
+++ b/js/src/ion/IonCompartment.h
@@ -4,18 +4,18 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef jsion_ion_compartment_h__
 #define jsion_ion_compartment_h__
 
 #include "IonCode.h"
-#include "jsval.h"
 #include "jsweakcache.h"
+#include "js/Value.h"
 #include "vm/Stack.h"
 #include "IonFrames.h"
 
 namespace js {
 namespace ion {
 
 class FrameSizeClass;
 
--- a/js/src/jsapi-tests/testIntTypesABI.cpp
+++ b/js/src/jsapi-tests/testIntTypesABI.cpp
@@ -11,23 +11,23 @@
  * even the ones tests.h itself included, to verify this.
  */
 #include "js-config.h"
 #include "jsapi.h"
 #include "jsclass.h"
 #include "jscpucfg.h"
 #include "jspubtd.h"
 #include "jstypes.h"
-#include "jsval.h"
 
 #include "js/HashTable.h"
 #include "js/HeapAPI.h"
 #include "js/MemoryMetrics.h"
 #include "js/TemplateLib.h"
 #include "js/Utility.h"
+#include "js/Value.h"
 #include "js/Vector.h"
 
 /*
  * Verify that our public (and intended to be public, versus being that way
  * because we haven't made them private yet) headers don't define
  * {u,}int{8,16,32,64} or JS{Ui,I}nt{8,16,32,64} types.  If any do, they will
  * assuredly conflict with a corresponding typedef below mapping to a *struct*.
  *
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -1,42 +1,41 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sw=4 et tw=78:
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+/* JavaScript API. */
+
 #ifndef jsapi_h___
 #define jsapi_h___
-/*
- * JavaScript API.
- */
 
 #include "mozilla/Attributes.h"
 #include "mozilla/FloatingPoint.h"
 #include "mozilla/GuardObjects.h"
 #include "mozilla/RangedPtr.h"
 #include "mozilla/StandardInteger.h"
 #include "mozilla/ThreadLocal.h"
 
 #include <limits> /* for std::numeric_limits */
 #include <stddef.h>
 #include <stdio.h>
 
 #include "js-config.h"
 #include "jsalloc.h"
 #include "jspubtd.h"
 #include "jsutil.h"
-#include "jsval.h"
 
 #include "gc/Root.h"
 #include "js/CharacterEncoding.h"
 #include "js/HashTable.h"
 #include "js/Utility.h"
+#include "js/Value.h"
 #include "js/Vector.h"
 
 /************************************************************************/
 
 /* JS::Value can store a full int32_t. */
 #define JSVAL_INT_BITS          32
 #define JSVAL_INT_MIN           ((int32_t)0x80000000)
 #define JSVAL_INT_MAX           ((int32_t)0x7fffffff)
--- a/js/src/jsreflect.cpp
+++ b/js/src/jsreflect.cpp
@@ -14,17 +14,16 @@
 
 #include "jspubtd.h"
 #include "jsatom.h"
 #include "jsobj.h"
 #include "jsreflect.h"
 #include "jsprf.h"
 #include "jsiter.h"
 #include "jsbool.h"
-#include "jsval.h"
 #include "jsinferinlines.h"
 #include "jsobjinlines.h"
 #include "jsarray.h"
 #include "jsnum.h"
 
 #include "frontend/Parser.h"
 #include "frontend/TokenStream.h"
 #include "js/CharacterEncoding.h"
--- a/js/src/methodjit/PunboxAssembler.h
+++ b/js/src/methodjit/PunboxAssembler.h
@@ -4,19 +4,19 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #if !defined jsjaeger_assembler64_h__ && defined JS_METHODJIT && defined JS_PUNBOX64
 #define jsjaeger_assembler64_h__
 
 #include "assembler/assembler/MacroAssembler.h"
+#include "js/Value.h"
 #include "methodjit/MachineRegs.h"
 #include "methodjit/RematInfo.h"
-#include "jsval.h"
 
 namespace js {
 namespace mjit {
 
 struct Imm64 : JSC::MacroAssembler::ImmPtr
 {
     Imm64(uint64_t u)
       : ImmPtr((const void *)u)
--- a/js/src/vm/ObjectImpl.h
+++ b/js/src/vm/ObjectImpl.h
@@ -9,20 +9,20 @@
 #define ObjectImpl_h___
 
 #include "mozilla/Assertions.h"
 #include "mozilla/GuardObjects.h"
 #include "mozilla/StandardInteger.h"
 
 #include "jsfriendapi.h"
 #include "jsinfer.h"
-#include "jsval.h"
 
 #include "gc/Barrier.h"
 #include "gc/Heap.h"
+#include "js/Value.h"
 #include "vm/NumericConversions.h"
 #include "vm/String.h"
 
 namespace js {
 
 class Debugger;
 class ObjectImpl;
 ForwardDeclare(Shape);