aboutsummaryrefslogtreecommitdiffstats
path: root/SolidityExpressionCompiler.cpp
diff options
context:
space:
mode:
authorPaweł Bylica <pawel.bylica@imapp.pl>2015-02-27 15:59:49 +0800
committerPaweł Bylica <pawel.bylica@imapp.pl>2015-02-27 15:59:49 +0800
commit0e8dbe5318aab58372dbdef5e38d7c90e3b453e3 (patch)
tree75cde752b2349b4e7646671099771850b06e4795 /SolidityExpressionCompiler.cpp
parent37c5f585aaddf933cb5d6de509af63e54a6fbfc0 (diff)
parent157f93898ae57cff875beb6549314bcb4ac66cdf (diff)
downloaddexon-solidity-0e8dbe5318aab58372dbdef5e38d7c90e3b453e3.tar
dexon-solidity-0e8dbe5318aab58372dbdef5e38d7c90e3b453e3.tar.gz
dexon-solidity-0e8dbe5318aab58372dbdef5e38d7c90e3b453e3.tar.bz2
dexon-solidity-0e8dbe5318aab58372dbdef5e38d7c90e3b453e3.tar.lz
dexon-solidity-0e8dbe5318aab58372dbdef5e38d7c90e3b453e3.tar.xz
dexon-solidity-0e8dbe5318aab58372dbdef5e38d7c90e3b453e3.tar.zst
dexon-solidity-0e8dbe5318aab58372dbdef5e38d7c90e3b453e3.zip
Merge remote-tracking branch 'upstream/develop' into evmjit
Diffstat (limited to 'SolidityExpressionCompiler.cpp')
-rw-r--r--SolidityExpressionCompiler.cpp3
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)));