Modified: trunk/Source/_javascript_Core/ChangeLog (156479 => 156480)
--- trunk/Source/_javascript_Core/ChangeLog 2013-09-26 18:13:19 UTC (rev 156479)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-09-26 18:13:22 UTC (rev 156480)
@@ -1,3 +1,12 @@
+2013-09-26 Oliver Hunt <oli...@apple.com>
+
+ Attempt to fix MSVC build
+
+ * parser/Parser.cpp:
+ (JSC::::createBindingPattern):
+ (JSC::::parseDeconstructionPattern):
+ * parser/Parser.h:
+
2013-09-26 Julien Brianceau <jbria...@cisco.com>
[sh4] JSValue* exception is unused since r70703 in JITStackFrame.
Modified: trunk/Source/_javascript_Core/parser/Parser.cpp (156479 => 156480)
--- trunk/Source/_javascript_Core/parser/Parser.cpp 2013-09-26 18:13:19 UTC (rev 156479)
+++ trunk/Source/_javascript_Core/parser/Parser.cpp 2013-09-26 18:13:22 UTC (rev 156480)
@@ -333,7 +333,7 @@
}
template <typename LexerType>
-template <typename Parser<LexerType>::DeconstructionKind kind, class TreeBuilder> TreeDeconstructionPattern Parser<LexerType>::createBindingPattern(TreeBuilder& context, const Identifier& name, int depth)
+template <DeconstructionKind kind, class TreeBuilder> TreeDeconstructionPattern Parser<LexerType>::createBindingPattern(TreeBuilder& context, const Identifier& name, int depth)
{
ASSERT(!name.isEmpty());
ASSERT(!name.isNull());
@@ -361,7 +361,7 @@
}
template <typename LexerType>
-template <typename Parser<LexerType>::DeconstructionKind kind, class TreeBuilder> TreeDeconstructionPattern Parser<LexerType>::parseDeconstructionPattern(TreeBuilder& context, int depth)
+template <DeconstructionKind kind, class TreeBuilder> TreeDeconstructionPattern Parser<LexerType>::parseDeconstructionPattern(TreeBuilder& context, int depth)
{
failIfStackOverflow();
int nonLHSCount = m_nonLHSCount;
Modified: trunk/Source/_javascript_Core/parser/Parser.h (156479 => 156480)
--- trunk/Source/_javascript_Core/parser/Parser.h 2013-09-26 18:13:19 UTC (rev 156479)
+++ trunk/Source/_javascript_Core/parser/Parser.h 2013-09-26 18:13:22 UTC (rev 156480)
@@ -79,6 +79,11 @@
enum SourceElementsMode { CheckForStrictMode, DontCheckForStrictMode };
enum FunctionRequirements { FunctionNoRequirements, FunctionNeedsName };
+enum DeconstructionKind {
+ DeconstructToVariables,
+ DeconstructToParameters,
+ DeconstructToExpressions
+};
template <typename T> inline bool isEvalNode() { return false; }
template <> inline bool isEvalNode<EvalNode>() { return true; }
@@ -950,11 +955,7 @@
template <class TreeBuilder> ALWAYS_INLINE TreeFormalParameterList parseFormalParameters(TreeBuilder&);
template <class TreeBuilder> ALWAYS_INLINE TreeExpression parseVarDeclarationList(TreeBuilder&, int& declarations, TreeDeconstructionPattern& lastPattern, TreeExpression& lastInitializer, JSTextPosition& identStart, JSTextPosition& initStart, JSTextPosition& initEnd);
template <class TreeBuilder> ALWAYS_INLINE TreeConstDeclList parseConstDeclarationList(TreeBuilder&);
- enum DeconstructionKind {
- DeconstructToVariables,
- DeconstructToParameters,
- DeconstructToExpressions
- };
+
template <DeconstructionKind, class TreeBuilder> ALWAYS_INLINE TreeDeconstructionPattern createBindingPattern(TreeBuilder&, const Identifier&, int depth);
template <DeconstructionKind, class TreeBuilder> ALWAYS_INLINE TreeDeconstructionPattern parseDeconstructionPattern(TreeBuilder&, int depth = 0);
template <FunctionRequirements, bool nameIsInContainingScope, class TreeBuilder> bool parseFunctionInfo(TreeBuilder&, const Identifier*&, TreeFormalParameterList&, TreeFunctionBody&, unsigned& openBraceOffset, unsigned& closeBraceOffset, int& bodyStartLine, unsigned& bodyStartColumn);
