aboutsummaryrefslogtreecommitdiffstats
path: root/solc
diff options
context:
space:
mode:
authorLianaHus <liana@ethdev.com>2015-09-08 20:30:21 +0800
committerLianaHus <liana@ethdev.com>2015-09-08 20:30:21 +0800
commitdf8c82bc60f4d9238635082f9a9f41a45b5e2b98 (patch)
treef52b1582b3f532e3b8fcdc91f85ede89e21e8510 /solc
parent02d4198242ec3dacc7af31c9446c83adcf014de9 (diff)
downloaddexon-solidity-df8c82bc60f4d9238635082f9a9f41a45b5e2b98.tar
dexon-solidity-df8c82bc60f4d9238635082f9a9f41a45b5e2b98.tar.gz
dexon-solidity-df8c82bc60f4d9238635082f9a9f41a45b5e2b98.tar.bz2
dexon-solidity-df8c82bc60f4d9238635082f9a9f41a45b5e2b98.tar.lz
dexon-solidity-df8c82bc60f4d9238635082f9a9f41a45b5e2b98.tar.xz
dexon-solidity-df8c82bc60f4d9238635082f9a9f41a45b5e2b98.tar.zst
dexon-solidity-df8c82bc60f4d9238635082f9a9f41a45b5e2b98.zip
- renamed AST to ast and ABI to abi
- style fixes
Diffstat (limited to 'solc')
-rw-r--r--solc/CommandLineInterface.cpp12
-rw-r--r--solc/jsonCompiler.cpp2
2 files changed, 7 insertions, 7 deletions
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 3ce6a2d9..6a90c69f 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -522,7 +522,7 @@ void CommandLineInterface::handleCombinedJSON()
output["sources"] = Json::Value(Json::objectValue);
for (auto const& sourceCode: m_sourceCodes)
{
- ASTJsonConverter converter(m_compiler->AST(sourceCode.first));
+ ASTJsonConverter converter(m_compiler->ast(sourceCode.first));
output["sources"][sourceCode.first] = Json::Value(Json::objectValue);
output["sources"][sourceCode.first]["AST"] = converter.json();
}
@@ -546,7 +546,7 @@ void CommandLineInterface::handleAst(string const& _argStr)
{
vector<ASTNode const*> asts;
for (auto const& sourceCode: m_sourceCodes)
- asts.push_back(&m_compiler->AST(sourceCode.first));
+ asts.push_back(&m_compiler->ast(sourceCode.first));
map<ASTNode const*, eth::GasMeter::GasConsumption> gasCosts;
if (m_compiler->runtimeAssemblyItems())
gasCosts = GasEstimator::breakToStatementLevel(
@@ -562,12 +562,12 @@ void CommandLineInterface::handleAst(string const& _argStr)
string postfix = "";
if (_argStr == g_argAstStr)
{
- ASTPrinter printer(m_compiler->AST(sourceCode.first), sourceCode.second);
+ ASTPrinter printer(m_compiler->ast(sourceCode.first), sourceCode.second);
printer.print(data);
}
else
{
- ASTJsonConverter converter(m_compiler->AST(sourceCode.first));
+ ASTJsonConverter converter(m_compiler->ast(sourceCode.first));
converter.print(data);
postfix += "_json";
}
@@ -584,7 +584,7 @@ void CommandLineInterface::handleAst(string const& _argStr)
if (_argStr == g_argAstStr)
{
ASTPrinter printer(
- m_compiler->AST(sourceCode.first),
+ m_compiler->ast(sourceCode.first),
sourceCode.second,
gasCosts
);
@@ -592,7 +592,7 @@ void CommandLineInterface::handleAst(string const& _argStr)
}
else
{
- ASTJsonConverter converter(m_compiler->AST(sourceCode.first));
+ ASTJsonConverter converter(m_compiler->ast(sourceCode.first));
converter.print(cout);
}
}
diff --git a/solc/jsonCompiler.cpp b/solc/jsonCompiler.cpp
index 207ecb3c..b6b9f512 100644
--- a/solc/jsonCompiler.cpp
+++ b/solc/jsonCompiler.cpp
@@ -179,7 +179,7 @@ string compile(string _input, bool _optimize)
output["sources"] = Json::Value(Json::objectValue);
output["sources"][""] = Json::Value(Json::objectValue);
- output["sources"][""]["AST"] = ASTJsonConverter(compiler.AST("")).json();
+ output["sources"][""]["AST"] = ASTJsonConverter(compiler.ast("")).json();
return Json::FastWriter().write(output);
}