Commit Graph

932 Commits

Author SHA1 Message Date
Paweł Bylica
29b1964cfb Merge branch 'pr-fixes' into develop-evmcc 2014-12-01 15:58:59 +01:00
Paweł Bylica
fc0a83967c Merge branch 'develop-evmcc' into pr-jit 2014-12-01 10:29:59 +01:00
Lefteris Karapetsas
366514a725 Adding natspec comment test being between keyword and signature 2014-11-30 23:33:04 +01:00
Lefteris Karapetsas
9e80ec9e7a Solidity natspec docstring test improvements
- Adding a test for docstring being between function signature and
  function body

- Properly checking for exceptions in parsing

- Small parser fix
2014-11-28 11:17:18 +01:00
Lefteris Karapetsas
263e1be34e Solidity FunctionDefinition used ASTString shared ptr for docstrings 2014-11-28 01:26:37 +01:00
Lefteris Karapetsas
c8fa23735f Adding solidity natspec comment inside function body 2014-11-28 00:40:00 +01:00
Artur Zawłocki
b78dc045f6 resolved circular dependency between libevm and libevmjit 2014-11-28 00:37:24 +01:00
Lefteris Karapetsas
2b30e1ef2c Fixing multiline comment parsing in solidity 2014-11-28 00:06:38 +01:00
sveneh
8fd474d10b use CMAKE_PREFIX_PATH instead of CMAKE_FILE_ROOT_PATH; removed the
requirement to use EXACT version numbers for dependencies, cleanup
2014-11-27 20:01:34 +01:00
Lefteris Karapetsas
de5ca561f8 Solidity work for documentation strings
- Still a work in progress

- Parser now properly gets each function's doc comment

- Small changes in the scanner

- Multiline comments are considered
2014-11-27 18:57:50 +01:00
Lefteris Karapetsas
ce7bbca1e5 Solidity function AST nodes get documentation attribute 2014-11-27 15:21:22 +01:00
Paweł Bylica
475ce376eb Merge branch 'develop-evmcc' into pr-jit 2014-11-26 20:21:41 +01:00
Paweł Bylica
a5d0496ea4 Merge branch 'develop' into develop-evmcc
Conflicts:
	libevm/VM.h
	test/vm.cpp
2014-11-26 20:20:52 +01:00
Christian
0cd1e76553 Global functions. 2014-11-26 15:42:54 +01:00
Christian
aabb54d525 Sending ether. 2014-11-26 15:35:25 +01:00
Christian
aa0fa2209a More general function types and references. 2014-11-26 15:35:25 +01:00
Gav Wood
2244019e77 Merge pull request #540 from chriseth/sol_actualBlockchainAccess
Access to blockchain data.
2014-11-24 17:11:02 +01:00
Gav Wood
d2ea1d7cc6 Merge pull request #533 from CJentzsch/stateTests
Specify user defined test
2014-11-24 17:03:43 +01:00
Gav Wood
1376dd649c Merge pull request #529 from CJentzsch/newTests
more tests + log tests
2014-11-24 17:00:43 +01:00
Christian
6182dae87b Access to blockchain data. 2014-11-24 13:24:03 +01:00
Christian
59cd984f05 Another test for struct references. 2014-11-23 21:28:45 +01:00
Christian
6cb0d1baa0 Magic variables. 2014-11-23 21:28:45 +01:00
Christian
c5a012cdca Contracts as types and framework for special global variables. 2014-11-23 21:28:44 +01:00
chriseth
596e7030f7 Merge pull request #524 from LefterisJP/sol_parse_comments
Solidity scanner taking documentation comments into account
2014-11-21 15:35:17 +01:00
Christoph Jentzsch
70a1f73047 style 2014-11-21 07:42:41 +01:00
Lefteris Karapetsas
70a5c84095 extra comments scanning test 2014-11-20 23:18:05 +01:00
Christoph Jentzsch
e450bde113 style 2014-11-20 22:21:08 +01:00
Christoph Jentzsch
16be7563e1 Specify user defined test 2014-11-20 20:41:35 +01:00
Paweł Bylica
ce9b8f78ab Merge branch 'develop-evmcc' into pr-jit 2014-11-20 20:14:00 +01:00
Paweł Bylica
508d9f3b68 Do not catch OutOfGas exception in tests separately 2014-11-20 20:13:28 +01:00
Paweł Bylica
14366250c5 Merge branch 'develop' into develop-evmcc
Conflicts:
	test/vm.cpp
2014-11-20 17:15:43 +01:00
Christoph Jentzsch
dcc0361c7c Merge remote-tracking branch 'upstream/develop' into newTests
Conflicts:
	test/vm.cpp
2014-11-20 16:59:27 +01:00
Gav Wood
a879115143 Merge pull request #528 from chriseth/sol_constructor
Special handling for constructor.
2014-11-20 10:18:04 -05:00
Gav Wood
82af8f5579 Merge pull request #527 from imapp-pl/pr-changes
Check only if an exception occurred if an exception expected
2014-11-20 10:16:16 -05:00
Gav Wood
fbdf0b1214 Merge pull request #520 from wanderer/develop
added filler
2014-11-20 10:16:07 -05:00
sveneh
5c19ce88ff Merge remote-tracking branch 'debris/mk_jsonrpc_upgrade' into build_enhancement
This basically pulls in libjson-rpc-cpp 0.3.2, updated from previous
0.2.1. v0.3.2 completely changes its own setup, hence such a massive
change

builds fine on Ubuntu, needs check on OS X

Conflicts:
	CMakeLists.txt
	cmake/EthDependenciesDeprecated.cmake
	eth/CMakeLists.txt
	libqethereum/CMakeLists.txt
	libweb3jsonrpc/CMakeLists.txt
	neth/CMakeLists.txt
	test/CMakeLists.txt
2014-11-20 10:55:36 +01:00
Christoph Jentzsch
76106f2933 add make money test 2014-11-19 18:39:53 +01:00
Lefteris Karapetsas
6275b1ee93 documentation comments are now always skipped but saved as special tokens at the Scanner 2014-11-19 16:21:42 +01:00
Christoph Jentzsch
35bc1b3d44 more log tests 2014-11-19 15:17:03 +01:00
Christoph Jentzsch
b1e26e28e3 Add Log tests 2014-11-19 14:30:42 +01:00
Christian
4f2008e8d8 Special handling for constructor. 2014-11-19 13:19:43 +01:00
Paweł Bylica
7df5ec34c7 In VM tests, check only if an exception occurred if an exception expected (no post state and output checking) 2014-11-19 13:13:19 +01:00
Christoph Jentzsch
52dc2b4bc5 new push32 test and renaming 2014-11-19 10:55:36 +01:00
Christoph Jentzsch
cfcc9ca096 Changed name of some tests 2014-11-19 10:55:36 +01:00
Christoph Jentzsch
8daa5d37af more precompiled contract tests
Conflicts:
	libevm/VM.h
2014-11-19 10:55:28 +01:00
Lefteris Karapetsas
a461498300 solidity scanner takes triple slash doc comments into account
- Conditionally scanning for the documentation comments and gettings their
  contents.

- Adding tests for this functionality of the scanner
2014-11-19 01:58:32 +01:00
Marek Kotewicz
0eb527859f Merge branch 'develop' into mk_jsonrpc_upgrade
Conflicts:
	libweb3jsonrpc/abstractwebthreestubserver.h
	libweb3jsonrpc/spec.json
	test/webthreestubclient.h
2014-11-18 16:37:24 +01:00
Gav Wood
9544173e3b Merge branch 'filter_logs' into develop 2014-11-18 13:40:53 +01:00
Marek Kotewicz
ede6da24d7 common changes 2014-11-18 13:09:05 +01:00
Marek Kotewicz
2bdb56213a Merge branch 'filter_logs' of https://github.com/ethereum/cpp-ethereum into logs
Conflicts:
	libweb3jsonrpc/abstractwebthreestubserver.h
	libweb3jsonrpc/spec.json
	test/webthreestubclient.h
2014-11-18 12:43:52 +01:00