Build fix for non-Mac platforms. Move NodeInfo into its own header so that the YYTYP...

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@28859 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index cc2c4bd32a30864ea9893891a25c5c990cfff25a..2bddebd428164573167a7d1c2d7f5472d1d81ff7 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,17 @@
+2007-12-09  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        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.
+
+        * kjs/NodeInfo.h: Added.
+        (KJS::createNodeInfo):
+        (KJS::mergeDeclarationLists):
+        (KJS::appendToVarDeclarationList):
+        * kjs/grammar.y:
+        * kjs/lexer.cpp:
+
 2007-12-19  Oliver Hunt  <oliver@apple.com>
 
         Make appendToVarDeclarationList static

diff --git a/JavaScriptCore/kjs/NodeInfo.h b/JavaScriptCore/kjs/NodeInfo.h
new file mode 100644 (file)
index 0000000..79d8e5c
--- /dev/null
+++ b/JavaScriptCore/kjs/NodeInfo.h
@@ -0,0 +1,43 @@
+/*
+ *  Copyright (C) 2007 Apple Inc. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef NodeInfo_h
+#define NodeInfo_h
+
+#include "nodes.h"
+#include "Parser.h"
+
+namespace KJS {
+
+template <typename T> struct NodeInfo {
+    T m_node;
+    ParserRefCountedData<DeclarationStacks::VarStack>* m_varDeclarations;
+    ParserRefCountedData<DeclarationStacks::FunctionStack>* m_funcDeclarations;
+};
+
+typedef NodeInfo<StatementNode*> StatementNodeInfo;
+typedef NodeInfo<CaseBlockNode*> CaseBlockNodeInfo;
+typedef NodeInfo<CaseClauseNode*> CaseClauseNodeInfo;
+typedef NodeInfo<SourceElementsStub*> SourceElementsInfo;
+typedef NodeInfo<ClauseList> ClauseListInfo;
+typedef NodeInfo<VarDeclList> VarDeclListInfo;
+
+} // namespace KJS
+
+#endif // NodeInfo_h

diff --git a/JavaScriptCore/kjs/grammar.y b/JavaScriptCore/kjs/grammar.y
index a601b16d20b91a681a05bb8a9a38079870144059..8b102d232cbac625f8711dbea8a5c64ab889c33d 100644 (file)
--- a/JavaScriptCore/kjs/grammar.y
+++ b/JavaScriptCore/kjs/grammar.y
@@ -32,6 +32,7 @@
 #include "lexer.h"
 #include "internal.h"
 #include "CommonIdentifiers.h"
+#include "NodeInfo.h"
 #include "Parser.h"
 #include <wtf/MathExtras.h>
 
@@ -84,12 +85,6 @@ static NumberNode* makeNumberNode(double);
 
 #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) 
 {
@@ -123,12 +118,6 @@ static void appendToVarDeclarationList(ParserRefCountedData<DeclarationStacks::V
     varDecls->data.append(decl);
 }
 
-typedef NodeInfo<StatementNode*> StatementNodeInfo;
-typedef NodeInfo<CaseBlockNode*> CaseBlockNodeInfo;
-typedef NodeInfo<CaseClauseNode*> CaseClauseNodeInfo;
-typedef NodeInfo<SourceElementsStub*> SourceElementsInfo;
-typedef NodeInfo<ClauseList> ClauseListInfo;
-typedef NodeInfo<VarDeclList> VarDeclListInfo;
 %}
 
 %union {

diff --git a/JavaScriptCore/kjs/lexer.cpp b/JavaScriptCore/kjs/lexer.cpp
index 9a559af9f64cb16f56b86eea49277435bae09a2c..4c088b48af68d827670aa12506d99d94d7f6f268 100644 (file)
--- a/JavaScriptCore/kjs/lexer.cpp
+++ b/JavaScriptCore/kjs/lexer.cpp
@@ -27,6 +27,7 @@
 #include "dtoa.h"
 #include "function.h"
 #include "nodes.h"
+#include "NodeInfo.h"
 #include <ctype.h>
 #include <limits.h>
 #include <string.h>