Commit Graph

788 Commits

Author SHA1 Message Date
Marek Kotewicz
82dbdce5ee Merge branch 'develop' into build_enhancement 2014-12-04 00:32:05 +01:00
Christian
69da6df77d Improved external interface for multi-source and multi-contract compilation. 2014-12-03 18:52:28 +01:00
Christian
445ba10d3b Multi-source and multi-contract compiler. 2014-12-03 18:51:59 +01:00
Lefteris Karapetsas
4eefbc941e Moving all Interface and Documentation functionality to own class
- Creating the Interface Handler class which will take care of the
  parsing of Natspec comments and of interfacing with and outputing to
  JSON files.

- Will also handle the ABI interface creation
2014-12-03 16:40:37 +01:00
Lefteris Karapetsas
2f7b263f9b Separate user and dev natspec documentation
- plus other small changes according to the spec
2014-12-03 13:50:04 +01:00
Gav Wood
3c8a45cec4 Merge pull request #555 from CJentzsch/newTests
test update due to CALLCODE <-> RETURN
2014-12-03 12:09:50 +01:00
Christian
5b6a211b8a Import directive. 2014-12-03 10:44:46 +01:00
Gav Wood
e7201a0324 Merge pull request #549 from chriseth/sol_saveScope
Disallow assignments to structs and mappings
2014-12-03 10:15:11 +01:00
CJentzsch
8afb0256a7 test update due to CALLCODA <-> RETURN 2014-12-03 08:36:52 +01:00
Gav Wood
2f5b9151d5 Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop
Conflicts:
	test/vm.cpp
2014-12-02 20:09:00 +01:00
Gav Wood
8d0a664740 PV46. Minor protocol alterations. 2014-12-02 17:13:17 +01:00
Lefteris Karapetsas
92724ab80a More Natspec JSON export tests and better error reporting 2014-12-02 10:41:18 +01:00
CJentzsch
fb7c3bb302 style
Conflicts:
	libevm/VM.h
2014-12-01 22:44:31 +01:00
CJentzsch
057553a0a0 updated createRandomTest to correct exception behavior 2014-12-01 22:41:16 +01:00
CJentzsch
d952833c1b added logs to state tests 2014-12-01 22:41:16 +01:00
Marek Kotewicz
f5ed8c8ce3 common changes 2014-12-01 21:30:00 +01:00
Lefteris Karapetsas
bbf4beab45 Using jsoncpp for exporting ABI interface from solidity
- Also changing the interface JSON test to have a shorter name
  plus to provide meaningful error message in case of failure
2014-12-01 18:01:42 +01:00
Christian
5cecf5699b Disallow assignments to structs and mappings. 2014-12-01 17:33:21 +01:00
Lefteris Karapetsas
6b7bec980a Exporting Natspec documentation to a JSON interface
- Adding a getDocumentation() function to solidity compiler stack
  so that we can obtain the natspec interface for a contract

- Adding libjsoncpp as a dependency of libsolidity. This is done
  in a dirty way, using libjsonrpc-cpp s an intermediate dependency
  for the moment. Will fix soon.

- Start of a test file for Natspec exporting to JSON
2014-12-01 17:03:04 +01:00
Paweł Bylica
29b1964cfb Merge branch 'pr-fixes' into develop-evmcc 2014-12-01 15:58: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
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
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