Commit Graph

11290 Commits

Author SHA1 Message Date
Paweł Bylica
d56553dfb6 Merge branch 'develop' into develop-evmcc 2014-10-31 12:35:51 +01:00
Marek Kotewicz
53b422c64a applied changes from ethereum.js 5538ff725235f30a9afbbedc098fd18dfd9f1293 2014-10-31 11:49:28 +01:00
Marek Kotewicz
57ef1fbd9b Merge branch 'develop' into mk_jsonrpc 2014-10-31 11:27:49 +01:00
Christoph Jentzsch
bc1aaa78a8 Merge remote-tracking branch 'upstream/develop' into stateTests
Conflicts:
	libethereum/AddressState.h
	test/vm.cpp
2014-10-31 09:46:20 +01:00
Christoph Jentzsch
3d17d7b2f1 Clean up FakeExtVM - move to state tests 2014-10-31 09:41:02 +01:00
Christian
9eb7fd274c Function selector and variable (un)packing. 2014-10-30 21:21:25 +01:00
Christian
cb9cb48dc7 Function selector and variable (un)packing. 2014-10-30 21:21:25 +01:00
Christian
f6c46c57f3 Function selector and variable (un)packing. 2014-10-30 21:21:25 +01:00
Christian
a5f3602738 Renamed file. 2014-10-30 21:21:25 +01:00
Christian
fa24c954a5 Renamed file. 2014-10-30 21:21:25 +01:00
Paweł Bylica
b2cd52eb0d Merge branch 'develop-evmcc' into pr-jit 2014-10-30 18:10:24 +01:00
artur-zawlocki
609d460025 CMakeLists updated, should now build without LLVM when EVMJIT is not enabled [#81588646] 2014-10-30 16:42:44 +00:00
Gav Wood
bf763824f3 Fix for Trie roots.
AddressState -> Account.
2014-10-30 13:47:28 +01:00
Marek Kotewicz
f301ee29f7 common changes 2014-10-30 13:06:45 +01:00
Paweł Bylica
fdca7c8eed Merge branch 'develop' into develop-evmcc
Conflicts:
	libevm/VM.h
	test/vm.cpp
2014-10-30 12:37:21 +01:00
Marek Kotewicz
7aa61b8297 Merge branch 'develop' into mk_jsonrpc 2014-10-30 11:56:53 +01:00
Christian
aeac2e67e6 Merge remote-tracking branch 'ethereum/develop' into sol_contractCompiler 2014-10-30 01:25:42 +01:00
Christian
877aa91c57 Contract compiler and also add ExpressionStatement to AST.
ExpressionStatement functions as glue between Statements and Expressions.

This way it is possible to detect when the border between statements and
expressions is crossed while walking the AST. Note that ExpressionStatement is
not the only border, almost every statement can contains expressions.
2014-10-30 01:25:42 +01:00
Christian
d3f5c6a0c8 Merge remote-tracking branch 'ethereum/develop' into sol_contractCompiler 2014-10-30 01:25:42 +01:00
Christian
6642992c97 Merge remote-tracking branch 'ethereum/develop' into sol_contractCompiler 2014-10-30 01:25:42 +01:00
Christian
d038c0751d Contract compiler and also add ExpressionStatement to AST.
ExpressionStatement functions as glue between Statements and Expressions.

This way it is possible to detect when the border between statements and
expressions is crossed while walking the AST. Note that ExpressionStatement is
not the only border, almost every statement can contains expressions.
2014-10-30 01:25:42 +01:00
Christian
7f19f3d133 Contract compiler and also add ExpressionStatement to AST.
ExpressionStatement functions as glue between Statements and Expressions.

This way it is possible to detect when the border between statements and
expressions is crossed while walking the AST. Note that ExpressionStatement is
not the only border, almost every statement can contains expressions.
2014-10-30 01:25:42 +01:00
Christian
b0d4e0dedf Contract compiler and also add ExpressionStatement to AST.
ExpressionStatement functions as glue between Statements and Expressions.

This way it is possible to detect when the border between statements and
expressions is crossed while walking the AST. Note that ExpressionStatement is
not the only border, almost every statement can contains expressions.
2014-10-30 01:25:42 +01:00
Christian
51349bdae5 Bugfix: Allow empty return statements without type checking. 2014-10-30 01:18:07 +01:00
Christoph Jentzsch
5de54b4c0d Clean up 2014-10-29 22:22:56 +01:00
Christoph Jentzsch
7fd46aacf6 Update tests to new definition 2014-10-29 22:22:56 +01:00
Christoph Jentzsch
02e232857d clean up PR 2014-10-29 22:22:55 +01:00
Christoph Jentzsch
e551b63cd1 Update SIGNEXTEND definition and tests
Conflicts:
	libevm/VM.h
	test/vmBitwiseLogicOperationTestFiller.json
2014-10-29 22:19:23 +01:00
Christoph Jentzsch
7f4fa9e2e1 New BNOT and SIGNEXTEND tets 2014-10-29 21:26:51 +01:00
Paweł Bylica
0a89d037e1 Merge branch 'develop' into pr-jit
Conflicts:
	libevm/VM.h
	test/vm.cpp
2014-10-29 20:19:07 +01:00
Christian
70d7d9b3bc Further const placement changes. 2014-10-29 19:41:07 +01:00
Christian
5d287e7ea2 Further const placement changes. 2014-10-29 19:41:07 +01:00
Christian
62822ffd92 Fixed placements of const. 2014-10-29 19:28:30 +01:00
Christian
c5c33485d8 Merge remote-tracking branch 'ethereum/develop' into sol_expressionCompiler 2014-10-29 19:26:02 +01:00
Christian
21b01a9647 Merge remote-tracking branch 'ethereum/develop' into sol_expressionCompiler 2014-10-29 19:26:02 +01:00
subtly
b62bb50f6c Merge branch 'develop' into crypto 2014-10-29 19:25:03 +01:00
subtly
88481e0f26 remove asserts for recid being 2, which is rare, but may occur 2014-10-29 19:24:23 +01:00
Christoph Jentzsch
a5ae5f4fe9 Merge remote-tracking branch 'upstream/develop' into stateTests 2014-10-29 19:22:56 +01:00
Gav Wood
5110ffe304 Merge pull request #442 from chriseth/sol_fix_break
Parser fix: Consume break and continue.
2014-10-29 19:07:39 +01:00
Gav Wood
4c895be53f Merge pull request #434 from CJentzsch/vmtraceBugFix
Vmtrace bug fix
2014-10-29 19:06:54 +01:00
subtly
7f7a800fa1 recover public key from ecdsa,v sig using cryptopp 2014-10-29 18:46:57 +01:00
Christoph Jentzsch
4df3ca25f3 Merge remote-tracking branch 'upstream/develop' into stateTests 2014-10-29 17:25:24 +01:00
Christoph Jentzsch
3565d42a14 Restructure state tests. Remove FakeStateClass 2014-10-29 17:25:02 +01:00
Christian
03a6cf0e81 Compiler for assignments. 2014-10-29 14:33:25 +01:00
Christian
e08065a2fb Compiler for assignments. 2014-10-29 14:33:25 +01:00
Christian
b5a4d12fa3 Compiler for assignments. 2014-10-29 14:33:25 +01:00
Christian
d706631412 NEG->BNOT change 2014-10-29 14:26:37 +01:00
Christian
01224287f5 NEG->BNOT change 2014-10-29 14:26:37 +01:00
Christian
f6fabb268b Merge remote-tracking branch 'ethereum/develop' into sol_contractCompiler
Conflicts:
	libsolidity/Types.cpp
2014-10-29 13:54:36 +01:00
Christian
9eacf5737f Merge remote-tracking branch 'ethereum/develop' into sol_contractCompiler
Conflicts:
	libsolidity/Types.cpp
2014-10-29 13:54:36 +01:00