Commit Graph

635 Commits

Author SHA1 Message Date
Marek Kotewicz
3fefc4df0b renamed _DIR -> _DIRS && _LIBRARY -> _LIBRARIES according to cmake guidelines 2014-12-12 12:01:32 +01:00
Marek Kotewicz
4fbf9105c3 Merge branch 'develop' into build_enhancement 2014-12-12 10:28:23 +01:00
Gav Wood
98722ae8e8 Whisper test fix. 2014-12-11 22:52:20 +01:00
Gav Wood
6e390ba059 Fix genesis test.
Refactor/cleaning.
2014-12-11 21:46:06 +01:00
Marek Kotewicz
b95fbab7c2 Merge branch 'develop' into build_enhancement 2014-12-11 21:33:27 +01:00
Gav Wood
1d879a9bb4 Remove extraneous old stuff for PoC-7.
Fix gas remaining issue.
2014-12-11 20:07:07 +01:00
chriseth
1db9bc1651 Whitespace change. 2014-12-11 17:04:26 +01:00
Christian
568babfb5f Some (few) tests for the optimizer. 2014-12-11 16:37:17 +01:00
Marek Kotewicz
bf8a6ed878 fixed styling issues 2014-12-11 15:06:11 +01:00
Marek Kotewicz
6a666eed2f Merge branch 'macox_fixes' into build_enhancement
Conflicts:
	test/solidityNatspecJSON.cpp
2014-12-11 12:08:51 +01:00
chriseth
1d17d34979 Merge pull request #586 from LefterisJP/natspec_contract_tags
Natspec title and author tag.
2014-12-10 19:23:57 +01:00
Marek Kotewicz
2ec5b1770b Merge branch 'develop' into build_enhancement 2014-12-10 15:32:50 +01:00
chriseth
93722eab8a Merge pull request #582 from chriseth/sol_varSizeVariables
Variably sized elements on the stack
2014-12-10 14:49:12 +01:00
Lefteris Karapetsas
7724cf1f58 Natspec title and author tag.
- Adding the title and author natspec documentation tags for contracts
- Also using the author tag for functions now
- Tests
2014-12-10 13:24:48 +01:00
subtly
0e98fec278 fix for windows compliation (circular dependency between statics initialized dynamically and dynamically initialized statics) 2014-12-09 18:52:04 +01:00
Marek Kotewicz
5a5973fc24 empty sha test && common fix on mac 2014-12-09 16:54:05 +01:00
debris
1d8593a177 added curl libaries, which are required for testeth project 2014-12-09 13:08:02 +01:00
debris
4d00b3d6fe msvc changes in tests, but tests not yet working there 2014-12-09 00:58:02 +01:00
Christian
125e39dd01 Variable-size stack elements for expression compiler. 2014-12-08 22:26:22 +01:00
Christian
7be59036e5 Register variably-sized variables on stack. 2014-12-08 16:56:41 +01:00
Marek Kotewicz
889740217f Merge branch 'develop' into build_enhancement 2014-12-08 14:49:24 +01:00
subtly
8aba43c5e0 Merge branch 'develop' into network 2014-12-08 14:44:07 +01:00
subtly
6475a4ffb6 cryptopp crash w/null plaintext passed to decrypt 2014-12-08 14:41:04 +01:00
Marek Kotewicz
05137b2884 Merge branch 'develop' into build_enhancement 2014-12-08 13:56:30 +01:00
Christian
a78aff544c Calling functions of other contracts. 2014-12-08 12:39:29 +01:00
Christian
3bc5e142dd Merge remote-tracking branch 'ethereum/develop' into sol_import
Conflicts:
	libsolidity/CompilerStack.cpp
	libsolidity/CompilerStack.h
	libsolidity/InterfaceHandler.cpp
	libsolidity/InterfaceHandler.h
	solc/main.cpp
	test/solidityJSONInterfaceTest.cpp
	test/solidityNatspecJSON.cpp
2014-12-08 12:07:17 +01:00
Christian
8635399597 Comments and braces. 2014-12-07 09:46:21 +01:00
CJentzsch
fe790a3221 Merge remote-tracking branch 'upstream/develop' into stateLogTests 2014-12-06 23:15:30 +01:00
Marek Kotewicz
c6ac7dd315 Merge branch 'develop' into build_enhancement 2014-12-06 17:34:50 +01:00
Gav Wood
097642fc46 Merge pull request #568 from CJentzsch/newTests
fix vm overflow
2014-12-06 12:26:27 +01:00
CJentzsch
16cffb8094 fix stackoverflow in calldataload, codecopy, extcodecopy + some tests 2014-12-05 20:11:34 +01:00
CJentzsch
9101b7073a state log tests 2014-12-05 19:26:32 +01:00
Lefteris Karapetsas
9eee435bf4 Replacing old cstyle enums with c++11 enums in natspec 2014-12-05 15:50:39 +01:00
Christian
8e96de4f9c Merge remote-tracking branch 'ethereum/develop' into sol_import
Conflicts:
	libsolidity/CompilerStack.cpp
	libsolidity/CompilerStack.h
	solc/main.cpp
2014-12-05 15:27:07 +01:00
Lefteris Karapetsas
80ad715764 Stack compiler now correctly returns a string and not a pointer 2014-12-05 12:41:32 +01:00
Lefteris Karapetsas
0c24dc096e Newline right after doctag is now a valid natspec entry
- Plus tests for that
2014-12-05 12:27:18 +01:00
Lefteris Karapetsas
54f353da10 Using iterators in Natspec comment parsing
- Used iterators in the entirety of the InterfaceHandler natspec comment
  parsing pipeline

- Fixed issue where @param continuing in new line would not get a space
2014-12-05 02:10:54 +01:00
Lefteris Karapetsas
b6c8e9e011 Natspec @return tag parsing
- Also omitting tags from the output JSON file if they are missing
  instead of providing an empty string for their value
2014-12-04 18:12:52 +01:00
CJentzsch
b7601aee9f fix stackoverflow in calldataload, codecopy, extcodecopy + some tests 2014-12-04 17:55:04 +01:00
Lefteris Karapetsas
c7e67ee59e Merge branch 'develop' into natspec_export_json 2014-12-04 17:28:46 +01:00
Lefteris Karapetsas
e3a1ef66e2 Natspec parsing @param doctags
- Plus additional work on generally parsing doctags.
  One important missing feature is to parse a tag midline

- Adding more tests
2014-12-04 17:19:47 +01:00
Lefteris Karapetsas
75d0b8e0b6 Parsing notice and dev doxytags.
- Only initial work done. Still need to refine the logic and
  incorporate all the other types of tags.

- Added/Modified some tests

- Work in progress
2014-12-04 09:42:38 +01:00
Marek Kotewicz
dc31f34c54 Merge branch 'develop' into build_enhancement
Conflicts:
	eth/main.cpp
	neth/main.cpp
2014-12-04 01:26:10 +01:00
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