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
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
Christian
2432e2dbf3
Bugfix: Special case of statements starting with type conversion.
2014-11-05 07:35:31 +01:00
Gav Wood
2d9771e4fe
Merge pull request #465 from ethereum/bugfix
...
jsonrpc to run once, and only when jsonrpc test suite is invoked
2014-11-04 20:08:48 +00:00
subtly
838b6b4b44
coding standards. suite setup struct.
2014-11-04 15:24:02 +01:00
Gav Wood
b01be526db
Merge pull request #468 from CJentzsch/bugfix
...
bugfix jumps after push
2014-11-04 13:29:40 +00:00
subtly
adc08af7c6
Merge branch 'develop' into bugfix
2014-11-04 13:46:33 +01:00
Christoph Jentzsch
37939c565d
Merge pull request #454 from jorisbontje/423-dockerfile
...
update Dockerfile with cryptopp and jsonrpc dependencies, fixes #423
Cleaned up jsonrpc test
Forgot the #if
Undo jsonrpc test changes
2014-11-04 13:43:13 +01:00
Christoph Jentzsch
919d3c56eb
# This is a combination of 2 commits.
...
# The first commit's message is:
Merge pull request #454 from jorisbontje/423-dockerfile
update Dockerfile with cryptopp and jsonrpc dependencies, fixes #423
Cleaned up jsonrpc test
# This is the 2nd commit message:
Forgot the #if
2014-11-04 13:43:04 +01:00
subtly
2d7176b79c
json rpc only runs once, and only when json rpc test suite is invoked
2014-11-04 10:56:22 +01:00
Christian
bfb2ae9f3c
Test adjustments.
2014-11-03 16:30:11 +01:00
Christian
8a9da8648d
Merge remote-tracking branch 'ethereum/develop' into sol_contractCompiler
...
Conflicts:
alethzero/CMakeLists.txt
2014-11-03 16:13:40 +01:00
Christian
dab09c595a
Some tests and bugfixes for the compiler.
2014-11-03 16:11:40 +01:00
Christian
6951657c59
Bugfix: Swap before mod and div.
2014-11-03 15:44:22 +01:00
Christian
47d37b12a3
Bugfix: Swap before mod and div.
2014-11-03 12:23:53 +01:00
Marek Kotewicz
07d08e3af3
boost_auto_test_suite for jsonrpc && @brief description for WebThreeStubServer
2014-10-31 17:30:04 +01:00
Christian
2088aaa85b
Merge remote-tracking branch 'ethereum/develop' into sol_contractCompiler
...
Conflicts:
libsolidity/AST.cpp
libsolidity/AST.h
libsolidity/Compiler.cpp
libsolidity/Compiler.h
libsolidity/NameAndTypeResolver.h
libsolidity/Types.cpp
solc/main.cpp
test/solidityCompiler.cpp
2014-10-31 17:20:27 +01:00
Marek Kotewicz
f64c53ac62
Merge branch 'develop' into mk_jsonrpc
2014-10-31 17:13:32 +01:00
Marek Kotewicz
d645388fa9
fixed style issue
2014-10-31 17:13:06 +01:00
Christian
c0528f511a
Actual contract creator and add solidity to AlethZero interface.
2014-10-31 14:37:23 +01:00
Gav Wood
882b8ad089
Big fixes.
2014-10-31 14:35:13 +01:00
chriseth
be45d11e4c
Merge pull request #415 from chriseth/sol_expressionCompiler
...
Solidity expression compiler
2014-10-31 13:42:24 +01:00
Gav Wood
882ee7db3e
Merge pull request #432 from CJentzsch/newTests
...
Added tests for SIGNEXTEND and BNOT
2014-10-31 13:12:25 +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
Christian
f6c46c57f3
Function selector and variable (un)packing.
2014-10-30 21:21:25 +01:00
Christian
fa24c954a5
Renamed file.
2014-10-30 21:21:25 +01: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
Marek Kotewicz
7aa61b8297
Merge branch 'develop' into mk_jsonrpc
2014-10-30 11:56:53 +01:00
Christian
6642992c97
Merge remote-tracking branch 'ethereum/develop' into sol_contractCompiler
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
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
Christian
70d7d9b3bc
Further const placement changes.
2014-10-29 19:41:07 +01:00
Christian
c5c33485d8
Merge remote-tracking branch 'ethereum/develop' into sol_expressionCompiler
2014-10-29 19:26:02 +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
Christian
e08065a2fb
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
9eacf5737f
Merge remote-tracking branch 'ethereum/develop' into sol_contractCompiler
...
Conflicts:
libsolidity/Types.cpp
2014-10-29 13:54:36 +01:00
Christian
3f4befd6b4
Parser fix: Consume break and continue.
2014-10-29 13:00:22 +01:00
Marek Kotewicz
48f6b4a8c6
whisper polling, not finished
2014-10-29 11:42:15 +01:00
Marek Kotewicz
59b3f48637
Merge branch 'develop' into mk_jsonrpc
2014-10-28 17:16:21 +01:00
Christian
eb254f6fdf
Adjustments for the NEG->BNOT change.
2014-10-28 17:09:06 +01:00
Christian
d2a474f7fa
Merge remote-tracking branch 'ethereum/develop' into sol_expressionCompiler
...
Conflicts:
libsolidity/Types.cpp
2014-10-28 17:01:04 +01:00
Christian
Gav Wood
Gav Wood
subtly
Christoph Jentzsch
Marek Kotewicz