diff options
| author | CJentzsch <jentzsch.software@gmail.com> | 2015-02-26 22:42:21 +0800 |
|---|---|---|
| committer | CJentzsch <jentzsch.software@gmail.com> | 2015-02-26 22:42:21 +0800 |
| commit | 206d646dbfabd6cb8edea6c68d04d2bc32eb8cf9 (patch) | |
| tree | e27256e3b1fc13375666e5b34248afa66d771351 /SolidityExpressionCompiler.cpp | |
| parent | c5b2733d1e405487b0b3d419b22a08883ac487dd (diff) | |
| parent | 60ade5b33f004d64b4f55b5efc2f7083724d9682 (diff) | |
| download | dexon-solidity-206d646dbfabd6cb8edea6c68d04d2bc32eb8cf9.tar dexon-solidity-206d646dbfabd6cb8edea6c68d04d2bc32eb8cf9.tar.gz dexon-solidity-206d646dbfabd6cb8edea6c68d04d2bc32eb8cf9.tar.bz2 dexon-solidity-206d646dbfabd6cb8edea6c68d04d2bc32eb8cf9.tar.lz dexon-solidity-206d646dbfabd6cb8edea6c68d04d2bc32eb8cf9.tar.xz dexon-solidity-206d646dbfabd6cb8edea6c68d04d2bc32eb8cf9.tar.zst dexon-solidity-206d646dbfabd6cb8edea6c68d04d2bc32eb8cf9.zip | |
Merge remote-tracking branch 'upstream/develop' into memTests
Diffstat (limited to 'SolidityExpressionCompiler.cpp')
| -rw-r--r-- | SolidityExpressionCompiler.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/SolidityExpressionCompiler.cpp b/SolidityExpressionCompiler.cpp index 9cd13dcf..3340334f 100644 --- a/SolidityExpressionCompiler.cpp +++ b/SolidityExpressionCompiler.cpp @@ -127,6 +127,7 @@ bytes compileFirstExpression(const string& _sourceCode, vector<vector<string>> _ BOOST_REQUIRE(extractor.getExpression() != nullptr); CompilerContext context; + context.resetVisitedNodes(contract); context.setInheritanceHierarchy(inheritanceHierarchy); unsigned parametersSize = _localVariables.size(); // assume they are all one slot on the stack context.adjustStackOffset(parametersSize); @@ -134,7 +135,7 @@ bytes compileFirstExpression(const string& _sourceCode, vector<vector<string>> _ context.addVariable(dynamic_cast<VariableDeclaration const&>(resolveDeclaration(variable, resolver)), parametersSize--); - ExpressionCompiler::compileExpression(context, *extractor.getExpression()); + ExpressionCompiler(context).compile(*extractor.getExpression()); for (vector<string> const& function: _functions) context << context.getFunctionEntryLabel(dynamic_cast<FunctionDefinition const&>(resolveDeclaration(function, resolver))); |