Merge pull request #2844 from ethereum/jsoncompiler

Add header for jsonCompiler
This commit is contained in:
Alex Beregszaszi 2017-08-29 14:07:08 +01:00 committed by GitHub
commit e77e594120
4 changed files with 47 additions and 24 deletions

View File

@ -20,24 +20,20 @@
* JSON interface for the solidity compiler to be used from Javascript.
*/
#include <string>
#include <solc/jsonCompiler.h>
#include <libdevcore/Common.h>
#include <libdevcore/JSON.h>
#include <libsolidity/interface/StandardCompiler.h>
#include <libsolidity/interface/Version.h>
#include <string>
#include "license.h"
using namespace std;
using namespace dev;
using namespace solidity;
extern "C" {
/// Callback used to retrieve additional source files. "Returns" two pointers that should be
/// heap-allocated and are free'd by the caller.
typedef void (*CStyleReadFileCallback)(char const* _path, char** o_contents, char** o_error);
}
namespace
{

42
solc/jsonCompiler.h Normal file
View File

@ -0,0 +1,42 @@
/*
This file is part of solidity.
solidity is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
solidity is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with solidity. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @author Christian <c@ethdev.com>
* @date 2014
* JSON interface for the solidity compiler to be used from Javascript.
*/
#include <stdbool.h>
#ifdef __cplusplus
extern "C" {
#endif
/// Callback used to retrieve additional source files. "Returns" two pointers that should be
/// heap-allocated and are free'd by the caller.
typedef void (*CStyleReadFileCallback)(char const* _path, char** o_contents, char** o_error);
char const* license();
char const* version();
char const* compileJSON(char const* _input, bool _optimize);
char const* compileJSONMulti(char const* _input, bool _optimize);
char const* compileJSONCallback(char const* _input, bool _optimize, CStyleReadFileCallback _readCallback);
char const* compileStandard(char const* _input, CStyleReadFileCallback _readCallback);
#ifdef __cplusplus
}
#endif

View File

@ -20,6 +20,7 @@
#include <libevmasm/Assembly.h>
#include <libevmasm/ConstantOptimiser.h>
#include <solc/jsonCompiler.h>
#include <json/json.h>
@ -33,13 +34,6 @@ using namespace dev;
using namespace dev::eth;
namespace po = boost::program_options;
extern "C"
{
extern char const* compileJSON(char const* _input, bool _optimize);
typedef void (*CStyleReadFileCallback)(char const* _path, char** o_contents, char** o_error);
extern char const* compileStandard(char const* _input, CStyleReadFileCallback _readCallback);
}
namespace
{

View File

@ -23,22 +23,13 @@
#include <boost/test/unit_test.hpp>
#include <libdevcore/JSON.h>
#include <libsolidity/interface/Version.h>
#include <solc/jsonCompiler.h>
#include "../Metadata.h"
#include "../TestHelper.h"
using namespace std;
extern "C"
{
extern char const* version();
extern char const* license();
extern char const* compileJSON(char const* _input, bool _optimize);
extern char const* compileJSONMulti(char const* _input, bool _optimize);
extern char const* compileJSONCallback(char const* _input, bool _optimize, void* _readCallback);
extern char const* compileStandard(char const* _input, void* _readCallback);
}
namespace dev
{
namespace solidity