Commit Graph
22691 Commits
Author SHA1 Message Date
Christian 260a1529a7 Compile fix. 2014-12-08 12:19:37 +01:00
Christian 1f209f1b7d 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 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 26f554d0d8 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
debris c0c2b2399e serpent compiling under msvc 2014-12-07 19:55:40 +01:00
debris ed28d3013b serpent compiling under msvc 2014-12-07 19:55:40 +01:00
debris 9dd74d13d3 solc working 2014-12-07 19:07:51 +01:00
debris c7cf8c6db4 solidity compiling under msvc && boosts cmake file fixed 2014-12-07 11:29:38 +01:00
debris 49aa83403f solidity compiling under msvc && boosts cmake file fixed 2014-12-07 11:29:38 +01:00
debris 9b3417903b solidity compiling under msvc && boosts cmake file fixed 2014-12-07 11:29:38 +01:00
Christian 8635399597 Comments and braces. 2014-12-07 09:46:21 +01:00
Christian d25d98a260 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
Marek Kotewicz 2d8eaf8482 Merge branch 'develop' into build_enhancement 2014-12-06 17:34:50 +01:00
Marek Kotewicz 4d729d62ad 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 448ffcb8ac fix stackoverflow in calldataload, codecopy, extcodecopy + some tests 2014-12-05 19:56:02 +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
debris 53e0ff10f5 solidity compiling on windows, fixed Compiler Error C2797 2014-12-05 17:00:26 +01:00
debris 33ac800c01 lll, buildinfo.h and llc compiling on windows 2014-12-05 16:40:41 +01:00
debris 6d0ed4c891 lll, buildinfo.h and llc compiling on windows 2014-12-05 16:40:41 +01:00
Lefteris Karapetsas 122b42579e Replacing old cstyle enums with c++11 enums in natspec 2014-12-05 15:50:39 +01:00
Lefteris Karapetsas 407f11ba76 Replacing old cstyle enums with c++11 enums in natspec 2014-12-05 15:50:39 +01:00
Lefteris Karapetsas 9eee435bf4 Replacing old cstyle enums with c++11 enums in natspec 2014-12-05 15:50:39 +01:00
Christian 25273778dc Renamed url to identifier and added some comments. 2014-12-05 15:35:05 +01:00
Christian f59f0dfa8c 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
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
Christian d4a958e1fe 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
Artur Zawłocki ebffc7979c Merge branch 'develop-evmcc' of https://github.com/imapp-pl/cpp-ethereum into develop-evmcc 2014-12-05 15:22:20 +01:00
Artur Zawłocki 5353ba1b06 jit-related CMakeLists.txt fixes 2014-12-05 15:21:54 +01:00
Paweł Bylica a03d5e5dc2 Merge remote-tracking branch 'upstream/develop' into develop-evmcc 2014-12-05 15:10:46 +01:00
Paweł Bylica 421b5ccc36 Fix random test generator 2014-12-05 14:39:24 +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 c8f96589c5 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 27ef18865d Newline right after doctag is now a valid natspec entry
- Plus tests for that
2014-12-05 12:27:18 +01:00
Lefteris Karapetsas 11cac68cf4 Introducing Docstring parsing error exception and style fixes 2014-12-05 12:08:26 +01:00
Paweł Bylica ef593b751b Merge branch 'develop-evmcc' into pr-jit
Conflicts:
	windows/Eth.vcxproj
	windows/TestEthereum.vcxproj
2014-12-05 09:47:03 +01:00
Paweł Bylica 20b6b30b99 Merge branch 'develop' into develop-evmcc
Conflicts:
	libevm/VM.h
	test/createRandomTest.cpp
2014-12-05 09:24:47 +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 8f6656f1b8 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 dedd1a312b Addressing styling and miscellaneous issue with Natspec 2014-12-04 23:55:47 +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
Lefteris Karapetsas 02a04eef5c 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