Bug 888088 (part 3) - Fix #include ordering in js/src/frontend/. r=nnethercote.

--HG--
extra : rebase_source : eb87ec3ceb04ab5045a086a773e611f733847723

js/src/ds/InlineMap.h

@@ -7,6 +7,8 @@
 #ifndef ds_InlineMap_h
 #define ds_InlineMap_h
 
+#include "jsalloc.h"
+
 #include "js/HashTable.h"
 
 namespace js {

js/src/frontend/BytecodeCompiler.cpp

@@ -7,6 +7,7 @@
 #include "frontend/BytecodeCompiler.h"
 
 #include "jsscript.h"
+
 #include "frontend/BytecodeEmitter.h"
 #include "frontend/FoldConstants.h"
 #include "frontend/NameFunctions.h"

js/src/frontend/BytecodeEmitter.cpp

@@ -16,8 +16,6 @@
 
 #include <string.h>
 
-#include "jstypes.h"
-#include "jsutil.h"
 #include "jsapi.h"
 #include "jsatom.h"
 #include "jscntxt.h"
@@ -25,6 +23,8 @@
 #include "jsnum.h"
 #include "jsopcode.h"
 #include "jsscript.h"
+#include "jstypes.h"
+#include "jsutil.h"
 
 #include "frontend/Parser.h"
 #include "frontend/TokenStream.h"

js/src/frontend/BytecodeEmitter.h

@@ -10,15 +10,15 @@
 /*
  * JS bytecode generation.
  */
+
 #include "jsatom.h"
 #include "jsopcode.h"
-#include "jsscript.h"
 #include "jspubtd.h"
+#include "jsscript.h"
 
 #include "frontend/ParseMaps.h"
 #include "frontend/SharedContext.h"
 #include "frontend/SourceNotes.h"
-
 #include "vm/ScopeObject.h"
 
 namespace js {

js/src/frontend/NameFunctions.cpp

@@ -12,11 +12,10 @@
 #include "frontend/BytecodeCompiler.h"
 #include "frontend/ParseNode.h"
 #include "frontend/SharedContext.h"
+#include "vm/StringBuffer.h"
 
 #include "jsfuninlines.h"
 
-#include "vm/StringBuffer.h"
-
 using namespace js;
 using namespace js::frontend;
 

js/src/frontend/ParseMaps-inl.h

@@ -7,10 +7,10 @@
 #ifndef frontend_ParseMaps_inl_h
 #define frontend_ParseMaps_inl_h
 
-#include "jscntxt.h"
-
 #include "frontend/ParseMaps.h"
 
+#include "jscntxtinlines.h"
+
 namespace js {
 namespace frontend {
 

js/src/frontend/ParseMaps.cpp

@@ -4,7 +4,10 @@
  * 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 "frontend/ParseMaps-inl.h"
+
 #include "jscntxt.h"
+
 #include "frontend/FullParseHandler.h"
 #include "frontend/SyntaxParseHandler.h"
 

js/src/frontend/ParseMaps.h

@@ -10,7 +10,10 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/TypeTraits.h"
 
+#include "jsprvtd.h"
+
 #include "ds/InlineMap.h"
+#include "gc/Barrier.h"
 #include "js/HashTable.h"
 #include "js/Vector.h"
 

js/src/frontend/ParseNode-inl.h

@@ -8,6 +8,7 @@
 #define frontend_ParseNode_inl_h
 
 #include "frontend/ParseNode.h"
+
 #include "frontend/SharedContext.h"
 
 namespace js {

js/src/frontend/ParseNode.cpp

@@ -4,8 +4,9 @@
  * 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 "frontend/ParseNode-inl.h"
+
 #include "builtin/Module.h"
-#include "frontend/ParseNode.h"
 #include "frontend/Parser.h"
 
 #include "jscntxtinlines.h"

js/src/frontend/ParseNode.h

@@ -10,6 +10,7 @@
 #include "mozilla/Attributes.h"
 
 #include "jsscript.h"
+
 #include "builtin/Module.h"
 #include "frontend/TokenStream.h"
 

js/src/frontend/Parser.cpp

@@ -19,20 +19,21 @@
 
 #include "frontend/Parser.h"
 
-#include "jstypes.h"
 #include "jsapi.h"
 #include "jsatom.h"
 #include "jscntxt.h"
-#include "jsversion.h"
 #include "jsfun.h"
 #include "jsobj.h"
 #include "jsopcode.h"
 #include "jsscript.h"
+#include "jstypes.h"
+#include "jsversion.h"
 
 #include "frontend/BytecodeCompiler.h"
 #include "frontend/FoldConstants.h"
 #include "frontend/ParseMaps.h"
 #include "frontend/TokenStream.h"
+#include "vm/NumericConversions.h"
 #include "vm/RegExpStatics.h"
 #include "vm/Shape.h"
 
@@ -44,8 +45,6 @@
 #include "frontend/ParseMaps-inl.h"
 #include "frontend/ParseNode-inl.h"
 
-#include "vm/NumericConversions.h"
-
 using namespace js;
 using namespace js::gc;
 using mozilla::Maybe;

js/src/frontend/Parser.h

@@ -10,6 +10,7 @@
 /*
  * JS parser definitions.
  */
+
 #include "jsprvtd.h"
 #include "jspubtd.h"
 

js/src/frontend/SharedContext.h

@@ -7,12 +7,12 @@
 #ifndef frontend_SharedContext_h
 #define frontend_SharedContext_h
 
-#include "jstypes.h"
 #include "jsatom.h"
 #include "jsopcode.h"
-#include "jsscript.h"
 #include "jsprvtd.h"
 #include "jspubtd.h"
+#include "jsscript.h"
+#include "jstypes.h"
 
 #include "builtin/Module.h"
 #include "frontend/ParseMaps.h"

js/src/frontend/TokenStream.cpp

@@ -12,8 +12,8 @@
 
 #include "mozilla/PodOperations.h"
 
-#include <stdio.h>
 #include <stdarg.h>
+#include <stdio.h>
 #include <string.h>
 
 #include "jsapi.h"

js/src/frontend/TokenStream.h

@@ -14,14 +14,15 @@
 #include "mozilla/DebugOnly.h"
 #include "mozilla/PodOperations.h"
 
+#include <stdarg.h>
 #include <stddef.h>
 #include <stdio.h>
-#include <stdarg.h>
+
 #include "jscntxt.h"
-#include "jsversion.h"
 #include "jsopcode.h"
 #include "jsprvtd.h"
 #include "jspubtd.h"
+#include "jsversion.h"
 
 #include "js/Vector.h"