Bug 1438278 - Part 1: Rename json.* -> builtin/JSON.*. r=jandem.

--HG--
rename : js/src/json.cpp => js/src/builtin/JSON.cpp
rename : js/src/json.h => js/src/builtin/JSON.h
extra : rebase_source : 1fc30184bc2b920b04fd395e301d999b1b690297
extra : amend_source : 578a7f74cf073f584ede82ed37cb70ecb1f3aacc

js/src/builtin/JSON.cpp

@@ -4,7 +4,7 @@
  * 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/. */
 
-#include "json.h"
+#include "builtin/JSON.h"
 
 #include "mozilla/FloatingPoint.h"
 #include "mozilla/Range.h"

js/src/builtin/JSON.h

@@ -4,8 +4,8 @@
  * 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 json_h
-#define json_h
+#ifndef builtin_JSON_h
+#define builtin_JSON_h
 
 #include "mozilla/Range.h"
 
@@ -40,4 +40,4 @@ ParseJSONWithReviver(JSContext* cx, const mozilla::Range<const CharT> chars,
 
 } // namespace js
 
-#endif /* json_h */
+#endif /* builtin_JSON_h */

js/src/jsapi.cpp

@@ -31,7 +31,6 @@
 #include "jsiter.h"
 #include "jsmath.h"
 #include "jsnum.h"
-#include "json.h"
 #include "jsprf.h"
 #include "jsstr.h"
 #include "jstypes.h"
@@ -41,6 +40,7 @@
 
 #include "builtin/AtomicsObject.h"
 #include "builtin/Eval.h"
+#include "builtin/JSON.h"
 #include "builtin/MapObject.h"
 #include "builtin/Promise.h"
 #include "builtin/RegExp.h"

js/src/moz.build

@@ -32,7 +32,7 @@ for gcfile in ['jsgc*', 'devtools/rootAnalysis', 'devtools/gc-ubench', 'devtools
     with Files(gcfile):
         BUG_COMPONENT = component_gc
 
-for stlfile in ['jsarray.*', 'jsbool*', 'jsdate.*', 'jsnum.*', 'json.*', 'jsstr.*']:
+for stlfile in ['jsarray.*', 'jsbool*', 'jsdate.*', 'jsnum.*', 'jsstr.*']:
     with Files(stlfile):
         BUG_COMPONENT = component_stl
 
@@ -165,6 +165,7 @@ UNIFIED_SOURCES += [
     'builtin/intl/PluralRules.cpp',
     'builtin/intl/RelativeTimeFormat.cpp',
     'builtin/intl/SharedIntlData.cpp',
+    'builtin/JSON.cpp',
     'builtin/MapObject.cpp',
     'builtin/ModuleObject.cpp',
     'builtin/Object.cpp',
@@ -298,7 +299,6 @@ UNIFIED_SOURCES += [
     'jsiter.cpp',
     'jsnativestack.cpp',
     'jsnum.cpp',
-    'json.cpp',
     'jsopcode.cpp',
     'jsprf.cpp',
     'jsstr.cpp',

js/src/vm/GlobalObject.cpp

@@ -10,12 +10,12 @@
 #include "jsexn.h"
 #include "jsfriendapi.h"
 #include "jsmath.h"
-#include "json.h"
 #include "jsprototypes.h"
 
 #include "builtin/AtomicsObject.h"
 #include "builtin/DataViewObject.h"
 #include "builtin/Eval.h"
+#include "builtin/JSON.h"
 #include "builtin/MapObject.h"
 #include "builtin/ModuleObject.h"
 #include "builtin/Object.h"