<!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" />
<title>[178888] trunk/Source/JavaScriptCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/178888">178888</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-21 22:39:31 -0800 (Wed, 21 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Consolidate out arguments of parseFunctionInfo into a struct
https://bugs.webkit.org/show_bug.cgi?id=140754
Reviewed by Oliver Hunt.
Introduced ParserFunctionInfo for storing out arguments of parseFunctionInfo.
* JavaScriptCore.xcodeproj/project.pbxproj:
* parser/ASTBuilder.h:
(JSC::ASTBuilder::createFunctionExpr):
(JSC::ASTBuilder::createGetterOrSetterProperty): This one takes a property name in addition to
ParserFunctionInfo since the property name and the function name could differ.
(JSC::ASTBuilder::createFuncDeclStatement):
* parser/Parser.cpp:
(JSC::Parser<LexerType>::parseFunctionInfo):
(JSC::Parser<LexerType>::parseFunctionDeclaration):
(JSC::Parser<LexerType>::parseProperty):
(JSC::Parser<LexerType>::parseMemberExpression):
* parser/Parser.h:
* parser/ParserFunctionInfo.h: Added.
* parser/SyntaxChecker.h:
(JSC::SyntaxChecker::createFunctionExpr):
(JSC::SyntaxChecker::createFuncDeclStatement):
(JSC::SyntaxChecker::createClassDeclStatement):
(JSC::SyntaxChecker::createGetterOrSetterProperty):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserASTBuilderh">trunk/Source/JavaScriptCore/parser/ASTBuilder.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserParsercpp">trunk/Source/JavaScriptCore/parser/Parser.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserParserh">trunk/Source/JavaScriptCore/parser/Parser.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserSyntaxCheckerh">trunk/Source/JavaScriptCore/parser/SyntaxChecker.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreparserParserFunctionInfoh">trunk/Source/JavaScriptCore/parser/ParserFunctionInfo.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (178887 => 178888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-01-22 06:01:16 UTC (rev 178887)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-01-22 06:39:31 UTC (rev 178888)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2015-01-21 Ryosuke Niwa <rniwa@webkit.org>
+
+ Consolidate out arguments of parseFunctionInfo into a struct
+ https://bugs.webkit.org/show_bug.cgi?id=140754
+
+ Reviewed by Oliver Hunt.
+
+ Introduced ParserFunctionInfo for storing out arguments of parseFunctionInfo.
+
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+ * parser/ASTBuilder.h:
+ (JSC::ASTBuilder::createFunctionExpr):
+ (JSC::ASTBuilder::createGetterOrSetterProperty): This one takes a property name in addition to
+ ParserFunctionInfo since the property name and the function name could differ.
+ (JSC::ASTBuilder::createFuncDeclStatement):
+ * parser/Parser.cpp:
+ (JSC::Parser<LexerType>::parseFunctionInfo):
+ (JSC::Parser<LexerType>::parseFunctionDeclaration):
+ (JSC::Parser<LexerType>::parseProperty):
+ (JSC::Parser<LexerType>::parseMemberExpression):
+ * parser/Parser.h:
+ * parser/ParserFunctionInfo.h: Added.
+ * parser/SyntaxChecker.h:
+ (JSC::SyntaxChecker::createFunctionExpr):
+ (JSC::SyntaxChecker::createFuncDeclStatement):
+ (JSC::SyntaxChecker::createClassDeclStatement):
+ (JSC::SyntaxChecker::createGetterOrSetterProperty):
+
</ins><span class="cx"> 2015-01-21 Mark Hahnenberg <mhahnenb@gmail.com>
</span><span class="cx">
</span><span class="cx"> Change Heap::m_compiledCode to use a Vector
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (178887 => 178888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2015-01-22 06:01:16 UTC (rev 178887)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2015-01-22 06:39:31 UTC (rev 178888)
</span><span class="lines">@@ -2782,6 +2782,7 @@
</span><span class="cx"> 99E45A2118A1B2590026D88F /* EncodedValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EncodedValue.h; sourceTree = "<group>"; };
</span><span class="cx"> 99E45A2218A1B2590026D88F /* InputCursor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InputCursor.h; sourceTree = "<group>"; };
</span><span class="cx"> 99E45A2318A1B2590026D88F /* NondeterministicInput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NondeterministicInput.h; sourceTree = "<group>"; };
</span><ins>+ 9B4954E81A6640DB002815A6 /* ParserFunctionInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ParserFunctionInfo.h; sourceTree = "<group>"; };
</ins><span class="cx"> 9E729409190F0306001A91B5 /* BundlePath.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = BundlePath.mm; sourceTree = "<group>"; };
</span><span class="cx"> 9E72940A190F0514001A91B5 /* BundlePath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BundlePath.h; sourceTree = "<group>"; };
</span><span class="cx"> 9EA5C7A0190F05D200508EBE /* InitializeLLVMMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = InitializeLLVMMac.cpp; path = llvm/InitializeLLVMMac.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -4145,6 +4146,7 @@
</span><span class="cx"> 93052C320FB792190048FDC3 /* ParserArena.cpp */,
</span><span class="cx"> 93052C330FB792190048FDC3 /* ParserArena.h */,
</span><span class="cx"> 0FCCAE4316D0CF6E00D0C65B /* ParserError.h */,
</span><ins>+ 9B4954E81A6640DB002815A6 /* ParserFunctionInfo.h */,
</ins><span class="cx"> A77F18241641925400640A47 /* ParserModes.h */,
</span><span class="cx"> 65303D631447B9E100D3F904 /* ParserTokens.h */,
</span><span class="cx"> 869EBCB60E8C6D4A008722CC /* ResultType.h */,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserASTBuilderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/ASTBuilder.h (178887 => 178888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/ASTBuilder.h 2015-01-22 06:01:16 UTC (rev 178887)
+++ trunk/Source/JavaScriptCore/parser/ASTBuilder.h 2015-01-22 06:39:31 UTC (rev 178888)
</span><span class="lines">@@ -273,11 +273,12 @@
</span><span class="cx"> return node;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ExpressionNode* createFunctionExpr(const JSTokenLocation& location, const Identifier* name, FunctionBodyNode* body, ParameterNode* parameters, unsigned openBraceOffset, unsigned closeBraceOffset, int bodyStartLine, int bodyEndLine, unsigned startColumn, unsigned functionKeywordStart)
</del><ins>+ ExpressionNode* createFunctionExpr(const JSTokenLocation& location, const ParserFunctionInfo<ASTBuilder>& info, unsigned functionKeywordStart)
</ins><span class="cx"> {
</span><del>- FuncExprNode* result = new (m_parserArena) FuncExprNode(location, *name, body, m_sourceCode->subExpression(openBraceOffset, closeBraceOffset, bodyStartLine, startColumn), parameters);
- body->setLoc(bodyStartLine, bodyEndLine, location.startOffset, location.lineStartOffset);
- body->setFunctionKeywordStart(functionKeywordStart);
</del><ins>+ FuncExprNode* result = new (m_parserArena) FuncExprNode(location, *info.name, info.body,
+ m_sourceCode->subExpression(info.openBraceOffset, info.closeBraceOffset, info.bodyStartLine, info.bodyStartColumn), info.parameters);
+ info.body->setLoc(info.bodyStartLine, info.bodyEndLine, location.startOffset, location.lineStartOffset);
+ info.body->setFunctionKeywordStart(functionKeywordStart);
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -291,20 +292,24 @@
</span><span class="cx"> body->setFunctionNameStart(functionNameStart);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- NEVER_INLINE PropertyNode* createGetterOrSetterProperty(const JSTokenLocation& location, PropertyNode::Type type, bool, const Identifier* name, ParameterNode* params, FunctionBodyNode* body, unsigned openBraceOffset, unsigned closeBraceOffset, int bodyStartLine, int bodyEndLine, unsigned bodyStartColumn, unsigned getOrSetStartOffset)
</del><ins>+ NEVER_INLINE PropertyNode* createGetterOrSetterProperty(const JSTokenLocation& location, PropertyNode::Type type, bool,
+ const Identifier* name, const ParserFunctionInfo<ASTBuilder>& info, unsigned getOrSetStartOffset)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(name);
</span><del>- body->setLoc(bodyStartLine, bodyEndLine, location.startOffset, location.lineStartOffset);
- body->setInferredName(*name);
- body->setFunctionKeywordStart(getOrSetStartOffset);
- return new (m_parserArena) PropertyNode(*name, new (m_parserArena) FuncExprNode(location, m_vm->propertyNames->nullIdentifier, body, m_sourceCode->subExpression(openBraceOffset, closeBraceOffset, bodyStartLine, bodyStartColumn), params), type);
</del><ins>+ info.body->setLoc(info.bodyStartLine, info.bodyEndLine, location.startOffset, location.lineStartOffset);
+ info.body->setInferredName(*name);
+ info.body->setFunctionKeywordStart(getOrSetStartOffset);
+ return new (m_parserArena) PropertyNode(*name, new (m_parserArena) FuncExprNode(location, m_vm->propertyNames->nullIdentifier,
+ info.body, m_sourceCode->subExpression(info.openBraceOffset, info.closeBraceOffset, info.bodyStartLine, info.bodyStartColumn), info.parameters), type);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- NEVER_INLINE PropertyNode* createGetterOrSetterProperty(VM* vm, ParserArena& parserArena, const JSTokenLocation& location, PropertyNode::Type type, bool, double name, ParameterNode* params, FunctionBodyNode* body, unsigned openBraceOffset, unsigned closeBraceOffset, int bodyStartLine, int bodyEndLine, unsigned bodyStartColumn, unsigned getOrSetStartOffset)
</del><ins>+ NEVER_INLINE PropertyNode* createGetterOrSetterProperty(VM* vm, ParserArena& parserArena, const JSTokenLocation& location, PropertyNode::Type type, bool, double name, const ParserFunctionInfo<ASTBuilder>& info, unsigned getOrSetStartOffset)
</ins><span class="cx"> {
</span><del>- body->setLoc(bodyStartLine, bodyEndLine, location.startOffset, location.lineStartOffset);
- body->setFunctionKeywordStart(getOrSetStartOffset);
- return new (m_parserArena) PropertyNode(parserArena.identifierArena().makeNumericIdentifier(vm, name), new (m_parserArena) FuncExprNode(location, vm->propertyNames->nullIdentifier, body, m_sourceCode->subExpression(openBraceOffset, closeBraceOffset, bodyStartLine, bodyStartColumn), params), type);
</del><ins>+ info.body->setLoc(info.bodyStartLine, info.bodyEndLine, location.startOffset, location.lineStartOffset);
+ info.body->setFunctionKeywordStart(getOrSetStartOffset);
+ const Identifier& ident = parserArena.identifierArena().makeNumericIdentifier(vm, name);
+ return new (m_parserArena) PropertyNode(ident, new (m_parserArena) FuncExprNode(location, vm->propertyNames->nullIdentifier,
+ info.body, m_sourceCode->subExpression(info.openBraceOffset, info.closeBraceOffset, info.bodyStartLine, info.bodyStartColumn), info.parameters), type);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ArgumentsNode* createArguments() { return new (m_parserArena) ArgumentsNode(); }
</span><span class="lines">@@ -336,14 +341,15 @@
</span><span class="cx"> ClauseListNode* createClauseList(CaseClauseNode* clause) { return new (m_parserArena) ClauseListNode(clause); }
</span><span class="cx"> ClauseListNode* createClauseList(ClauseListNode* tail, CaseClauseNode* clause) { return new (m_parserArena) ClauseListNode(tail, clause); }
</span><span class="cx">
</span><del>- StatementNode* createFuncDeclStatement(const JSTokenLocation& location, const Identifier* name, FunctionBodyNode* body, ParameterNode* parameters, unsigned openBraceOffset, unsigned closeBraceOffset, int bodyStartLine, int bodyEndLine, unsigned bodyStartColumn, unsigned functionKeywordStart)
</del><ins>+ StatementNode* createFuncDeclStatement(const JSTokenLocation& location, const ParserFunctionInfo<ASTBuilder>& info, unsigned functionKeywordStart)
</ins><span class="cx"> {
</span><del>- FuncDeclNode* decl = new (m_parserArena) FuncDeclNode(location, *name, body, m_sourceCode->subExpression(openBraceOffset, closeBraceOffset, bodyStartLine, bodyStartColumn), parameters);
- if (*name == m_vm->propertyNames->arguments)
</del><ins>+ FuncDeclNode* decl = new (m_parserArena) FuncDeclNode(location, *info.name, info.body,
+ m_sourceCode->subExpression(info.openBraceOffset, info.closeBraceOffset, info.bodyStartLine, info.bodyStartColumn), info.parameters);
+ if (*info.name == m_vm->propertyNames->arguments)
</ins><span class="cx"> usesArguments();
</span><span class="cx"> m_scope.m_funcDeclarations.append(decl->body());
</span><del>- body->setLoc(bodyStartLine, bodyEndLine, location.startOffset, location.lineStartOffset);
- body->setFunctionKeywordStart(functionKeywordStart);
</del><ins>+ info.body->setLoc(info.bodyStartLine, info.bodyEndLine, location.startOffset, location.lineStartOffset);
+ info.body->setFunctionKeywordStart(functionKeywordStart);
</ins><span class="cx"> return decl;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Parser.cpp (178887 => 178888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Parser.cpp 2015-01-22 06:01:16 UTC (rev 178887)
+++ trunk/Source/JavaScriptCore/parser/Parser.cpp 2015-01-22 06:39:31 UTC (rev 178888)
</span><span class="lines">@@ -1273,7 +1273,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename LexerType>
</span><del>-template <class TreeBuilder> bool Parser<LexerType>::parseFunctionInfo(TreeBuilder& context, FunctionRequirements requirements, FunctionParseMode mode, bool nameIsInContainingScope, const Identifier*& name, TreeFormalParameterList& parameters, TreeFunctionBody& body, unsigned& openBraceOffset, unsigned& closeBraceOffset, int& bodyStartLine, unsigned& bodyStartColumn)
</del><ins>+template <class TreeBuilder> bool Parser<LexerType>::parseFunctionInfo(TreeBuilder& context, FunctionRequirements requirements, FunctionParseMode mode, bool nameIsInContainingScope, ParserFunctionInfo<TreeBuilder>& info)
</ins><span class="cx"> {
</span><span class="cx"> AutoPopScopeRef functionScope(this, pushScope());
</span><span class="cx"> functionScope->setIsFunction();
</span><span class="lines">@@ -1281,11 +1281,11 @@
</span><span class="cx"> const Identifier* lastFunctionName = m_lastFunctionName;
</span><span class="cx"> m_lastFunctionName = nullptr;
</span><span class="cx"> if (match(IDENT)) {
</span><del>- name = m_token.m_data.ident;
- m_lastFunctionName = name;
</del><ins>+ info.name = m_token.m_data.ident;
+ m_lastFunctionName = info.name;
</ins><span class="cx"> next();
</span><span class="cx"> if (!nameIsInContainingScope)
</span><del>- failIfFalseIfStrict(functionScope->declareVariable(name), "'", name->impl(), "' is not a valid ", stringForFunctionMode(mode), " name in strict mode");
</del><ins>+ failIfFalseIfStrict(functionScope->declareVariable(info.name), "'", info.name->impl(), "' is not a valid ", stringForFunctionMode(mode), " name in strict mode");
</ins><span class="cx"> } else if (requirements == FunctionNeedsName) {
</span><span class="cx"> if (match(OPENPAREN) && mode == FunctionMode)
</span><span class="cx"> semanticFail("Function statements must have a name");
</span><span class="lines">@@ -1298,19 +1298,19 @@
</span><span class="cx"> failWithMessage("Expected an opening '(' before a ", stringForFunctionMode(mode), "'s parameter list");
</span><span class="cx"> }
</span><span class="cx"> if (!match(CLOSEPAREN)) {
</span><del>- parameters = parseFormalParameters(context);
- failIfFalse(parameters, "Cannot parse parameters for this ", stringForFunctionMode(mode));
</del><ins>+ info.parameters = parseFormalParameters(context);
+ failIfFalse(info.parameters, "Cannot parse parameters for this ", stringForFunctionMode(mode));
</ins><span class="cx"> }
</span><span class="cx"> consumeOrFail(CLOSEPAREN, "Expected a ')' or a ',' after a parameter declaration");
</span><span class="cx"> matchOrFail(OPENBRACE, "Expected an opening '{' at the start of a ", stringForFunctionMode(mode), " body");
</span><span class="cx">
</span><del>- openBraceOffset = m_token.m_data.offset;
- bodyStartLine = tokenLine();
- bodyStartColumn = m_token.m_data.offset - m_token.m_data.lineStartOffset;
</del><ins>+ info.openBraceOffset = m_token.m_data.offset;
+ info.bodyStartLine = tokenLine();
+ info.bodyStartColumn = m_token.m_data.offset - m_token.m_data.lineStartOffset;
</ins><span class="cx"> JSTokenLocation startLocation(tokenLocation());
</span><span class="cx">
</span><span class="cx"> // If we know about this function already, we can use the cached info and skip the parser to the end of the function.
</span><del>- if (const SourceProviderCacheItem* cachedInfo = TreeBuilder::CanUseFunctionCache ? findCachedFunctionInfo(openBraceOffset) : 0) {
</del><ins>+ if (const SourceProviderCacheItem* cachedInfo = TreeBuilder::CanUseFunctionCache ? findCachedFunctionInfo(info.openBraceOffset) : 0) {
</ins><span class="cx"> // If we're in a strict context, the cached function info must say it was strict too.
</span><span class="cx"> ASSERT(!strictMode() || cachedInfo->strictMode);
</span><span class="cx"> JSTokenLocation endLocation;
</span><span class="lines">@@ -1319,21 +1319,21 @@
</span><span class="cx"> endLocation.startOffset = cachedInfo->closeBraceOffset;
</span><span class="cx"> endLocation.lineStartOffset = cachedInfo->closeBraceLineStartOffset;
</span><span class="cx">
</span><del>- bool endColumnIsOnStartLine = (endLocation.line == bodyStartLine);
</del><ins>+ bool endColumnIsOnStartLine = (endLocation.line == info.bodyStartLine);
</ins><span class="cx"> ASSERT(endLocation.startOffset >= endLocation.lineStartOffset);
</span><span class="cx"> unsigned bodyEndColumn = endColumnIsOnStartLine ?
</span><span class="cx"> endLocation.startOffset - m_token.m_data.lineStartOffset :
</span><span class="cx"> endLocation.startOffset - endLocation.lineStartOffset;
</span><span class="cx"> unsigned currentLineStartOffset = m_token.m_location.lineStartOffset;
</span><span class="cx">
</span><del>- body = context.createFunctionBody(startLocation, endLocation, bodyStartColumn, bodyEndColumn, cachedInfo->strictMode);
</del><ins>+ info.body = context.createFunctionBody(startLocation, endLocation, info.bodyStartColumn, bodyEndColumn, cachedInfo->strictMode);
</ins><span class="cx">
</span><span class="cx"> functionScope->restoreFromSourceProviderCache(cachedInfo);
</span><span class="cx"> failIfFalse(popScope(functionScope, TreeBuilder::NeedsFreeVariableInfo), "Parser error");
</span><span class="cx">
</span><del>- closeBraceOffset = cachedInfo->closeBraceOffset;
</del><ins>+ info.closeBraceOffset = cachedInfo->closeBraceOffset;
</ins><span class="cx">
</span><del>- context.setFunctionNameStart(body, functionNameStart);
</del><ins>+ context.setFunctionNameStart(info.body, functionNameStart);
</ins><span class="cx"> m_token = cachedInfo->closeBraceToken();
</span><span class="cx"> if (endColumnIsOnStartLine)
</span><span class="cx"> m_token.m_location.lineStartOffset = currentLineStartOffset;
</span><span class="lines">@@ -1341,23 +1341,24 @@
</span><span class="cx"> m_lexer->setOffset(m_token.m_location.endOffset, m_token.m_location.lineStartOffset);
</span><span class="cx"> m_lexer->setLineNumber(m_token.m_location.line);
</span><span class="cx">
</span><del>- context.setEndOffset(body, m_lexer->currentOffset());
</del><ins>+ context.setEndOffset(info.body, m_lexer->currentOffset());
</ins><span class="cx">
</span><span class="cx"> next();
</span><ins>+ info.bodyEndLine = m_lastTokenEndPosition.line;
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> m_lastFunctionName = lastFunctionName;
</span><span class="cx"> ParserState oldState = saveState();
</span><del>- body = parseFunctionBody(context);
</del><ins>+ info.body = parseFunctionBody(context);
</ins><span class="cx"> restoreState(oldState);
</span><del>- failIfFalse(body, "Cannot parse the body of this ", stringForFunctionMode(mode));
- context.setEndOffset(body, m_lexer->currentOffset());
- if (functionScope->strictMode() && name) {
</del><ins>+ failIfFalse(info.body, "Cannot parse the body of this ", stringForFunctionMode(mode));
+ context.setEndOffset(info.body, m_lexer->currentOffset());
+ if (functionScope->strictMode() && info.name) {
</ins><span class="cx"> RELEASE_ASSERT(mode == FunctionMode);
</span><del>- semanticFailIfTrue(m_vm->propertyNames->arguments == *name, "'", name->impl(), "' is not a valid function name in strict mode");
- semanticFailIfTrue(m_vm->propertyNames->eval == *name, "'", name->impl(), "' is not a valid function name in strict mode");
</del><ins>+ semanticFailIfTrue(m_vm->propertyNames->arguments == *info.name, "'", info.name->impl(), "' is not a valid function name in strict mode");
+ semanticFailIfTrue(m_vm->propertyNames->eval == *info.name, "'", info.name->impl(), "' is not a valid function name in strict mode");
</ins><span class="cx"> }
</span><del>- closeBraceOffset = m_token.m_data.offset;
</del><ins>+ info.closeBraceOffset = m_token.m_data.offset;
</ins><span class="cx"> unsigned closeBraceLine = m_token.m_data.line;
</span><span class="cx"> unsigned closeBraceLineStartOffset = m_token.m_data.lineStartOffset;
</span><span class="cx">
</span><span class="lines">@@ -1365,26 +1366,27 @@
</span><span class="cx"> // Any future reparsing can then skip the function.
</span><span class="cx"> static const int minimumFunctionLengthToCache = 16;
</span><span class="cx"> std::unique_ptr<SourceProviderCacheItem> newInfo;
</span><del>- int functionLength = closeBraceOffset - openBraceOffset;
</del><ins>+ int functionLength = info.closeBraceOffset - info.openBraceOffset;
</ins><span class="cx"> if (TreeBuilder::CanUseFunctionCache && m_functionCache && functionLength > minimumFunctionLengthToCache) {
</span><span class="cx"> SourceProviderCacheItemCreationParameters parameters;
</span><span class="cx"> parameters.functionNameStart = functionNameStart;
</span><span class="cx"> parameters.closeBraceLine = closeBraceLine;
</span><del>- parameters.closeBraceOffset = closeBraceOffset;
</del><ins>+ parameters.closeBraceOffset = info.closeBraceOffset;
</ins><span class="cx"> parameters.closeBraceLineStartOffset = closeBraceLineStartOffset;
</span><span class="cx"> functionScope->fillParametersForSourceProviderCache(parameters);
</span><span class="cx"> newInfo = SourceProviderCacheItem::create(parameters);
</span><span class="cx">
</span><span class="cx"> }
</span><del>- context.setFunctionNameStart(body, functionNameStart);
</del><ins>+ context.setFunctionNameStart(info.body, functionNameStart);
</ins><span class="cx">
</span><span class="cx"> failIfFalse(popScope(functionScope, TreeBuilder::NeedsFreeVariableInfo), "Parser error");
</span><span class="cx"> matchOrFail(CLOSEBRACE, "Expected a closing '}' after a ", stringForFunctionMode(mode), " body");
</span><span class="cx">
</span><span class="cx"> if (newInfo)
</span><del>- m_functionCache->add(openBraceOffset, WTF::move(newInfo));
</del><ins>+ m_functionCache->add(info.openBraceOffset, WTF::move(newInfo));
</ins><span class="cx">
</span><span class="cx"> next();
</span><ins>+ info.bodyEndLine = m_lastTokenEndPosition.line;
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1395,17 +1397,11 @@
</span><span class="cx"> JSTokenLocation location(tokenLocation());
</span><span class="cx"> unsigned functionKeywordStart = tokenStart();
</span><span class="cx"> next();
</span><del>- const Identifier* name = 0;
- TreeFormalParameterList parameters = 0;
- TreeFunctionBody body = 0;
- unsigned openBraceOffset = 0;
- unsigned closeBraceOffset = 0;
- int bodyStartLine = 0;
- unsigned bodyStartColumn = 0;
- failIfFalse((parseFunctionInfo(context, FunctionNeedsName, FunctionMode, true, name, parameters, body, openBraceOffset, closeBraceOffset, bodyStartLine, bodyStartColumn)), "Cannot parse this function");
- failIfFalse(name, "Function statements must have a name");
- failIfFalseIfStrict(declareVariable(name), "Cannot declare a function named '", name->impl(), "' in strict mode");
- return context.createFuncDeclStatement(location, name, body, parameters, openBraceOffset, closeBraceOffset, bodyStartLine, m_lastTokenEndPosition.line, bodyStartColumn, functionKeywordStart);
</del><ins>+ ParserFunctionInfo<TreeBuilder> info;
+ failIfFalse((parseFunctionInfo(context, FunctionNeedsName, FunctionMode, true, info)), "Cannot parse this function");
+ failIfFalse(info.name, "Function statements must have a name");
+ failIfFalseIfStrict(declareVariable(info.name), "Cannot declare a function named '", info.name->impl(), "' in strict mode");
+ return context.createFuncDeclStatement(location, info, functionKeywordStart);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> struct LabelInfo {
</span><span class="lines">@@ -1799,13 +1795,6 @@
</span><span class="cx"> return context.createProperty(ident, node, PropertyNode::Constant, complete);
</span><span class="cx"> }
</span><span class="cx"> failIfFalse(wasIdent, "Expected an identifier as property name");
</span><del>- const Identifier* accessorName = 0;
- TreeFormalParameterList parameters = 0;
- TreeFunctionBody body = 0;
- unsigned openBraceOffset = 0;
- unsigned closeBraceOffset = 0;
- int bodyStartLine = 0;
- unsigned bodyStartColumn = 0;
</del><span class="cx"> PropertyNode::Type type;
</span><span class="cx"> if (*ident == m_vm->propertyNames->get)
</span><span class="cx"> type = PropertyNode::Getter;
</span><span class="lines">@@ -1823,16 +1812,17 @@
</span><span class="cx"> failDueToUnexpectedToken();
</span><span class="cx"> JSTokenLocation location(tokenLocation());
</span><span class="cx"> next();
</span><ins>+ ParserFunctionInfo<TreeBuilder> info;
</ins><span class="cx"> if (type == PropertyNode::Getter) {
</span><span class="cx"> failIfFalse(match(OPENPAREN), "Expected a parameter list for getter definition");
</span><del>- failIfFalse((parseFunctionInfo(context, FunctionNoRequirements, GetterMode, false, accessorName, parameters, body, openBraceOffset, closeBraceOffset, bodyStartLine, bodyStartColumn)), "Cannot parse getter definition");
</del><ins>+ failIfFalse((parseFunctionInfo(context, FunctionNoRequirements, GetterMode, false, info)), "Cannot parse getter definition");
</ins><span class="cx"> } else {
</span><span class="cx"> failIfFalse(match(OPENPAREN), "Expected a parameter list for setter definition");
</span><del>- failIfFalse((parseFunctionInfo(context, FunctionNoRequirements, SetterMode, false, accessorName, parameters, body, openBraceOffset, closeBraceOffset, bodyStartLine, bodyStartColumn)), "Cannot parse setter definition");
</del><ins>+ failIfFalse((parseFunctionInfo(context, FunctionNoRequirements, SetterMode, false, info)), "Cannot parse setter definition");
</ins><span class="cx"> }
</span><span class="cx"> if (stringPropertyName)
</span><del>- return context.createGetterOrSetterProperty(location, type, complete, stringPropertyName, parameters, body, openBraceOffset, closeBraceOffset, bodyStartLine, m_lastTokenEndPosition.line, bodyStartColumn, getterOrSetterStartOffset);
- return context.createGetterOrSetterProperty(const_cast<VM*>(m_vm), m_parserArena, location, type, complete, numericPropertyName, parameters, body, openBraceOffset, closeBraceOffset, bodyStartLine, m_lastTokenEndPosition.line, bodyStartColumn, getterOrSetterStartOffset);
</del><ins>+ return context.createGetterOrSetterProperty(location, type, complete, stringPropertyName, info, getterOrSetterStartOffset);
+ return context.createGetterOrSetterProperty(const_cast<VM*>(m_vm), m_parserArena, location, type, complete, numericPropertyName, info, getterOrSetterStartOffset);
</ins><span class="cx"> }
</span><span class="cx"> case NUMBER: {
</span><span class="cx"> double propertyName = m_token.m_data.doubleValue;
</span><span class="lines">@@ -2172,20 +2162,15 @@
</span><span class="cx"> next();
</span><span class="cx"> newCount++;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if (match(FUNCTION)) {
</span><del>- const Identifier* name = &m_vm->propertyNames->nullIdentifier;
- TreeFormalParameterList parameters = 0;
- TreeFunctionBody body = 0;
- unsigned openBraceOffset = 0;
- unsigned closeBraceOffset = 0;
- int bodyStartLine = 0;
- unsigned bodyStartColumn = 0;
</del><span class="cx"> unsigned functionKeywordStart = tokenStart();
</span><span class="cx"> location = tokenLocation();
</span><span class="cx"> next();
</span><del>- failIfFalse((parseFunctionInfo(context, FunctionNoRequirements, FunctionMode, false, name, parameters, body, openBraceOffset, closeBraceOffset, bodyStartLine, bodyStartColumn)), "Cannot parse function expression");
- base = context.createFunctionExpr(location, name, body, parameters, openBraceOffset, closeBraceOffset, bodyStartLine, m_lastTokenEndPosition.line, bodyStartColumn, functionKeywordStart);
</del><ins>+ ParserFunctionInfo<TreeBuilder> info;
+ info.name = &m_vm->propertyNames->nullIdentifier;
+ failIfFalse((parseFunctionInfo(context, FunctionNoRequirements, FunctionMode, false, info)), "Cannot parse function expression");
+ base = context.createFunctionExpr(location, info, functionKeywordStart);
</ins><span class="cx"> } else
</span><span class="cx"> base = parsePrimaryExpression(context);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Parser.h (178887 => 178888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Parser.h 2015-01-22 06:01:16 UTC (rev 178887)
+++ trunk/Source/JavaScriptCore/parser/Parser.h 2015-01-22 06:39:31 UTC (rev 178888)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "Nodes.h"
</span><span class="cx"> #include "ParserArena.h"
</span><span class="cx"> #include "ParserError.h"
</span><ins>+#include "ParserFunctionInfo.h"
</ins><span class="cx"> #include "ParserTokens.h"
</span><span class="cx"> #include "SourceProvider.h"
</span><span class="cx"> #include "SourceProviderCache.h"
</span><span class="lines">@@ -733,7 +734,9 @@
</span><span class="cx"> template <class TreeBuilder> NEVER_INLINE TreeDeconstructionPattern createBindingPattern(TreeBuilder&, DeconstructionKind, const Identifier&, int depth, JSToken);
</span><span class="cx"> template <class TreeBuilder> NEVER_INLINE TreeDeconstructionPattern parseDeconstructionPattern(TreeBuilder&, DeconstructionKind, int depth = 0);
</span><span class="cx"> template <class TreeBuilder> NEVER_INLINE TreeDeconstructionPattern tryParseDeconstructionPatternExpression(TreeBuilder&);
</span><del>- template <class TreeBuilder> NEVER_INLINE bool parseFunctionInfo(TreeBuilder&, FunctionRequirements, FunctionParseMode, bool nameIsInContainingScope, const Identifier*&, TreeFormalParameterList&, TreeFunctionBody&, unsigned& openBraceOffset, unsigned& closeBraceOffset, int& bodyStartLine, unsigned& bodyStartColumn);
</del><ins>+
+ template <class TreeBuilder> NEVER_INLINE bool parseFunctionInfo(TreeBuilder&, FunctionRequirements, FunctionParseMode, bool nameIsInContainingScope, ParserFunctionInfo<TreeBuilder>&);
+
</ins><span class="cx"> ALWAYS_INLINE int isBinaryOperator(JSTokenType);
</span><span class="cx"> bool allowAutomaticSemicolon();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParserFunctionInfoh"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/parser/ParserFunctionInfo.h (0 => 178888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/ParserFunctionInfo.h (rev 0)
+++ trunk/Source/JavaScriptCore/parser/ParserFunctionInfo.h 2015-01-22 06:39:31 UTC (rev 178888)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef ParserFunctionInfo_h
+#define ParserFunctionInfo_h
+
+namespace JSC {
+
+template <class TreeBuilder>
+struct ParserFunctionInfo {
+ const Identifier* name = 0;
+ typename TreeBuilder::FormalParameterList parameters = 0;
+ typename TreeBuilder::FunctionBody body = 0;
+ unsigned openBraceOffset = 0;
+ unsigned closeBraceOffset = 0;
+ int bodyStartLine = 0;
+ int bodyEndLine = 0;
+ unsigned bodyStartColumn = 0;
+};
+
+}
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserSyntaxCheckerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/SyntaxChecker.h (178887 => 178888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/SyntaxChecker.h 2015-01-22 06:01:16 UTC (rev 178887)
+++ trunk/Source/JavaScriptCore/parser/SyntaxChecker.h 2015-01-22 06:39:31 UTC (rev 178888)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #define SyntaxChecker_h
</span><span class="cx">
</span><span class="cx"> #include "Lexer.h"
</span><ins>+#include "ParserFunctionInfo.h"
</ins><span class="cx"> #include "YarrSyntaxChecker.h"
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="lines">@@ -159,7 +160,7 @@
</span><span class="cx"> ExpressionType createConditionalExpr(const JSTokenLocation&, ExpressionType, ExpressionType, ExpressionType) { return ConditionalExpr; }
</span><span class="cx"> ExpressionType createAssignResolve(const JSTokenLocation&, const Identifier&, ExpressionType, int, int, int) { return AssignmentExpr; }
</span><span class="cx"> ExpressionType createEmptyVarExpression(const JSTokenLocation&, const Identifier&) { return AssignmentExpr; }
</span><del>- ExpressionType createFunctionExpr(const JSTokenLocation&, const Identifier*, int, int, int, int, int, int, int, int) { return FunctionExpr; }
</del><ins>+ ExpressionType createFunctionExpr(const JSTokenLocation&, const ParserFunctionInfo<SyntaxChecker>&, int) { return FunctionExpr; }
</ins><span class="cx"> int createFunctionBody(const JSTokenLocation&, const JSTokenLocation&, int, int, bool) { return FunctionBodyResult; }
</span><span class="cx"> void setFunctionNameStart(int, int) { }
</span><span class="cx"> int createArguments() { return ArgumentsResult; }
</span><span class="lines">@@ -193,7 +194,8 @@
</span><span class="cx"> int createClause(int, int) { return ClauseResult; }
</span><span class="cx"> int createClauseList(int) { return ClauseListResult; }
</span><span class="cx"> int createClauseList(int, int) { return ClauseListResult; }
</span><del>- int createFuncDeclStatement(const JSTokenLocation&, const Identifier*, int, int, int, int, int, int, int, int) { return StatementResult; }
</del><ins>+ int createFuncDeclStatement(const JSTokenLocation&, const ParserFunctionInfo<SyntaxChecker>&, int) { return StatementResult; }
+ int createClassDeclStatement(const JSTokenLocation&, const Identifier&, ExpressionType, ExpressionType, PropertyList, PropertyList, int, int) { return StatementResult; }
</ins><span class="cx"> int createBlockStatement(const JSTokenLocation&, int, int, int) { return StatementResult; }
</span><span class="cx"> int createExprStatement(const JSTokenLocation&, int, int, int) { return StatementResult; }
</span><span class="cx"> int createIfStatement(const JSTokenLocation&, int, int, int, int) { return StatementResult; }
</span><span class="lines">@@ -218,14 +220,14 @@
</span><span class="cx"> int createDebugger(const JSTokenLocation&, int, int) { return StatementResult; }
</span><span class="cx"> int createConstStatement(const JSTokenLocation&, int, int, int) { return StatementResult; }
</span><span class="cx"> int appendConstDecl(const JSTokenLocation&, int, const Identifier*, int) { return StatementResult; }
</span><del>- Property createGetterOrSetterProperty(const JSTokenLocation&, PropertyNode::Type type, bool strict, const Identifier* name, int, int, int, int, int, int, int, int)
</del><ins>+ Property createGetterOrSetterProperty(const JSTokenLocation&, PropertyNode::Type type, bool strict, const Identifier* name, const ParserFunctionInfo<SyntaxChecker>&, unsigned)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(name);
</span><span class="cx"> if (!strict)
</span><span class="cx"> return Property(type);
</span><span class="cx"> return Property(name, type);
</span><span class="cx"> }
</span><del>- Property createGetterOrSetterProperty(VM* vm, ParserArena& parserArena, const JSTokenLocation&, PropertyNode::Type type, bool strict, double name, int, int, int, int, int, int, int, int)
</del><ins>+ Property createGetterOrSetterProperty(VM* vm, ParserArena& parserArena, const JSTokenLocation&, PropertyNode::Type type, bool strict, double name, const ParserFunctionInfo<SyntaxChecker>&, unsigned)
</ins><span class="cx"> {
</span><span class="cx"> if (!strict)
</span><span class="cx"> return Property(type);
</span></span></pre>
</div>
</div>
</body>
</html>