Changeset 28859 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Dec 19, 2007, 1:10:16 AM (17 years ago)

Author:

[email protected]

Message:

Build fix for non-Mac platforms. Move NodeInfo into its own header so that the YYTYPE declaration in grammar.h is able to declare members of that type.

Location:

trunk/JavaScriptCore/kjs

Files:

• NodeInfo.h (added)
• grammar.y (modified) (3 diffs)
• lexer.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/grammar.y

@@ -33 +33 @@
 #include "internal.h"
 #include "CommonIdentifiers.h"
+#include "NodeInfo.h"
 #include "Parser.h"
 #include <wtf/MathExtras.h>
@@ -85 +86 @@
 #endif
 
-template <typename T> struct NodeInfo {
-    T m_node;
-    ParserRefCountedData<DeclarationStacks::VarStack>* m_varDeclarations;
-    ParserRefCountedData<DeclarationStacks::FunctionStack>* m_funcDeclarations;
-};
-
 template <typename T> NodeInfo<T> createNodeInfo(T node, ParserRefCountedData<DeclarationStacks::VarStack>* varDecls, 
                                                  ParserRefCountedData<DeclarationStacks::FunctionStack>* funcDecls) 
@@ -124 +119 @@
 }
 
-typedef NodeInfo<StatementNode*> StatementNodeInfo;
-typedef NodeInfo<CaseBlockNode*> CaseBlockNodeInfo;
-typedef NodeInfo<CaseClauseNode*> CaseClauseNodeInfo;
-typedef NodeInfo<SourceElementsStub*> SourceElementsInfo;
-typedef NodeInfo<ClauseList> ClauseListInfo;
-typedef NodeInfo<VarDeclList> VarDeclListInfo;
 %}
 

trunk/JavaScriptCore/kjs/lexer.cpp

@@ -28 +28 @@
 #include "function.h"
 #include "nodes.h"
+#include "NodeInfo.h"
 #include <ctype.h>
 #include <limits.h>