Commit Graph
22071 Commits
Author SHA1 Message Date
Christian 3fbe72cc47 Merge remote-tracking branch 'ethereum/develop' into sol_optimizer
Conflicts:
	libevmcore/Instruction.cpp
2014-11-10 13:30:59 +01:00
Christian 41b26e491b Replace function selector jump table by more resilient linear time check. 2014-11-10 13:13:53 +01:00
Christian 3a016ea0b4 Replace function selector jump table by more resilient linear time check. 2014-11-10 13:13:53 +01:00
Gav Wood d9822190c6 Merge pull request #498 from ethereum/solidity_cmake
add headers to solidity's add_library
2014-11-10 11:57:29 +00:00
Gav Wood 16007bd191 Merge pull request #494 from chriseth/sol_stateVariables
State variables for Solidity
2014-11-10 11:57:01 +00:00
Gav Wood af4f3e1eff Merge pull request #488 from LefterisJP/develop
solidity endToEnd testing gets equivalent CPP contracts
2014-11-10 11:56:09 +00:00
Christoph Jentzsch 99c3957eca undefine FILL_TESTS 2014-11-10 07:30:56 +01:00
Christoph Jentzsch 43bab79fbc Merge remote-tracking branch 'upstream/develop' into NewStateTests
Conflicts:
	test/state.cpp
	test/tmpFiller.json
2014-11-10 07:15:27 +01:00
Christoph Jentzsch b4d8ff5fdc specified user defined test 2014-11-10 07:12:29 +01:00
Christian 5af66a6cb3 Merge remote-tracking branch 'ethereum/develop' into sol_stateVariables
Conflicts:
	libsolidity/ExpressionCompiler.cpp
2014-11-10 00:45:58 +01:00
Christian 34a01c5c30 Merge remote-tracking branch 'ethereum/develop' into sol_stateVariables
Conflicts:
	libsolidity/ExpressionCompiler.cpp
2014-11-10 00:45:58 +01:00
Christian 91f9a7b7c4 Do not return after throw. 2014-11-10 00:42:12 +01:00
Lefteris Karapetsas e75bf22733 style fixes 2014-11-09 13:22:47 +01:00
Lefteris Karapetsas 39f90683e3 solidity endToEnd testing gets equivalent CPP contracts
- Just testing the waters of our codebase by introducing C++
  version of the contract functions in the end to end solidity tests

- This way there is no need to check for some specific output but
  instead strive for consistency between the C++ and solidity code.
2014-11-09 13:05:19 +01:00
Marek Kotewicz f2649a2cf5 Merge branch 'develop' into jsonrpc_interface 2014-11-08 23:52:20 +01:00
Marek Kotewicz d6e7b82d3c add headers to solidity's add_library 2014-11-08 23:48:24 +01:00
Gav Wood 215e9e2657 Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop 2014-11-08 18:14:36 +00:00
Gav Wood c447914a0b Merge pull request #490 from CJentzsch/StateBug
Quick fix for OOG in deep calls
2014-11-08 18:11:46 +00:00
Gav Wood dded93e31d Merge pull request #487 from chriseth/sol_arbitraryEvaluationOrder
Evaluate expressions in convenient order.
2014-11-08 18:10:18 +00:00
Gav Wood 6c6cf8d01c Merge pull request #487 from chriseth/sol_arbitraryEvaluationOrder
Evaluate expressions in convenient order.
2014-11-08 18:10:18 +00:00
Christian 1b1b72046b State variables. 2014-11-07 20:02:57 +01:00
Christian 64a4d77c8b State variables. 2014-11-07 20:02:57 +01:00
Christian 4c8e670530 Bugfix: Bit width of address types. 2014-11-07 17:34:50 +01:00
Marek Kotewicz 3f15425277 Merge branch 'develop' into jsonrpc_interface 2014-11-07 17:29:30 +01:00
Christoph Jentzsch a6ba0f7908 style 2014-11-07 15:16:42 +01:00
Gav Wood 8be49ae288 Fixes for warnings. Take note. 2014-11-07 13:50:51 +00:00
Christoph Jentzsch dbcce8b7b9 Clean up state tests 2014-11-07 14:10:00 +01:00
Christoph Jentzsch f88f5a7702 Merge remote-tracking branch 'upstream/develop' into StateBug 2014-11-07 13:42:44 +01:00
Christoph Jentzsch a77d78d994 Merge remote-tracking branch 'upstream/develop' into NewStateTests 2014-11-07 13:29:33 +01:00
Christoph Jentzsch ab3a1ec6ef Added random test execution 2014-11-07 13:29:13 +01:00
Marek Kotewicz 5a0f9a35c1 small fix in solidityCompiler 2014-11-07 13:22:45 +01:00
Christian dc8fb45e1f Merge remote-tracking branch 'ethereum/develop' into sol_optimizer 2014-11-07 02:13:31 +01:00
Christian 4fe64b22de Merge remote-tracking branch 'ethereum/develop' into sol_optimizer 2014-11-07 02:13:31 +01:00
Christian af0aa0f898 Evaluate expressions in convenient order. 2014-11-07 02:07:59 +01:00
Christian d7f4e02dbd Evaluate expressions in convenient order. 2014-11-07 02:07:59 +01:00
Gav Wood 8eb6675bc6 Merge pull request #478 from chriseth/sol_typePromotion
Type promotion
2014-11-06 23:43:03 +00:00
Gav Wood afa4e9f575 Merge pull request #478 from chriseth/sol_typePromotion
Type promotion
2014-11-06 23:43:03 +00:00
Gav Wood c5d0481836 Merge pull request #483 from chriseth/libevmcore
Moved instructions and assembly to new libevmcore.
2014-11-06 23:40:59 +00:00
Gav Wood 49e03ad4c9 Merge pull request #483 from chriseth/libevmcore
Moved instructions and assembly to new libevmcore.
2014-11-06 23:40:59 +00:00
Christian 7594813e1e Option to activate the optimizer for solidity. 2014-11-06 22:55:42 +01:00
Christian b66e58d6c9 Prevent optimizer from changing certain parts of the code. 2014-11-06 22:55:42 +01:00
Christian 225fc8e1b3 Option to activate the optimizer for solidity. 2014-11-06 22:55:42 +01:00
chriseth d9decb8f1d Removed superfluous braces. 2014-11-06 22:11:21 +01:00
Christian 1dfc8d9f2b Merge remote-tracking branch 'ethereum/develop' into sol_typePromotion 2014-11-06 22:07:02 +01:00
Christian 6c2e3ffd76 Merge remote-tracking branch 'ethereum/develop' into sol_typePromotion 2014-11-06 22:07:02 +01:00
Christian d3215fb4a6 Re-added some changes lost in merges. 2014-11-06 22:04:10 +01:00
chriseth e0ba1c79db Stylistic changes. 2014-11-06 21:55:01 +01:00
Paweł Bylica 51c3638cfe Merge branch 'develop-evmcc' into pr-jit 2014-11-06 18:08:30 +01:00
Paweł Bylica a352c6a178 Merge branch 'develop' into develop-evmcc 2014-11-06 18:01:09 +01:00
Paweł Bylica 109d0fa8db Merge branch 'develop-evmcc' into pr-jit 2014-11-06 17:59:03 +01:00