Changeset 47262 in webkit for trunk/JavaScriptCore

Timestamp:

Aug 13, 2009, 5:56:42 PM (16 years ago)

Author:

Darin Adler

Message:

Another part of ​https://bugs.webkit.org/show_bug.cgi?id=28287

Patch by Darin Adler <Darin Adler> on 2009-08-13
Reviewed by George Staikos.

• parser/Grammar.y: Reduced and sorted includes. Tweaked comment

format. Marked a few more functions inline.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• parser/Grammar.y (modified) (7 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-08-13  Darin Adler  <[email protected]>
+
+        Reviewed by George Staikos.
+
+        Another part of https://bugs.webkit.org/show_bug.cgi?id=28287
+
+        * parser/Grammar.y: Reduced and sorted includes. Tweaked comment
+        format. Marked a few more functions inline.
+
 2009-08-13  Darin Adler  <[email protected]>
 

trunk/JavaScriptCore/parser/Grammar.y

@@ -26 +26 @@
 #include "config.h"
 
+#include "JSObject.h"
+#include "JSString.h"
+#include "NodeConstructors.h"
+#include "NodeInfo.h"
+#include <stdlib.h>
 #include <string.h>
-#include <stdlib.h>
-#include "JSValue.h"
-#include "JSObject.h"
-#include "NodeConstructors.h"
-#include "Lexer.h"
-#include "JSString.h"
-#include "JSGlobalData.h"
-#include "CommonIdentifiers.h"
-#include "NodeInfo.h"
-#include "Parser.h"
-#include <wtf/FastMalloc.h>
 #include <wtf/MathExtras.h>
 
@@ -46 +40 @@
 #define YYENABLE_NLS 0
 
-/* default values for bison */
+// Default values for bison.
 #define YYDEBUG 0 // Set to 1 to debug a parse error.
 #define jscyydebug 0 // Set to 1 to debug a parse error.
 #if !PLATFORM(DARWIN)
-    // avoid triggering warnings in older bison
+// Avoid triggering warnings in older bison by not setting this on the Darwin platform.
+// FIXME: Is this still needed?
 #define YYERROR_VERBOSE
 #endif
@@ -56 +51 @@
 int jscyylex(void* lvalp, void* llocp, void* globalPtr);
 int jscyyerror(const char*);
+
 static inline bool allowAutomaticSemicolon(JSC::Lexer&, int);
 
 #define GLOBAL_DATA static_cast<JSGlobalData*>(globalPtr)
-
 #define AUTO_SEMICOLON do { if (!allowAutomaticSemicolon(*GLOBAL_DATA->lexer, yychar)) YYABORT; } while (0)
 
@@ -95 +90 @@
 #define YYLEX_PARAM globalPtr
 
-template <typename T> NodeDeclarationInfo<T> createNodeDeclarationInfo(T node, ParserArenaData<DeclarationStacks::VarStack>* varDecls, 
-                                                                       ParserArenaData<DeclarationStacks::FunctionStack>* funcDecls,
-                                                                       CodeFeatures info,
-                                                                       int numConstants) 
+template <typename T> inline NodeDeclarationInfo<T> createNodeDeclarationInfo(T node,
+    ParserArenaData<DeclarationStacks::VarStack>* varDecls,
+    ParserArenaData<DeclarationStacks::FunctionStack>* funcDecls,
+    CodeFeatures info, int numConstants) 
 {
     ASSERT((info & ~AllFeatures) == 0);
@@ -105 +100 @@
 }
 
-template <typename T> NodeInfo<T> createNodeInfo(T node, CodeFeatures info, int numConstants)
+template <typename T> inline NodeInfo<T> createNodeInfo(T node, CodeFeatures info, int numConstants)
 {
     ASSERT((info & ~AllFeatures) == 0);
@@ -2073 +2068 @@
 }
 
-/* called by yyparse on error */
+// Called by yyparse on error.
 int yyerror(const char *)
 {
@@ -2079 +2074 @@
 }
 
-/* may we automatically insert a semicolon ? */
+// May we automatically insert a semicolon?
 static bool allowAutomaticSemicolon(Lexer& lexer, int yychar)
 {