diff options
| -rw-r--r-- | appveyor.yml | 5 | ||||
| -rw-r--r-- | docs/solidity-by-example.rst | 9 | ||||
| -rw-r--r-- | liblll/CodeFragment.cpp | 4 |
3 files changed, 15 insertions, 3 deletions
diff --git a/appveyor.yml b/appveyor.yml index b45e9f11..5d6dcb20 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -29,7 +29,7 @@ branches: only: - - master + - release - develop os: Visual Studio 2015 configuration: @@ -83,14 +83,13 @@ artifacts: # below. deploy: - description: 'Development build of solidity at commit $(APPVEYOR_REPO_COMMIT).\n\n$(APPVEYOR_REPO_COMMIT_MESSAGE)\n\nCommitted by $(APPVEYOR_REPO_COMMIT_AUTHOR), $(APPVEYOR_REPO_COMMIT_TIMESTAMP).' - prerelease: true provider: GitHub auth_token: secure: HPjiugbDSCsEFTphj/qwHuSw80/BV1xWoSvj95CPmtb16Ukh2VQbLVB7iFtZSans artifact: solidity-windows-zip on: branch: release + appveyor_repo_tag: true notifications: - provider: GitHubPullRequest diff --git a/docs/solidity-by-example.rst b/docs/solidity-by-example.rst index 2e53b78c..915cfa76 100644 --- a/docs/solidity-by-example.rst +++ b/docs/solidity-by-example.rst @@ -170,6 +170,15 @@ of votes. } } } + + // Calls winningProposal() function to get the index + // of the winner contained in the proposals array and then + // returns the name of the winner + function winnerName() constant + returns (bytes32 winnerName) + { + winnerName = proposals[winningProposal()].name; + } } Possible Improvements diff --git a/liblll/CodeFragment.cpp b/liblll/CodeFragment.cpp index bc53d777..39b6376c 100644 --- a/liblll/CodeFragment.cpp +++ b/liblll/CodeFragment.cpp @@ -581,6 +581,10 @@ void CodeFragment::constructOperation(sp::utree const& _t, CompilerState& _s) { m_asm.appendJump(m_asm.errorTag()); } + else if (us == "BYTECODESIZE") + { + m_asm.appendProgramSize(); + } else if (us.find_first_of("1234567890") != 0 && us.find_first_not_of("QWERTYUIOPASDFGHJKLZXCVBNM1234567890_-") == string::npos) m_asm.append((u256)varAddress(s)); else |