Commit Graph

628 Commits

Author SHA1 Message Date
CJentzsch
3a9837f7f2 include original trie test 2014-12-12 21:09:23 +01:00
CJentzsch
6c819747bc include original trie test 2014-12-12 21:07:47 +01:00
CJentzsch
bdb3a6d946 Merge remote-tracking branch 'upstream/develop' into fixTest
Conflicts:
	test/trie.cpp
2014-12-12 21:02:41 +01:00
Christian
7d8ec26141 Merge remote-tracking branch 'ethereum/develop' into sol_swapConstants
Conflicts:
	test/solidityOptimizerTest.cpp
2014-12-12 17:22:45 +01:00
chriseth
1705ea1927 Merge pull request #584 from chriseth/sol_strings
String types.
2014-12-12 17:14:43 +01:00
Gav Wood
696b5b3a49 Minor warning fix. 2014-12-12 15:44:18 +01:00
Gav Wood
80c1259239 Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop 2014-12-12 15:31:34 +01:00
Gav Wood
73a2647474 Fix tests. 2014-12-12 15:31:24 +01:00
Gav Wood
d420db9116 Merge pull request #583 from imapp-pl/vm
VM interface & factory
2014-12-12 14:58:50 +01:00
Gav Wood
c9ccbe2562 Reduce verbosity. 2014-12-12 13:35:05 +01:00
CJentzsch
2a4e8228d7 efficiency, use reference instead of copy 2014-12-12 09:10:17 +01:00
CJentzsch
6a91ed0c1c remove permuatations in trietest (order is critical for test) 2014-12-12 09:05:39 +01:00
CJentzsch
473e10e0dc fix trie test# 2014-12-11 23:36: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
Paweł Bylica
6b8bc1669e Merge remote-tracking branch 'upstream/develop' into vm
Conflicts:
	libethereum/Executive.cpp
	libethereum/Executive.h
	libethereum/State.cpp
2014-12-11 20:39:48 +01:00
Gav Wood
1d879a9bb4 Remove extraneous old stuff for PoC-7.
Fix gas remaining issue.
2014-12-11 20:07:07 +01:00
Christian
7ad8f94a7e Do not add at the end of the function selector "loop". 2014-12-11 17:48:44 +01:00
Christian
c68d1c62e0 Swap literals to the end if optimizing. 2014-12-11 17:48:44 +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
Christian
6dcb545cc8 Support empty strings. 2014-12-11 14:19:11 +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
Paweł Bylica
1d85b074c8 Merge remote-tracking branch 'upstream/develop' into vm 2014-12-10 17:44:10 +01:00
Paweł Bylica
c1ffbbe797 VMFactory - a new way of creating VMs 2014-12-10 17:41:53 +01:00
Christian
1a76615a87 Tests for empty and too long strings. 2014-12-10 17:15:10 +01:00
Christian
bf8ea705b8 String types. 2014-12-10 16:30:20 +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
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
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
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
Paweł Bylica
eafe303e08 Merge branch 'develop' into vm 2014-12-08 11:48:26 +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
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
Paweł Bylica
bb6fcfe3f9 Use safe pointers in Executive 2014-12-05 17:00:29 +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