Commit Graph

447 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
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
Christian
34a01c5c30 Merge remote-tracking branch 'ethereum/develop' into sol_stateVariables
Conflicts:
	libsolidity/ExpressionCompiler.cpp
2014-11-10 00:45:58 +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
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
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
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
Marek Kotewicz
5a0f9a35c1 small fix in solidityCompiler 2014-11-07 13:22:45 +01:00
Christian
4fe64b22de Merge remote-tracking branch 'ethereum/develop' into sol_optimizer 2014-11-07 02:13:31 +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
c5d0481836 Merge pull request #483 from chriseth/libevmcore
Moved instructions and assembly to new libevmcore.
2014-11-06 23:40:59 +00:00
Christian
1dfc8d9f2b Merge remote-tracking branch 'ethereum/develop' into sol_typePromotion 2014-11-06 22:07:02 +01:00
Christian
26150755f6 Merge remote-tracking branch 'ethereum/develop' into sol_optimizer 2014-11-06 15:34:35 +01:00
Christian
34f16940ea Moved instructions and assembly to new libevmcore. 2014-11-06 14:50:18 +01:00
Christian
008a91ca9d Ignore break and continue outside of loops. 2014-11-06 02:46:48 +01:00
Christian
b20e70b4b4 Tests for break and continue in nested loops. 2014-11-06 02:46:40 +01:00
Christian
08cba0653f Support for negative literals. 2014-11-06 02:44:43 +01:00
Christian
b9cc3baf40 Fixes for test framework (sign the transaction). 2014-11-06 02:36:39 +01:00
Christian
04e7977ea1 Type promotion fixes and tests. 2014-11-06 02:36:39 +01:00
Christian
010710353a Proper type promotion and conversion. 2014-11-06 02:36:39 +01:00
Christian
e22cad4d35 Tests for type conversion at comparison. 2014-11-06 02:22:24 +01:00
Gav Wood
4b9dcd95ce Compile warnings fixed. 2014-11-05 22:17:05 +00:00
Gav Wood
67d0ea5cc1 Merge pull request #460 from CJentzsch/stateTests
Clean up and organize tests + state class tests
2014-11-05 22:11:33 +00:00
Gav Wood
4fd530646f Merge pull request #461 from chriseth/sol_contractCompiler
Solidity contract compiler
2014-11-05 22:10:25 +00:00
Christoph Jentzsch
139668dea4 style 2014-11-05 21:55:10 +01:00
Christoph Jentzsch
2ce298bca5 undefine FILL_TESTS 2014-11-05 21:07:22 +01:00
Christoph Jentzsch
e53f831510 Added dynamic jump out of code test 2014-11-05 21:02:16 +01:00
Christoph Jentzsch
8e6bfb1fb3 Merge remote-tracking branch 'upstream/develop' into stateTests
Conflicts:
	test/vm.cpp
	test/vmArithmeticTestFiller.json
	test/vmSha3TestFiller.json
2014-11-05 20:24:26 +01:00
Christoph Jentzsch
1d156a5726 Moved code export to export function in ImportHelper 2014-11-05 20:21:33 +01:00
subtly
d59a648985 Merge branch 'develop' into crypto
Conflicts:
	test/crypto.cpp
2014-11-05 19:08:25 +01:00
Christian
693bc90275 Further framework fix. 2014-11-05 18:50:23 +01:00
Gav Wood
7586bd2761 Merge pull request #473 from CJentzsch/newTests
new tests + reorganization
2014-11-05 17:42:47 +00:00
Christoph Jentzsch
6b6bb65eb8 Update transactions, style fix 2014-11-05 18:30:38 +01:00
Christian
849ccb4159 Fix test framework after change to Transaction. 2014-11-05 18:10:37 +01:00
Christian
3e73402ba3 Merge remote-tracking branch 'ethereum/develop' into HEAD
Conflicts:
	libsolidity/Compiler.cpp
	test/solidityCompiler.cpp
2014-11-05 17:56:38 +01:00
Christoph Jentzsch
b67ed5d065 remove vmSystemOperationsTest completely 2014-11-05 16:27:22 +01:00
subtly
90a0998968 Merge branch 'develop' into crypto 2014-11-05 16:11:06 +01:00
Christoph Jentzsch
26f4637205 Merge remote-tracking branch 'upstream/develop' into stateTests
Conflicts:
	test/state.cpp
	test/vm.cpp
2014-11-05 15:55:50 +01:00
Gav Wood
f8deb4b046 Transaction documentation and build fixes. 2014-11-05 14:32:23 +00:00
Gav Wood
d7da8b1aaa Documentation for Transaction. 2014-11-05 14:28:29 +00:00
Gav Wood
aa41f1c6f1 Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop 2014-11-05 13:48:23 +00:00
Gav Wood
07ee2e4847 Classify Transaction. 2014-11-05 13:45:19 +00:00