Commit Graph

326 Commits

Author SHA1 Message Date
Alex Beregszaszi
8169e149c9 Rename CompilerStack.interface to CompilerStack.contractABI 2017-05-19 15:57:36 +01:00
chriseth
dea7b864e6 Compact format for AST-Json with backwards compatibility 2017-05-17 11:14:33 +02:00
Alex Beregszaszi
a95c86e8e4 Catch errors gracefully in CLI assembler 2017-05-06 10:43:58 +01:00
Alex Beregszaszi
4eae971b31 Export compileStandard on emscripten 2017-04-24 16:36:37 +01:00
chriseth
017fedebfe Add missing space. 2017-04-24 14:22:39 +02:00
Alex Beregszaszi
b7951be44a Add exception guard to ReadFileCallback in CLI 2017-04-22 14:08:28 +01:00
Alex Beregszaszi
4566b4b336 Pass readFileCallback to StandardCompiler in CLI 2017-04-20 23:22:23 +01:00
Alex Beregszaszi
ed64c849f5 Merge pull request #2145 from ethereum/cli-readfile-permissions
Check for path permissions before opening file in the CLI file reader
2017-04-20 20:31:27 +01:00
Alex Beregszaszi
b30fad4a49 Check for path permissions before opening file in the CLI file reader 2017-04-20 20:01:17 +01:00
Alex Beregszaszi
4f3c76364c Export StandardCompiler as compileStandard in soljson 2017-04-20 19:38:00 +01:00
Alex Beregszaszi
8c9e57fadf Add --standard-json to solc 2017-04-20 19:38:00 +01:00
Alex Beregszaszi
8bf842050e Support --allow-paths in the CLI 2017-04-20 15:39:30 +01:00
Alex Beregszaszi
54dcb0e11b Keep gas values as a string in CompilerStack::gasEstimate 2017-04-13 02:18:29 +01:00
Alex Beregszaszi
fe4fccaaf2 The gasEstimates objects must always be present in the jsonCompiler even if empty (backwards compat) 2017-04-13 02:17:40 +01:00
Alex Beregszaszi
328f2b0a8e Use new gasEstimate in CLI 2017-04-13 02:17:40 +01:00
Alex Beregszaszi
d90fd439e2 Use new gasEstimate in jsonCompiler 2017-04-13 02:17:40 +01:00
Alex Beregszaszi
bd48f181b5 Merge pull request #2098 from ethereum/sourceformatter
Introduce formatExceptionInformation
2017-04-10 14:46:59 +01:00
Alex Beregszaszi
a182dfe266 Remove empty wrapper formatError from jsonCompiler 2017-04-10 14:07:37 +01:00
Alex Beregszaszi
b1db6eac8b Introduce formatExceptionInformation 2017-04-10 14:07:36 +01:00
Alex Beregszaszi
623b8eb107 Pull out ReadFile from CompilerStack 2017-04-10 12:49:47 +01:00
Alex Beregszaszi
e0ff70778a Rename ErrorMesage to ErrorMessage 2017-03-16 23:59:36 +00:00
chriseth
14196f2621 Allow long library names. 2017-03-14 11:58:43 +01:00
chriseth
31a5e5bfef Do not overwrite files unless forced. 2017-03-10 19:23:43 +01:00
chriseth
7a24a5764e Add line info to serious exceptions. 2017-02-24 19:32:41 +01:00
Alex Beregszaszi
a5d0fd9c8a Do not create directories . and .. 2017-02-06 14:27:54 +00:00
Alex Beregszaszi
46412473b6 Always escape filenames in solc 2017-02-05 19:19:29 +00:00
VoR0220
b3f0d713a1
fix for linker wrt binaries generated with import statements
Signed-off-by: VoR0220 <rj@erisindustries.com>
2017-01-30 13:41:33 -06:00
Alex Beregszaszi
102fd7ee5d Merge pull request #1604 from ethereum/checksums
Warn about invalid checksums of addresses.
2017-01-26 14:42:34 +00:00
Alex Beregszaszi
024061b828 Merge pull request #1610 from ethereum/assemblyModeError
Proper error reporting for assembly mode.
2017-01-26 14:41:39 +00:00
Alex Beregszaszi
84bf547f21 Add option to solc to use literal sources in metadta 2017-01-26 13:24:59 +00:00
chriseth
8e29d636f7 Header cleanup. 2017-01-26 13:47:57 +01:00
chriseth
1b097fd3c7 Proper error reporting for assembly mode. 2017-01-26 13:45:23 +01:00
chriseth
3949624a61 Also check library addresses. 2017-01-24 23:37:48 +01:00
Rhett Aultman
610156fb92 Fix bad merge artifact(?)
Looks like merging up munged line 188 in CommandLineInterface.cpp,
so that a string literal was being used where a global variable should
be.
2017-01-16 12:32:58 -05:00
Rhett Aultman
0c98e4b2da Stylistic corrections 2017-01-16 12:32:57 -05:00
Rhett Aultman
071b936b37 Only avoid collision if it's the same file
@chriseth had suggested that it would be better if contracts were
referenced in a file:contract notation, and that we output .bin files
that prepend original path names if necessary to avoid a collision.

This commit is mostly a draft; it still needs to be run through the test
suite.
2017-01-16 12:32:57 -05:00
chriseth
c111d6e27e Merge pull request #1491 from ameten/refactoring
Just refactored some code
2016-12-12 21:43:04 +01:00
Federico Bond
dac95ce398 Remove unused variable inputFiles 2016-12-11 00:41:41 -03:00
Danil Nemirovsky
e5a992937c - alphabetically sorted string constants per name. 2016-12-08 21:33:09 +03:00
Danil Nemirovsky
f1cf9eb1ea - moved string constants into common place;
- replaced string literals with string constants.
2016-12-08 21:33:09 +03:00
Alex Beregszaszi
35325ee7c3 Update metadata documentation 2016-12-01 16:03:59 +01:00
chriseth
659b635b2d Make sure some keys are present. 2016-12-01 16:03:59 +01:00
chriseth
5789eaa78d Metadata stamp. 2016-12-01 16:03:59 +01:00
Federico Bond
29e304d3bc Fix typos (existant -> existent) 2016-12-01 01:29:30 -03:00
VoR0220
3f9f725737 Fix licensing headers
Signed-off-by: VoR0220 <rj@erisindustries.com>
2016-11-23 12:22:33 +01:00
Alex Beregszaszi
81c50143f2 Move JSON helpers to libdevcore/json 2016-11-15 17:38:18 +00:00
Alex Beregszaszi
9719cf38e6 Move InterfaceHandler from string to JSON 2016-11-15 15:55:25 +00:00
Rhett Aultman
58e75c7a48 Unimplemented features moved to their own exception (#1361)
Unimplemented features moved to their own exception

InternalCompilerError is an exception that really should be reserved for
actual internal errors of the compiler.  Unimplemented features can now
use either solUnimplemented( ) or, if it should be conditional, then
solUnimplementedAssert( ).

* Revert some unimplemented exceptions, add handlers

The jsonCompiler and CommandLineInterface needed handlers for the
new UnimplementedFeatureException, and some cases I had moved on to
the new exception were better treated as real internal compiler
errors.

* Standardize on "Unimplemented feature" message
2016-11-14 20:41:58 +00:00
Kevin Boxhoorn
97703ac6e4 Add import remapping documentation to solc --help
Derived from the docs found [here](https://solidity.readthedocs.io/en/develop/miscellaneous.html#using-the-commandline-compiler).
Fixes #1207.
2016-10-15 17:36:40 +11:00
Alex Beregszaszi
bab96ee1e0 Disallow unknown options in solc 2016-10-06 16:32:56 +02:00
chriseth
c641ca26ec Merge pull request #1009 from pirapira/separate_exceptions
Separate the try/catch blocks on JSON and formal methods output generation
2016-09-07 15:13:41 +02:00
chriseth
71a4074ad0 Merge pull request #997 from chriseth/linkingwithunderscores
Fix linking for libraries with underscores.
2016-09-06 12:52:31 +02:00
chriseth
8c315a18c9 Fix compiler error. 2016-09-06 11:57:21 +02:00
chriseth
f869f25b84 More comments about size constants. 2016-09-06 11:12:55 +02:00
Yoichi Hirai
3f2027ee5f Separate the try/catch blocks on JSON output generation and formal method output generation.
For the reason, see @axic's comment here https://github.com/ethereum/solidity/pull/994#discussion_r77272236
and the following discussion.
2016-09-05 18:00:24 +02:00
chriseth
a787e70594 Fix linking for libraries with underscores. 2016-09-02 01:17:02 +02:00
chriseth
52ee47190d Catch more exceptions in jsonCompiler. 2016-09-01 20:14:00 +02:00
Bob Summerwill
be3f4bda21 Corrected accidental non-ANSI characters in comments. 2016-08-31 13:01:48 -07:00
Christopher Gilbert
68bd463bea Code review changes: Renamed function and added some documentation about what the function does and why 2016-08-30 20:32:30 +01:00
Christopher Gilbert
a91bca7937 Code review changes: stylistic changes, and removed redundant call to set locale. 2016-08-30 16:13:21 +01:00
Christopher Gilbert
1b9147d7db Fixed a bug causing solc to crash on startup due to invalid environment settings for locale 2016-08-30 12:29:37 +01:00
Denton Liu
e00f802f72 Remove standard contracts 2016-08-19 10:34:50 -04:00
chriseth
c282ab379a Merge pull request #918 from winsvega/solremove4
remove solidity --interface
2016-08-17 17:55:40 +02:00
chriseth
9f22426d10 Merge pull request #912 from chriseth/readFromStdin
Read from files and stdin.
2016-08-17 15:49:47 +02:00
Dimitry
e5e2597702 remove solidity --interface 2016-08-17 12:39:10 +03:00
chriseth
c499470b1c BREAKING: Streamline json output field naming. (#763) 2016-08-17 09:58:24 +02:00
chriseth
c54f31d308 Read from files and stdin. 2016-08-16 17:08:00 +02:00
yann300
d3b2a1c77b sourcemapping 2016-08-02 11:32:25 +02:00
chriseth
f463382f9d Bugfix: Correctly use srcmap-runtime. 2016-08-01 12:05:50 +02:00
chriseth
c55584d3e2 Source location as part of AST. 2016-07-20 19:45:43 +02:00
chriseth
9a9a815fc9 Provide formal version in json output. 2016-07-18 18:26:56 +02:00
chriseth
e90ebcd63b Store non-canonical version. 2016-07-11 15:31:38 +02:00
chriseth
781b7eaefe Fix crash for input from stdin. 2016-06-15 01:35:36 +02:00
chriseth
3150ab2bcf Allow remappings to change depending on the context. 2016-06-08 18:16:46 +02:00
VoR0220
fb89e69061 much better and simpler way of handling this 2016-05-13 13:51:41 -05:00
rainbeam
eb20841740 wrap solc add_executable
Allows static linking.
2016-05-01 00:43:16 +01:00
chriseth
ed9da5171b Source location for inline assembly. 2016-04-19 18:35:21 +02:00
chriseth
f227050c20 Make solidity independent from ethcore. 2016-04-06 20:56:00 +02:00
Dimitry
858c41260d rename namespace for instruction.h/cpp in libevmasm 2016-04-02 15:56:43 +03:00
Dimitry
ccbd3ff63f move libevmcore to solidity 2016-04-01 23:11:01 +03:00
chriseth
f049430723 Code generation (missing external access and source locations). 2016-03-30 02:37:00 +02:00
chriseth
949b00ed59 Parsing for inline assembly. 2016-03-30 02:37:00 +02:00
chriseth
e5514becb8 BREAKING: Implement delegatecall and make default for library calls. 2016-03-11 17:49:32 +01:00
chriseth
0c5d892dba Only allow including from allowed directories. 2016-01-29 23:11:16 +01:00
chriseth
bdbb7d8a40 Merge pull request #370 from chriseth/redirects
Path remappings for solc.
2016-01-28 17:05:12 +01:00
chriseth
ebc1dce073 Read files via callback. 2016-01-26 23:25:07 +01:00
chriseth
db2f3c5714 Provide remappings for solc. 2016-01-25 21:01:55 +01:00
chriseth
287f0a2ddf Autoload files in solc. 2016-01-12 01:05:05 +01:00
chriseth
08cb74a1de Merge pull request #290 from chriseth/fix_gas_iterator
Fix: Segfaults connected to paramater types.
2015-12-10 15:47:35 +01:00
chriseth
7dccca5ca9 Removed obsolete dockerfile. 2015-12-10 13:03:08 +01:00
chriseth
39f57a9c71 Fix: Segfaults connected to paramater types.
parameterTypes does not return by const reference anymore.
2015-12-09 17:57:34 +01:00
Lefteris Karapetsas
40cfcd40d7 Fix the build - library is not a module
The Module::Object rule is something only eth_use() and friends can
understand. target_link_libraries() on the other hand needs only the
actual library object to link to.
2015-12-04 10:11:09 +01:00
Bob Summerwill
2a49857ff9 Alternative case-consistency fix for libsolidity. Just using fully-qualified scoped name in eh_use instead. 2015-12-03 10:15:27 -08:00
Gav Wood
bff172cf65 Fix up for new API from EIP-1.1. 2015-11-21 14:34:21 +01:00
chriseth
a957322fd7 Preliminary why3 code output. 2015-10-27 00:49:27 +01:00
chriseth
e3dffb611f File reorganisation. 2015-10-21 00:46:01 +02:00
chriseth
370b6db3ae Do not forget to export the new symbol. 2015-10-15 19:18:14 +02:00
chriseth
cb869fd5a4 Style. 2015-10-15 18:29:56 +02:00
chriseth
52ef07695a Multiple sources for json compiler. 2015-10-15 18:29:56 +02:00
LianaHus
675aed1edf fixed new tests 2015-10-15 11:50:25 +02:00
LianaHus
c3491e4469 errors instead of exceptions
Conflicts:
	libsolidity/CompilerStack.cpp
	libsolidity/NameAndTypeResolver.cpp
	libsolidity/NameAndTypeResolver.h
	libsolidity/TypeChecker.cpp
	test/libsolidity/SolidityNameAndTypeResolution.cpp
2015-10-14 20:37:41 +02:00
LianaHus
742e5b259a added Error class for all kind of errors
Conflicts:
	libsolidity/Exceptions.h
2015-10-14 20:27:41 +02:00
chriseth
95fa516d9e Support warnings. 2015-10-02 22:54:30 +02:00
LianaHus
53d0684cb4 -fixed the warning printing
-style fixes
2015-10-02 12:38:48 +02:00
LianaHus
2706846f43 -added warning case to cl compiler
-modified warning msg
2015-10-02 12:38:48 +02:00
chriseth
09f1f1e595 Merge pull request #89 from chriseth/fixCombinedJson
Fix "combined json" output.
2015-09-23 15:55:14 +02:00
chriseth
317d173218 Fix "combined json" output. 2015-09-23 14:34:42 +02:00
chriseth
42c0009205 Error formatting. 2015-09-21 20:03:53 +02:00
Marek Kotewicz
352c196eb3 Merge pull request #79 from arkpar/cmake
Per project versioning
2015-09-17 10:34:15 +02:00
arkpar
bda7dbd30a per project versioning 2015-09-16 15:55:25 +02:00
chriseth
9de174ce2e Merge pull request #75 from chriseth/exportRuntimeBytecodeForJson
Export runtime bytecode and version.
2015-09-15 12:42:44 +02:00
chriseth
b55cc00180 Export runtime bytecode and version. 2015-09-15 12:27:29 +02:00
Arkadiy Paronyan
613ba2c3f1 Merge pull request #73 from chriseth/emscripten
Changes required to compile on emscripten target.
2015-09-14 18:51:56 +02:00
chriseth
6b4e564b7c Changes required to compile on emscripten target. 2015-09-14 18:36:39 +02:00
chriseth
70c0ed4129 Commandline interface for the linker. 2015-09-11 19:35:01 +02:00
chriseth
a9edc7b1a6 Transition from bytecode to more general linker objects. 2015-09-11 15:21:37 +02:00
chriseth
ea981cb0f5 Merge pull request #41 from LianaHus/sol_rename_getters
solidity interface changes. removing get prefix
2015-09-08 16:47:58 +02:00
LianaHus
df8c82bc60 - renamed AST to ast and ABI to abi
- style fixes
2015-09-08 14:30:21 +02:00
LianaHus
1b5e6fc9e7 renamed getter functions 2015-09-08 13:12:00 +02:00
debris
619c91321b changes required to compile solidity in a single project 2015-09-01 15:30:26 +02:00
Gav Wood
aad59bd1aa Merge pull request #27 from LianaHus/sol_runtime_binary_by_-solc
added option to solc to output runtime part of the contract
2015-08-27 22:37:51 +02:00
debris
1741e89c09 client refactor 2015-08-27 14:28:31 +02:00
LianaHus
a37c0dddc5 added option to solc to output runtimr part of the contract 2015-08-24 17:24:48 +02:00
arkpar
3ea1a62fa9 Refactoreed CMakeLists for new module system 2015-08-24 15:51:52 +02:00
chriseth
0906042ce0 More information for help screen, some fixes for argument parsing. 2015-08-20 02:12:37 +02:00
chriseth
895a0a819f Moved solc files. 2015-08-19 13:12:08 +02:00