Commit Graph
16689 Commits
Author SHA1 Message Date
CJentzsch 9c34eed9da new file block.cpp 2015-01-21 16:10:06 +01:00
Gav Wood fd773be884 Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop 2015-01-20 11:33:41 -08:00
Gav Wood 5f54782ed0 Cleanups and addition AZ info. 2015-01-20 11:33:33 -08:00
Gav Wood 30b455e4d6 Merge pull request #830 from chriseth/sol_overridesInConstructorContext
Include virtual function overrides in constructor context.
2015-01-20 10:02:18 -08:00
Gav Wood d3a3885aba Merge pull request #830 from chriseth/sol_overridesInConstructorContext
Include virtual function overrides in constructor context.
2015-01-20 10:02:18 -08:00
Marek Kotewicz ca8aa01b34 Squashed 'libjsqrc/ethereumjs/' changes from 6a58db6..848c54d
848c54d _currentAbi object
380c152 solidity methods "overloading"

git-subtree-dir: libjsqrc/ethereumjs
git-subtree-split: 848c54dc4713d5c29993f1c41d16cd334e18081d
2015-01-20 17:48:08 +01:00
Marek Kotewicz d6e82477ca Merge commit '53b4fda16d0b191be8ab986379a328aa38aaf916' into natspec 2015-01-20 17:48:08 +01:00
Christian 96db6cf905 Style changes. 2015-01-20 17:41:09 +01:00
Christian 3ff1c3ec30 Include virtual function overrides in constructor context. 2015-01-20 15:58:04 +01:00
Christian d854e56789 Include virtual function overrides in constructor context. 2015-01-20 15:58:04 +01:00
Lefteris Karapetsas 8b29bdaf10 Absence of tag in Natspec is now considered @notice 2015-01-20 13:15:43 +01:00
Lefteris Karapetsas e0d1f79e06 Absence of tag in Natspec is now considered @notice 2015-01-20 13:15:43 +01:00
Gav Wood 1fc3c7b498 Merge pull request #810 from debris/ethereumjs
Ethereumjs
2015-01-19 20:59:58 -08:00
Christian 417f9c03d0 Implicit conversion from derived to base. 2015-01-19 23:35:04 +01:00
Christian 609268ee62 Implicit conversion from derived to base. 2015-01-19 23:35:04 +01:00
Christian ddf5e20d10 Call constructors of base classes. 2015-01-19 23:35:04 +01:00
Christian 961cb5b90c Call constructors of base classes. 2015-01-19 23:35:04 +01:00
Christian af92f98d86 Constructor arguments for base classes. 2015-01-19 23:35:04 +01:00
Christian fe770957c6 Constructor arguments for base classes. 2015-01-19 23:35:04 +01:00
Christian 6e111d5d1d Explicit calls to base class function. 2015-01-19 23:35:04 +01:00
Christian 2e846c495b Explicit calls to base class function. 2015-01-19 23:35:04 +01:00
Christian 4d833bc86b Inheritance in compiler. 2015-01-19 23:35:04 +01:00
Christian f84d8f2b50 Inheritance in compiler. 2015-01-19 23:35:04 +01:00
Christian e6c0a9b922 Magic variables are only needed durinng name and type resolution, not during compilation. 2015-01-19 23:35:04 +01:00
Christian 70cda182f2 Magic variables are only needed durinng name and type resolution, not during compilation. 2015-01-19 23:35:04 +01:00
Christian 6633fbb603 Check overrides and provide inherited public interface. 2015-01-19 23:35:04 +01:00
Christian 580d712a67 Check overrides and provide inherited public interface. 2015-01-19 23:35:04 +01:00
Christian 914fcedd0e Import inherited members into the contract's scope. 2015-01-19 23:35:04 +01:00
Christian fb41b96bb8 Import inherited members into the contract's scope. 2015-01-19 23:35:04 +01:00
Christian 4631e54e08 Inheritance parser. 2015-01-19 23:35:04 +01:00
Christian ffed2f37cb Inheritance parser. 2015-01-19 23:35:04 +01:00
Lefteris Karapetsas 02521a164c Improved handling of exceptions in some Solidity Tests 2015-01-19 20:12:48 +01:00
Lefteris Karapetsas ab4178941b Adding blockhash test in Solidity ExpressionCompiler 2015-01-19 17:13:18 +01:00
Lefteris Karapetsas 6612e4bd17 Some addition to Solidity Execution Framework 2015-01-19 15:34:15 +01:00
Lefteris Karapetsas 933d65e986 Some addition to Solidity Execution Framework 2015-01-19 15:34:15 +01:00
Marek Kotewicz 21e037c74f Squashed 'libjsqrc/ethereumjs/' changes from 823fb29..6a58db6
6a58db6 parsing real, ureal values on output
af54832 encoding real on input
86b417e fixes for autoprovider

git-subtree-dir: libjsqrc/ethereumjs
git-subtree-split: 6a58db66f7f42a49667bcc751418256441752279
2015-01-19 13:53:44 +01:00
Marek Kotewicz 72b9632c35 Merge commit '2b4d38b9bf059014596e1ab00c99dc2ad4ab3761' into ethereumjs 2015-01-19 13:53:44 +01:00
chriseth 325b052b16 Merge pull request #805 from LianaHus/deleteStruct
delete for structs

-added functionality to set values to 0 when deleting structure(not for ...
2015-01-19 11:32:11 +01:00
chriseth ae9ec885d7 Merge pull request #805 from LianaHus/deleteStruct
delete for structs

-added functionality to set values to 0 when deleting structure(not for ...
2015-01-19 11:32:11 +01:00
CJentzsch ed2b4cff41 test with sha3 and gas = 2**32 2015-01-19 11:02:13 +01:00
Gav Wood 930532165c Warnings fix. 2015-01-17 10:34:44 -05:00
Marek Kotewicz 819226c503 Squashed 'libjsqrc/ethereumjs/' changes from e94da80..823fb29
823fb29 tests for parsing output array
1e2c1ae output parser string support
b457e88 support for int array types[]
2d8383d removed unused functions

git-subtree-dir: libjsqrc/ethereumjs
git-subtree-split: 823fb2995b0ff6ebaf257206ad1ecf827b8567b8
2015-01-17 15:45:11 +01:00
Marek Kotewicz 7d4745d246 Merge commit '6a383d6ed3fb37cf6739f6ac441652adfdb70463' into ethereumjs 2015-01-17 15:45:11 +01:00
Gav Wood 37e4919fcb Potential workaround for windows build. 2015-01-17 09:44:09 -05:00
Gav Wood 188b1df041 Merge pull request #813 from LefterisJP/sol_astJson
Exporting Solidity AST in a JSON format
2015-01-17 09:27:51 -05:00
subtly 29f17ba636 coding standards 2015-01-17 01:30:52 -05:00
subtly 0e4c693518 cleanup 2015-01-17 00:56:36 -05:00
subtly d910272e4a Merge branch 'develop' into p2p 2015-01-17 00:52:22 -05:00
Marek Kotewicz adfd7d621d Squashed 'libjsqrc/ethereumjs/' changes from 2c36d5f..e94da80
e94da80 default padding set to 32, separated to one variable
a1c0bb6 fixed checking first bit for parsing int output
774e9d2 abi.js rounds down floating point input
9a264a4 updated bower.json && package.json version, added bignumber.js to bower dependencies
0172939 fixed #28 and other small node.js issues

git-subtree-dir: libjsqrc/ethereumjs
git-subtree-split: e94da808cb2a9f0493b42e5e572f6aed78de5ee3
2015-01-16 16:49:50 +01:00
Marek Kotewicz c46ceb1ad8 Merge commit '29333fc213b62b27ef826616cf77430947fb6eab' into ethereumjs 2015-01-16 16:49:50 +01:00