diff options
| author | chriseth <chris@ethereum.org> | 2017-07-31 22:14:46 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-31 22:14:46 +0800 |
| commit | c2215d4605d1fbcef1366d6b822ec610fc031b3c (patch) | |
| tree | 940ba55f0f27e8884332eaf90c11da48d5e98980 /liblll/CompilerState.cpp | |
| parent | 0fb4cb1ab9bb4b6cc72e28cc5a1753ad14781f14 (diff) | |
| parent | 2abfdb65c8dcda6866143280b7ff1bde094a1419 (diff) | |
| download | dexon-solidity-c2215d4605d1fbcef1366d6b822ec610fc031b3c.tar dexon-solidity-c2215d4605d1fbcef1366d6b822ec610fc031b3c.tar.gz dexon-solidity-c2215d4605d1fbcef1366d6b822ec610fc031b3c.tar.bz2 dexon-solidity-c2215d4605d1fbcef1366d6b822ec610fc031b3c.tar.lz dexon-solidity-c2215d4605d1fbcef1366d6b822ec610fc031b3c.tar.xz dexon-solidity-c2215d4605d1fbcef1366d6b822ec610fc031b3c.tar.zst dexon-solidity-c2215d4605d1fbcef1366d6b822ec610fc031b3c.zip | |
Merge pull request #2667 from ethereum/develop
Merge develop into release in proparation for 0.4.14
Diffstat (limited to 'liblll/CompilerState.cpp')
| -rw-r--r-- | liblll/CompilerState.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/liblll/CompilerState.cpp b/liblll/CompilerState.cpp index 5d38bb8c..9701e16b 100644 --- a/liblll/CompilerState.cpp +++ b/liblll/CompilerState.cpp @@ -46,6 +46,8 @@ void CompilerState::populateStandard() { static const string s = "{" "(def 'panic () (asm INVALID))" + // Alternative macro version of alloc, which is currently implemented in the parser + // "(def 'alloc (n) (raw (msize) (when n (pop (mload (+ (msize) (& (- n 1) (~ 0x1f))))))))" "(def 'allgas (- (gas) 21))" "(def 'send (to value) (call allgas to value 0 0 0 0))" "(def 'send (gaslimit to value) (call gaslimit to value 0 0 0 0))" |