cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

WIP-4

Browse Source
This commit is contained in:
Christian Parpart 2020-05-27 15:12:07 +02:00
parent 1966438472
commit a59e5d1dbe
7 changed files with 70 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libsolidity/ast/AST.h
View File

@ -453,21 +453,28 @@ protected:
/// @}
class ImportedContractDefinition: public Declaration
/**
* TODO: docstring
*/
class ImportedContractDefinition: public Declaration // TODO(needed?), public StructurallyDocumented
{
public:
ImportedContractDefinition(
int64_t _id,
SourceLocation const& _location,
ASTPointer<ASTString> const& _name,
ASTPointer<ASTString> const& _path
);
ASTPointer<ASTString> _name,
ASTPointer<ASTString> _path
):
Declaration(_id, _location, _name),
m_path{ std::move(_path) }
{}
void accept(ASTVisitor& _visitor) override;
void accept(ASTConstVisitor& _visitor) const override;
ASTPointer<ASTString> const& path() const noexcept { return m_path; }
private:
ASTPointer<ASTString> m_name;
ASTPointer<ASTString> m_path;
};

1
libsolidity/ast/ASTForward.h
View File

@ -43,6 +43,7 @@ class ImportDirective;
class Declaration;
class CallableDeclaration;
class OverrideSpecifier;
class ImportedContractDefinition;
class ContractDefinition;
class InheritanceSpecifier;
class UsingForDirective;

4
libsolidity/ast/ASTVisitor.h
View File

@ -56,6 +56,7 @@ public:
virtual bool visit(SourceUnit& _node) { return visitNode(_node); }
virtual bool visit(PragmaDirective& _node) { return visitNode(_node); }
virtual bool visit(ImportDirective& _node) { return visitNode(_node); }
virtual bool visit(ImportedContractDefinition& _node) { return visitNode(_node); }
virtual bool visit(ContractDefinition& _node) { return visitNode(_node); }
virtual bool visit(InheritanceSpecifier& _node) { return visitNode(_node); }
virtual bool visit(UsingForDirective& _node) { return visitNode(_node); }
@ -108,6 +109,7 @@ public:
virtual void endVisit(SourceUnit& _node) { endVisitNode(_node); }
virtual void endVisit(PragmaDirective& _node) { endVisitNode(_node); }
virtual void endVisit(ImportDirective& _node) { endVisitNode(_node); }
virtual void endVisit(ImportedContractDefinition& _node) { endVisitNode(_node); }
virtual void endVisit(ContractDefinition& _node) { endVisitNode(_node); }
virtual void endVisit(InheritanceSpecifier& _node) { endVisitNode(_node); }
virtual void endVisit(UsingForDirective& _node) { endVisitNode(_node); }
@ -182,6 +184,7 @@ public:
virtual bool visit(SourceUnit const& _node) { return visitNode(_node); }
virtual bool visit(PragmaDirective const& _node) { return visitNode(_node); }
virtual bool visit(ImportDirective const& _node) { return visitNode(_node); }
virtual bool visit(ImportedContractDefinition const& _node) { return visitNode(_node); }
virtual bool visit(ContractDefinition const& _node) { return visitNode(_node); }
virtual bool visit(InheritanceSpecifier const& _node) { return visitNode(_node); }
virtual bool visit(StructDefinition const& _node) { return visitNode(_node); }
@ -234,6 +237,7 @@ public:
virtual void endVisit(SourceUnit const& _node) { endVisitNode(_node); }
virtual void endVisit(PragmaDirective const& _node) { endVisitNode(_node); }
virtual void endVisit(ImportDirective const& _node) { endVisitNode(_node); }
virtual void endVisit(ImportedContractDefinition const& _node) { endVisitNode(_node); }
virtual void endVisit(ContractDefinition const& _node) { endVisitNode(_node); }
virtual void endVisit(InheritanceSpecifier const& _node) { endVisitNode(_node); }
virtual void endVisit(UsingForDirective const& _node) { endVisitNode(_node); }

12
libsolidity/ast/AST_accept.h
View File

@ -79,6 +79,18 @@ void StructuredDocumentation::accept(ASTConstVisitor& _visitor) const
_visitor.endVisit(*this);
}
void ImportedContractDefinition::accept(ASTVisitor& _visitor)
{
_visitor.visit(*this);
_visitor.endVisit(*this);
}
void ImportedContractDefinition::accept(ASTConstVisitor& _visitor) const
{
_visitor.visit(*this);
_visitor.endVisit(*this);
}
void ContractDefinition::accept(ASTVisitor& _visitor)
{
if (_visitor.visit(*this))

61
libsolidity/interface/CompilerStack.cpp
View File

@ -264,7 +264,7 @@ bool CompilerStack::parse()
sourcesToParse.push_back(newPath);
}
loadMissingInterfaces();
loadMissingInterfaces(parser.nextID());
}
}
@ -274,8 +274,17 @@ bool CompilerStack::parse()
return !m_hasError;
}
void CompilerStack::loadMissingInterfaces()
void CompilerStack::loadMissingInterfaces(int64_t _baseNodeID)
{
vector<ASTPointer<SourceUnit>> importedSources;
for (ASTPointer<SourceUnit> importedSourceUnit: importedSources)
{
Source source;
source.ast = importedSourceUnit;
auto const name = "__imported_interface_" + to_string(importedSourceUnit->id());
// TODO: maybe we want to make sure this isn't used already
m_sources[name] = move(source);
}
for (auto const& sourcePair: m_sources)
{
ASTPointer<SourceUnit> const& source = sourcePair.second.ast;
@ -285,32 +294,34 @@ void CompilerStack::loadMissingInterfaces()
for (ASTPointer<ASTNode> const& astNode: source->nodes())
{
if (auto* contract = dynamic_cast<ContractDefinition*>(astNode.get()))
if (auto const* importedContract = dynamic_cast<ImportedContractDefinition const*>(astNode.get()))
{
if (auto const fileName = contract->jsonSourceFile(); fileName.has_value())
string const fileName = *importedContract->path();
ReadCallback::Result result{false, string("File not supplied initially.")};
if (m_readFile)
result = m_readFile(ReadCallback::kindString(ReadCallback::Kind::ReadFile), fileName);
if (result.success)
{
printf("%s needs replacement\n", fileName->string().c_str());
string const& jsonString = result.responseOrErrorMessage;
Json::Value json;
util::jsonParseStrict(jsonString, json, nullptr);
ASTPointer<ContractDefinition> jsonContract = ASTJsonImporter{m_evmVersion}.jsonToContract(json);
ReadCallback::Result result{false, string("File not supplied initially.")};
if (m_readFile)
result = m_readFile(ReadCallback::kindString(ReadCallback::Kind::ReadFile), fileName.value().string());
if (result.success)
{
string const& jsonString = result.responseOrErrorMessage;
printf("jsonString: %s\n", jsonString.c_str());
Json::Value json;
util::jsonParseStrict(jsonString, json, nullptr);
ASTPointer<ContractDefinition> jsonContract = ASTJsonImporter{m_evmVersion}.jsonToContract(json);
//TODO: contract = *jsonContract;
}
else
{
m_errorReporter.fatalParserError(
31415_error, // TODO
contract->location(),
"Cannot load JSON source."
);
}
auto importedSource = make_shared<SourceUnit>(
_baseNodeID++,
SourceLocation{},
source->licenseString(),
vector{ jsonContract }
);
importedSources.push_back(importedSource);
}
else
{
m_errorReporter.fatalParserError(
31415_error, // TODO: ensure this number is unique (we should have a CI for that)
astNode->location(),
"Cannot load JSON source."
);
}
}
}

3
libsolidity/interface/CompilerStack.h
View File

@ -27,6 +27,7 @@
#include <libsolidity/interface/OptimiserSettings.h>
#include <libsolidity/interface/Version.h>
#include <libsolidity/interface/DebugSettings.h>
#include <libsolidity/ast/AST.h>
#include <libsmtutil/SolverInterface.h>
@ -360,7 +361,7 @@ private:
std::string applyRemapping(std::string const& _path, std::string const& _context);
void resolveImports();
void loadMissingInterfaces();
void loadMissingInterfaces(int64_t _baseNodeID);
/// @returns true if the source is requested to be compiled.
bool isRequestedSource(std::string const& _sourceName) const;

6
libsolidity/parsing/Parser.h
View File

@ -48,6 +48,9 @@ public:
ASTPointer<SourceUnit> parse(std::shared_ptr<langutil::Scanner> const& _scanner);
/// Returns the next AST node ID
int64_t nextID() { return ++m_currentNodeID; }
private:
class ASTNodeFactory;
@ -180,9 +183,6 @@ private:
std::optional<std::string> findLicenseString(std::vector<ASTPointer<ASTNode>> const& _nodes);
/// Returns the next AST node ID
int64_t nextID() { return ++m_currentNodeID; }
std::pair<LookAheadInfo, IndexAccessedPath> tryParseIndexAccessedPath();
/// Performs limited look-ahead to distinguish between variable declaration and expression statement.
/// For source code of the form "a[][8]" ("IndexAccessStructure"), this is not possible to