<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[28859] trunk/JavaScriptCore</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/28859">28859</a></dd>
<dt>Author</dt> <dd>mrowe@apple.com</dd>
<dt>Date</dt> <dd>2007-12-19 01:10:16 -0800 (Wed, 19 Dec 2007)</dd>
</dl>

<h3>Log Message</h3>
<pre>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.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJavaScriptCoreChangeLog">trunk/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkJavaScriptCorekjsgrammary">trunk/JavaScriptCore/kjs/grammar.y</a></li>
<li><a href="#trunkJavaScriptCorekjslexercpp">trunk/JavaScriptCore/kjs/lexer.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkJavaScriptCorekjsNodeInfoh">trunk/JavaScriptCore/kjs/NodeInfo.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/ChangeLog (28858 => 28859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/ChangeLog        2007-12-19 08:41:14 UTC (rev 28858)
+++ trunk/JavaScriptCore/ChangeLog        2007-12-19 09:10:16 UTC (rev 28859)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2007-12-09  Mark Rowe  &lt;mrowe@apple.com&gt;
+
+        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:
+
</ins><span class="cx"> 2007-12-19  Oliver Hunt  &lt;oliver@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Make appendToVarDeclarationList static
</span></span></pre></div>
<a id="trunkJavaScriptCorekjsNodeInfoh"></a>
<div class="addfile"><h4>Added: trunk/JavaScriptCore/kjs/NodeInfo.h (0 => 28859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/kjs/NodeInfo.h                                (rev 0)
+++ trunk/JavaScriptCore/kjs/NodeInfo.h        2007-12-19 09:10:16 UTC (rev 28859)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+/*
+ *  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 &quot;nodes.h&quot;
+#include &quot;Parser.h&quot;
+
+namespace KJS {
+
+template &lt;typename T&gt; struct NodeInfo {
+    T m_node;
+    ParserRefCountedData&lt;DeclarationStacks::VarStack&gt;* m_varDeclarations;
+    ParserRefCountedData&lt;DeclarationStacks::FunctionStack&gt;* m_funcDeclarations;
+};
+
+typedef NodeInfo&lt;StatementNode*&gt; StatementNodeInfo;
+typedef NodeInfo&lt;CaseBlockNode*&gt; CaseBlockNodeInfo;
+typedef NodeInfo&lt;CaseClauseNode*&gt; CaseClauseNodeInfo;
+typedef NodeInfo&lt;SourceElementsStub*&gt; SourceElementsInfo;
+typedef NodeInfo&lt;ClauseList&gt; ClauseListInfo;
+typedef NodeInfo&lt;VarDeclList&gt; VarDeclListInfo;
+
+} // namespace KJS
+
+#endif // NodeInfo_h
</ins></span></pre></div>
<a id="trunkJavaScriptCorekjsgrammary"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/kjs/grammar.y (28858 => 28859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/kjs/grammar.y        2007-12-19 08:41:14 UTC (rev 28858)
+++ trunk/JavaScriptCore/kjs/grammar.y        2007-12-19 09:10:16 UTC (rev 28859)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include &quot;lexer.h&quot;
</span><span class="cx"> #include &quot;internal.h&quot;
</span><span class="cx"> #include &quot;CommonIdentifiers.h&quot;
</span><ins>+#include &quot;NodeInfo.h&quot;
</ins><span class="cx"> #include &quot;Parser.h&quot;
</span><span class="cx"> #include &lt;wtf/MathExtras.h&gt;
</span><span class="cx"> 
</span><span class="lines">@@ -84,12 +85,6 @@
</span><span class="cx"> 
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-template &lt;typename T&gt; struct NodeInfo {
-    T m_node;
-    ParserRefCountedData&lt;DeclarationStacks::VarStack&gt;* m_varDeclarations;
-    ParserRefCountedData&lt;DeclarationStacks::FunctionStack&gt;* m_funcDeclarations;
-};
-
</del><span class="cx"> template &lt;typename T&gt; NodeInfo&lt;T&gt; createNodeInfo(T node, ParserRefCountedData&lt;DeclarationStacks::VarStack&gt;* varDecls, 
</span><span class="cx">                                                  ParserRefCountedData&lt;DeclarationStacks::FunctionStack&gt;* funcDecls) 
</span><span class="cx"> {
</span><span class="lines">@@ -123,12 +118,6 @@
</span><span class="cx">     varDecls-&gt;data.append(decl);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-typedef NodeInfo&lt;StatementNode*&gt; StatementNodeInfo;
-typedef NodeInfo&lt;CaseBlockNode*&gt; CaseBlockNodeInfo;
-typedef NodeInfo&lt;CaseClauseNode*&gt; CaseClauseNodeInfo;
-typedef NodeInfo&lt;SourceElementsStub*&gt; SourceElementsInfo;
-typedef NodeInfo&lt;ClauseList&gt; ClauseListInfo;
-typedef NodeInfo&lt;VarDeclList&gt; VarDeclListInfo;
</del><span class="cx"> %}
</span><span class="cx"> 
</span><span class="cx"> %union {
</span></span></pre></div>
<a id="trunkJavaScriptCorekjslexercpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/kjs/lexer.cpp (28858 => 28859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/kjs/lexer.cpp        2007-12-19 08:41:14 UTC (rev 28858)
+++ trunk/JavaScriptCore/kjs/lexer.cpp        2007-12-19 09:10:16 UTC (rev 28859)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include &quot;dtoa.h&quot;
</span><span class="cx"> #include &quot;function.h&quot;
</span><span class="cx"> #include &quot;nodes.h&quot;
</span><ins>+#include &quot;NodeInfo.h&quot;
</ins><span class="cx"> #include &lt;ctype.h&gt;
</span><span class="cx"> #include &lt;limits.h&gt;
</span><span class="cx"> #include &lt;string.h&gt;
</span></span></pre>
</div>
</div>

</body>
</html>