Source location as part of AST.

2 files changed, 33 insertions, 6 deletions

diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 09c7c8e8..ac8db160 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -86,6 +86,8 @@ static set<string> const g_combinedJsonArgs{
 	"bin",
 	"bin-runtime",
 	"clone-bin",
+	"srcmap",
+	"srcmap-runtime",
 	"opcodes",
 	"abi",
 	"interface",
@@ -658,6 +660,16 @@ void CommandLineInterface::handleCombinedJSON()
 			ostringstream unused;
 			contractData["asm"] = m_compiler->streamAssembly(unused, contractName, m_sourceCodes, true);
 		}
+		if (requests.count("srcmap"))
+		{
+			auto map = m_compiler->sourceMapping(contractName);
+			contractData["srcmap"] = map ? *map : "";
+		}
+		if (requests.count("srcmap-runtime"))
+		{
+			auto map = m_compiler->runtimeSourceMapping(contractName);
+			contractData["srcmap"] = map ? *map : "";
+		}
 		if (requests.count("devdoc"))
 			contractData["devdoc"] = m_compiler->metadata(contractName, DocumentationType::NatspecDev);
 		if (requests.count("userdoc"))
@@ -665,12 +677,22 @@ void CommandLineInterface::handleCombinedJSON()
 		output["contracts"][contractName] = contractData;
 	}
 
+	bool needsSourceList = requests.count("ast") || requests.count("srcmap") || requests.count("srcmap-runtime");
+	if (needsSourceList)
+	{
+		// Indices into this array are used to abbreviate source names in source locations.
+		output["sourceList"] = Json::Value(Json::arrayValue);
+
+		for (auto const& source: m_compiler->sourceNames())
+			output["sourceList"].append(source);
+	}
+
 	if (requests.count("ast"))
 	{
 		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), m_compiler->sourceIndices());
 			output["sources"][sourceCode.first] = Json::Value(Json::objectValue);
 			output["sources"][sourceCode.first]["AST"] = converter.json();
 		}
diff --git a/solc/jsonCompiler.cpp b/solc/jsonCompiler.cpp
index bc1305c5..8fc42d73 100644
--- a/solc/jsonCompiler.cpp
+++ b/solc/jsonCompiler.cpp
@@ -214,6 +214,10 @@ string compile(StringMap const& _sources, bool _optimize, CStyleReadFileCallback
 			contractData["opcodes"] = solidity::disassemble(compiler.object(contractName).bytecode);
 			contractData["functionHashes"] = functionHashes(compiler.contractDefinition(contractName));
 			contractData["gasEstimates"] = estimateGas(compiler, contractName);
+			auto sourceMap = compiler.sourceMapping(contractName);
+			contractData["srcmap"] = sourceMap ? *sourceMap : "";
+			auto runtimeSourceMap = compiler.sourceMapping(contractName);
+			contractData["srcmap-runtime"] = runtimeSourceMap ? *runtimeSourceMap : "";
 			ostringstream unused;
 			contractData["assembly"] = compiler.streamAssembly(unused, contractName, _sources, true);
 			output["contracts"][contractName] = contractData;
@@ -235,12 +239,13 @@ string compile(StringMap const& _sources, bool _optimize, CStyleReadFileCallback
 			output["formal"]["errors"] = errors;
 		}
 
+		// Indices into this array are used to abbreviate source names in source locations.
+		output["sourceList"] = Json::Value(Json::arrayValue);
+		for (auto const& source: compiler.sourceNames())
+			output["sourceList"].append(source);
 		output["sources"] = Json::Value(Json::objectValue);
-		for (auto const& source: _sources)
-		{
-			output["sources"][source.first] = Json::Value(Json::objectValue);
-			output["sources"][source.first]["AST"] = ASTJsonConverter(compiler.ast(source.first)).json();
-		}
+		for (auto const& source: compiler.sourceNames())
+			output["sources"][source]["AST"] = ASTJsonConverter(compiler.ast(source), compiler.sourceIndices()).json();
 	}
 
 	return Json::FastWriter().write(output);