Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Be more verbose on the stack-mismatch errors | Alex Beregszaszi | 2017-02-01 | 1 | -1/+1 |
| | |||||
* | Support explicit conversion of external function type to address | Alex Beregszaszi | 2017-02-01 | 4 | -1/+25 |
| | |||||
* | Merge pull request #1625 from ethereum/asmdocs | chriseth | 2017-02-01 | 2 | -490/+30 |
|\ | | | | | Integrate missed changes. | ||||
| * | Integrate missed changes. | chriseth | 2017-02-01 | 2 | -490/+30 |
| | | |||||
* | | Merge pull request #1623 from ethereum/version | RJ Catalano | 2017-02-01 | 3 | -3/+5 |
|\ \ | |/ |/| | Version update | ||||
| * | Version update | chriseth | 2017-02-01 | 3 | -3/+5 |
|/ | |||||
* | Release date for 0.4.9 | chriseth | 2017-02-01 | 1 | -1/+1 |
| | |||||
* | Merge pull request #1594 from ethereum/fixStdToken | chriseth | 2017-01-31 | 2 | -14/+34 |
|\ | | | | | Make standard token compileable. | ||||
| * | Fix transferFrom. | chriseth | 2017-01-23 | 1 | -7/+11 |
| | | |||||
| * | Make token constructible. | chriseth | 2017-01-21 | 1 | -12/+24 |
| | | |||||
| * | Test that all constructible std contracts produce bytecode. | chriseth | 2017-01-21 | 1 | -0/+4 |
| | | |||||
* | | Merge pull request #1621 from VoR0220/fixLinkerForBinariesWithImports | chriseth | 2017-01-31 | 1 | -1/+3 |
|\ \ | | | | | | | fix for linker wrt binaries generated with import statements | ||||
| * | | fix for linker wrt binaries generated with import statements | VoR0220 | 2017-01-31 | 1 | -1/+3 |
|/ / | | | | | | | Signed-off-by: VoR0220 <rj@erisindustries.com> | ||||
* | | Merge pull request #1619 from ethereum/changelog | chriseth | 2017-01-30 | 4 | -1/+24 |
|\ \ | | | | | | | Mention in changelog that invalid as an opcode is valid inline assembly | ||||
| * | | Add tests for invalid instruction | Alex Beregszaszi | 2017-01-28 | 2 | -0/+20 |
| | | | |||||
| * | | Mention invalid in docs | Alex Beregszaszi | 2017-01-27 | 1 | -0/+2 |
| | | | |||||
| * | | Mention in changelog that invalid as an opcode is valid inline assembly | Alex Beregszaszi | 2017-01-27 | 1 | -1/+2 |
|/ / | |||||
* | | Merge pull request #1598 from wuestholz/develop | chriseth | 2017-01-27 | 14 | -23/+85 |
|\ \ | | | | | | | Change translation of implicit throws | ||||
| * | | Changelog and review suggestions. | chriseth | 2017-01-27 | 3 | -2/+4 |
| | | | |||||
| * | | Document special case of zero-initialized internal function. | chriseth | 2017-01-26 | 1 | -1/+6 |
| | | | |||||
| * | | Uninitialized internal function should call INVALID. | chriseth | 2017-01-26 | 1 | -1/+3 |
| | | | |||||
| * | | Allow inserting low-level functions without calling them. | chriseth | 2017-01-26 | 2 | -5/+26 |
| | | | |||||
| * | | Split line. | chriseth | 2017-01-26 | 1 | -1/+3 |
| | | | |||||
| * | | Fix optimizer with regards to INVALID instruction. | chriseth | 2017-01-26 | 2 | -0/+2 |
| | | | |||||
| * | | Change code for INVALID opcode to 0xfe. | chriseth | 2017-01-26 | 2 | -4/+4 |
| | | | |||||
| * | | Address feedback from code review. | Valentin Wüstholz | 2017-01-26 | 5 | -16/+12 |
| | | | |||||
| * | | Change translation of implicit throws (issue #1589). | Valentin Wüstholz | 2017-01-26 | 10 | -17/+49 |
| | | | | | | | | | | | | | | | | | | | | | This adds a new invalid instruction that is used for encoding implicit throws that are emitted by the compiler. This makes it possible to distinguish such runtime errors from user-provided, explicit throws. | ||||
* | | | Merge pull request #1451 from LefterisJP/fix_build | chriseth | 2017-01-27 | 3 | -19/+123 |
|\ \ \ | | | | | | | | | Accept any kind of whitespace after natspec tags | ||||
| * | | | Changelog entry. | chriseth | 2017-01-27 | 1 | -0/+1 |
| | | | | |||||
| * | | | Tests for natspect parsing failure cases | Lefteris Karapetsas | 2017-01-27 | 1 | -0/+42 |
| | | | | |||||
| * | | | Minor changes. | chriseth | 2017-01-27 | 1 | -19/+17 |
| | | | | |||||
| * | | | More verbose function naming | Lefteris Karapetsas | 2017-01-27 | 1 | -2/+2 |
| | | | | |||||
| * | | | Doc tags followed by newline are now parsed properly | Lefteris Karapetsas | 2017-01-27 | 2 | -3/+3 |
| | | | | |||||
| * | | | Fix and better output for tests | Lefteris Karapetsas | 2017-01-25 | 2 | -1/+7 |
| | | | | |||||
| * | | | Accept any kind of whitespace after natspec tags | Lefteris Karapetsas | 2017-01-25 | 2 | -13/+70 |
| | | | | |||||
* | | | | Merge pull request #1613 from ethereum/refactorJson | Alex Beregszaszi | 2017-01-27 | 5 | -51/+49 |
|\ \ \ \ | | | | | | | | | | | Refactor json return type generation. | ||||
| * | | | | Refactor json return type generation. | chriseth | 2017-01-27 | 5 | -51/+49 |
|/ / / / | |||||
* | | | | Merge pull request #1608 from LefterisJP/archlinux_add_ethereum_git | chriseth | 2017-01-27 | 1 | -0/+2 |
|\ \ \ \ | |_|/ / |/| | | | Add ethereum-git to archlinux dependencies | ||||
| * | | | Add ethereum-git to archlinux dependencies | Lefteris Karapetsas | 2017-01-26 | 1 | -0/+2 |
| |/ / | | | | | | | | | | It's needed for testing, since we need to have the `eth` client installed | ||||
* | | | Merge pull request #1604 from ethereum/checksums | Alex Beregszaszi | 2017-01-26 | 15 | -18/+294 |
|\ \ \ | | | | | | | | | Warn about invalid checksums of addresses. | ||||
| * | | | Simplify length rule. | chriseth | 2017-01-26 | 1 | -2/+2 |
| | | | | |||||
| * | | | Add some more tests for the checksum routine. | chriseth | 2017-01-25 | 1 | -0/+83 |
| | | | | |||||
| * | | | Documentation. | chriseth | 2017-01-25 | 1 | -0/+13 |
| | | | | |||||
| * | | | Also check library addresses. | chriseth | 2017-01-25 | 4 | -23/+49 |
| | | | | |||||
| * | | | Tests for library checksums. | chriseth | 2017-01-25 | 2 | -14/+53 |
| | | | | |||||
| * | | | Warn about invalid checksums of addresses. | chriseth | 2017-01-25 | 8 | -2/+117 |
| |/ / | |||||
* | | | Merge pull request #1610 from ethereum/assemblyModeError | Alex Beregszaszi | 2017-01-26 | 2 | -26/+33 |
|\ \ \ | | | | | | | | | Proper error reporting for assembly mode. | ||||
| * | | | Header cleanup. | chriseth | 2017-01-26 | 2 | -26/+29 |
| | | | | |||||
| * | | | Proper error reporting for assembly mode. | chriseth | 2017-01-26 | 1 | -0/+4 |
| |/ / | |||||
* | | | Merge pull request #1611 from ethereum/metadata-literal-sources | chriseth | 2017-01-26 | 4 | -5/+18 |
|\ \ \ | | | | | | | | | Add option to keep literal sources in metadata | ||||
| * | | | Add literal metadata sources to changelog | Alex Beregszaszi | 2017-01-26 | 1 | -0/+1 |
| | | | | |||||
| * | | | Add option to solc to use literal sources in metadta | Alex Beregszaszi | 2017-01-26 | 1 | -1/+6 |
| | | | | |||||
| * | | | Add option to store literal sources in metadata | Alex Beregszaszi | 2017-01-26 | 2 | -4/+11 |
|/ / / | |||||
* | | | Merge pull request #1606 from ethereum/inlineasm-instr-shadowing | Alex Beregszaszi | 2017-01-26 | 5 | -4/+33 |
|\ \ \ | |/ / |/| | | Avoid shadowing of inline assembly instructions with variables | ||||
| * | | Update error message. | chriseth | 2017-01-26 | 2 | -2/+2 |
| | | | |||||
| * | | Disallow assignment to non-identifiers. | chriseth | 2017-01-26 | 2 | -0/+8 |
| | | | |||||
| * | | Disallow instructions in assignment. | chriseth | 2017-01-26 | 1 | -6/+5 |
| | | | |||||
| * | | Add test for assignment. | chriseth | 2017-01-26 | 1 | -1/+7 |
| | | | |||||
| * | | Renamed function. | chriseth | 2017-01-26 | 2 | -5/+5 |
| | | | |||||
| * | | Moved test. | chriseth | 2017-01-26 | 3 | -15/+7 |
| | | | |||||
| * | | Rewording in changelog. | chriseth | 2017-01-26 | 1 | -1/+1 |
| | | | |||||
| * | | Add test for shadowing inline assembly instruction | Alex Beregszaszi | 2017-01-25 | 1 | -0/+13 |
| | | | |||||
| * | | Do not allow shadowing inline assembly instructions with variables | Alex Beregszaszi | 2017-01-25 | 3 | -1/+12 |
|/ / | |||||
* | | Merge pull request #1595 from ethereum/noDuplicatedContracts | RJ Catalano | 2017-01-25 | 2 | -14/+47 |
|\ \ | | | | | | | Include bytecode of created contracts only once. | ||||
| * | | Include creation code only once. | chriseth | 2017-01-25 | 1 | -14/+18 |
| | | | |||||
| * | | Test double inclusion of bytecode. | chriseth | 2017-01-25 | 1 | -0/+29 |
|/ / | |||||
* | | Merge pull request #1588 from ethereum/fixrecursivestructs | chriseth | 2017-01-25 | 8 | -457/+607 |
|\ \ | | | | | | | Introduce low-level functions | ||||
| * | | Use int arithmetics for stack adjustment. | chriseth | 2017-01-24 | 1 | -1/+1 |
| | | | |||||
| * | | Change clearStorageLoop to TypePointer. | chriseth | 2017-01-24 | 2 | -16/+18 |
| | | | |||||
| * | | Changelog entry. | chriseth | 2017-01-24 | 1 | -0/+4 |
| | | | |||||
| * | | Use shared_ptrs to enable shared_from_this. | chriseth | 2017-01-24 | 1 | -4/+4 |
| | | | |||||
| * | | Convert ArrayUtils routines into low-level functions. | chriseth | 2017-01-24 | 1 | -228/+251 |
| | | | |||||
| * | | Move some util functions to low-level functions. | chriseth | 2017-01-24 | 5 | -244/+320 |
| | | | |||||
| * | | Low level named functions for CompilerContext. | chriseth | 2017-01-24 | 2 | -0/+23 |
| | | | |||||
| * | | Test for initializing recursive structs. | chriseth | 2017-01-24 | 1 | -0/+22 |
| | | | |||||
* | | | Merge pull request #1600 from ethereum/functionalAsmOut | chriseth | 2017-01-25 | 4 | -17/+94 |
|\ \ \ | |/ / |/| | | Create functional assembly output, if possible. | ||||
| * | | Create functional assembly output, if possible. | chriseth | 2017-01-24 | 4 | -17/+94 |
| | | | |||||
* | | | Merge pull request #1245 from ethereum/1215 | chriseth | 2017-01-24 | 5 | -7/+177 |
|\ \ \ | |/ / |/| | | Allow multiple events of the same name | ||||
| * | | analysis: disallow overloading functions with events | Yoichi Hirai | 2017-01-23 | 1 | -1/+6 |
| | | | |||||
| * | | test: add tests about functions and events of the same name | Yoichi Hirai | 2017-01-23 | 1 | -0/+47 |
| | | | |||||
| * | | analysis: fix format | Yoichi Hirai | 2017-01-23 | 1 | -4/+7 |
| | | | |||||
| * | | test: add a test case about inheriting multiple events of the same name | Yoichi Hirai | 2017-01-23 | 1 | -0/+52 |
| | | | |||||
| * | | Changelog: move an item upwards | Yoichi Hirai | 2017-01-23 | 1 | -1/+1 |
| | | | |||||
| * | | test: somehow log counting system has changed | Yoichi Hirai | 2017-01-23 | 1 | -10/+10 |
| | | | |||||
| * | | analysis: Resolve event overloading | Yoichi Hirai | 2017-01-23 | 2 | -14/+11 |
| | | | |||||
| * | | test: check the results of function calls in the test for multiple events of ↵ | Yoichi Hirai | 2017-01-23 | 1 | -6/+9 |
| | | | | | | | | | | | | the same name | ||||
| * | | test: fixing inconsistent usage of end-to-end test framework | Yoichi Hirai | 2017-01-23 | 1 | -4/+7 |
| | | | |||||
| * | | Changelog: add a point about allowing multiple events that share the same name | Yoichi Hirai | 2017-01-23 | 1 | -0/+1 |
| | | | | | | | | | | | | See #1215 | ||||
| * | | test: Add an end-to-end test about multiple events of the same name | Yoichi Hirai | 2017-01-23 | 1 | -0/+41 |
| | | | | | | | | | | | | See #1215 | ||||
| * | | analysis: Allow multiple events of the same name | Yoichi Hirai | 2017-01-23 | 1 | -0/+7 |
| | | | | | | | | | | | | Fixes #1215 | ||||
| * | | test: Add a test for #1215 | Yoichi Hirai | 2017-01-23 | 1 | -0/+11 |
| |/ | | | | | | | using the original example from @pipermerriam | ||||
* | | Merge pull request #1599 from ethereum/fixErrorTagLLL | Alex Beregszaszi | 2017-01-23 | 2 | -1/+8 |
|\ \ | | | | | | | Fix error tag usage in lll. | ||||
| * | | LLL: add test for (panic) in a sequence | Alex Beregszaszi | 2017-01-12 | 1 | -0/+7 |
| | | | |||||
| * | | Fix error tag usage in lll. | chriseth | 2017-01-23 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #1591 from ethereum/stackTooDeepLocation | Yoichi Hirai | 2017-01-23 | 3 | -3/+16 |
|\ \ | | | | | | | Report source location on "stack too deep" errors. | ||||
| * | | Report source location on "stack too deep" errors. | chriseth | 2017-01-21 | 3 | -3/+16 |
| |/ | |||||
* | | Merge pull request #1593 from ethereum/identifierRegex | Yoichi Hirai | 2017-01-23 | 1 | -1/+1 |
|\ \ | | | | | | | Correct identifier regex | ||||
| * | | Correct identifier regex | chriseth | 2017-01-21 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #1592 from ethereum/internalConstructors | Yoichi Hirai | 2017-01-23 | 5 | -2/+49 |
|\ \ | | | | | | | Disallow creation of contracts with internal constructors. | ||||
| * | | Check if constructor is public or not. | chriseth | 2017-01-21 | 3 | -2/+13 |
| | | | |||||
| * | | Add tests for internal constructor. | chriseth | 2017-01-21 | 2 | -0/+36 |
| |/ | |||||
* | | Merge pull request #1597 from sarbogast/patch-2 | chriseth | 2017-01-23 | 1 | -10/+10 |
|\ \ | | | | | | | Fix the list of reasons for throwing automatically | ||||
| * | | Fix the list of reasons for throwing automatically | Sebastien Arbogast | 2017-01-21 | 1 | -10/+10 |
| |/ | | | | | Used aut-enumerated list syntax | ||||
* | | Merge pull request #1596 from sarbogast/patch-1 | chriseth | 2017-01-23 | 1 | -1/+1 |
|\ \ | |/ |/| | Fixed typo on contract instance | ||||
| * | Fixed typo on contract instance | Sebastien Arbogast | 2017-01-21 | 1 | -1/+1 |
|/ | | | Fixed the name of the variable referencing a contract instance | ||||
* | Merge pull request #1576 from ethereum/typeIdentifiers | Yoichi Hirai | 2017-01-20 | 7 | -20/+359 |
|\ | | | | | Type identifiers. | ||||
| * | Make m_id const. | chriseth | 2017-01-20 | 1 | -1/+1 |
| | | |||||
| * | Reset AST node IDs between compilation runs. | chriseth | 2017-01-20 | 5 | -5/+28 |
| | | |||||
| * | Properly escape user strings and lists. | chriseth | 2017-01-19 | 3 | -56/+98 |
| | | |||||
| * | Type identifiers. | chriseth | 2017-01-19 | 4 | -3/+277 |
| | | |||||
* | | Merge pull request #1587 from ethereum/fixFunctionVisibility | Yoichi Hirai | 2017-01-19 | 2 | -2/+4 |
|\ \ | |/ |/| | Fix default function type name visibility. | ||||
| * | Fix default function type name visibility. | chriseth | 2017-01-19 | 2 | -2/+4 |
|/ | |||||
* | Merge pull request #1583 from federicobond/fix-comment | chriseth | 2017-01-19 | 1 | -1/+1 |
|\ | | | | | Fix typo in comment | ||||
| * | Fix typo in comment | Federico Bond | 2017-01-18 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1584 from ethereum/tier | chriseth | 2017-01-19 | 3 | -149/+149 |
|\ \ | | | | | | | libevmasm: remove duplicate `Tier` from `Tier::xTier`s | ||||
| * | | libevmasm: remove duplicate `Tier` from `Tier::xTier`s | Yoichi Hirai | 2017-01-19 | 3 | -149/+149 |
| | | | | | | | | | | | | Synchronize with cpp-ethereum | ||||
* | | | Merge pull request #1585 from ethereum/libraryfallback | chriseth | 2017-01-19 | 4 | -21/+42 |
|\ \ \ | |_|/ |/| | | Provide fallback for linking. | ||||
| * | | Provide fallback for linking. | chriseth | 2017-01-19 | 4 | -21/+42 |
| | | | |||||
* | | | Merge pull request #1581 from ethereum/fixosx | chriseth | 2017-01-18 | 1 | -2/+2 |
|\ \ \ | |/ / |/| | | Fix JSON output on macos. | ||||
| * | | Fix JSON output on macos. | chriseth | 2017-01-18 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #1397 from roadriverrail/contract_collision | chriseth | 2017-01-18 | 10 | -59/+82 |
|\ \ \ | |/ / |/| | | Error out when contracts collide on name | ||||
| * | | Provide fall-back method for contract lookup | Rhett Aultman | 2017-01-17 | 1 | -1/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | Properly, contracts are now looked up via <source>:<contract> identifiers called "fully qualified names." As a modicum of backward-compatibility, failure on a lookup is now backed up by seeing if the ":" exists at all, and if it doesn't, then the known contracts are scanned for any matching contract name. | ||||
| * | | Revert "Fix contract lookup in tests" | Rhett Aultman | 2017-01-17 | 5 | -10/+6 |
| | | | | | | | | | | | | This reverts commit f8914c6b281f398d6084f10708233bf79d633ef0. | ||||
| * | | Update changelog | Rhett Aultman | 2017-01-17 | 1 | -0/+3 |
| | | | |||||
| * | | Fix bad merge artifact(?) | Rhett Aultman | 2017-01-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | Looks like merging up munged line 188 in CommandLineInterface.cpp, so that a string literal was being used where a global variable should be. | ||||
| * | | Modify library collision test | Rhett Aultman | 2017-01-17 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | Since libaraies no longer collide on name but on fully-qualified name, you can only induce collision by colliding them as idenfitiers. | ||||
| * | | Revert "Move clashing libraries to common source in test" | Rhett Aultman | 2017-01-17 | 1 | -1/+2 |
| | | | | | | | | | | | | This reverts commit c4a9ca5cfe7a8b4ba9d2d84392c57d5eefacd1f7. | ||||
| * | | Remove checkLibraryNameClashes() | Rhett Aultman | 2017-01-17 | 2 | -37/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | The library name clash checker throws errors when two libraries of the same name are spotted. In a previous commit, this function was rewritten to use fully-qualified names instead, which makes it redundant to the checker for multiply-declared identifiers. Since it no longer serves a clear purpose, the function is being dropped. | ||||
| * | | Use fully-qualified names for linking, too | Rhett Aultman | 2017-01-17 | 3 | -15/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using libraries leaves behind a library link reference in the binary which the linker must later resolve. These link references were still being generated by name and not by fully-qualified name. This would lead to a link-time collision between two libraries having the same name but in different source units. This change changes linker symbols over to fully-qualified names, which resolves that issue. This does potentially introduce a new problem, which is that linker symbols appear to be limited to 36 characters and are truncated. Storing paths extends the average symbol size, and it would be great if truncation was from the tail rather than the head. | ||||
| * | | Remove unique error for contract collision | Rhett Aultman | 2017-01-17 | 1 | -39/+10 |
| | | | | | | | | | | | | | | | | | | Because contracts are uniquely identified by their source unit, there is no need for a unique error for this; it's actually covered by the checker for double-declaration of identifiers. | ||||
| * | | Fix contract lookup in tests | Rhett Aultman | 2017-01-17 | 5 | -6/+10 |
| | | | | | | | | | | | | | | | | | | The fully-qualified name of a contract with no source unit is :<Name> instead of just <Name>, so the test system needed to be adjusted accordingly. | ||||
| * | | Move fullyQualified() name to Declaration | Rhett Aultman | 2017-01-17 | 2 | -10/+1 |
| | | | |||||
| * | | Stylistic corrections | Rhett Aultman | 2017-01-17 | 3 | -11/+5 |
| | | | |||||
| * | | Move clashing libraries to common source in test | Rhett Aultman | 2017-01-17 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | Since contracts and libraries only collide if they share a common source file now, this test only works if both libraries are in the same source. | ||||
| * | | Push the error instead of throwing it | Rhett Aultman | 2017-01-17 | 1 | -10/+34 |
| | | | | | | | | | | | | | | | | | | | | | Throwing a CompilerError on multiple contract definition violates the expectations of the test suite, which thinks that compile() will return false if the code can't compile. This brings contract collision reporting in line with most of the other errors. | ||||
| * | | Drop ':' if the source file name is empty | Rhett Aultman | 2017-01-17 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | A large number of tests compile contracts while passing in an empty string for the source name. This leads to it being keyed by the name ":<contract>", while the tests try to look it up under the name "<contract>". This change resolves that issue by dropping the ':' in cases where there is, effectively, no source file to prepend anyway. | ||||
| * | | Only avoid collision if it's the same file | Rhett Aultman | 2017-01-17 | 5 | -14/+52 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | @chriseth had suggested that it would be better if contracts were referenced in a file:contract notation, and that we output .bin files that prepend original path names if necessary to avoid a collision. This commit is mostly a draft; it still needs to be run through the test suite. | ||||
| * | | Tab whitespace cleanup (again) | Rhett Aultman | 2017-01-17 | 1 | -1/+2 |
| | | | |||||
| * | | Tidy up the error message | Rhett Aultman | 2017-01-17 | 1 | -3/+3 |
| | | | |||||
| * | | Fix tab, drop stupid '!!!', change error message. | Rhett Aultman | 2017-01-17 | 1 | -3/+3 |
| | | | |||||
| * | | Error out when contracts collide on name | Rhett Aultman | 2017-01-17 | 1 | -0/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous behaviour, courtesy of the [] operator in std::map, would uncritically store a new ContractDefinition in m_contracts even when a ContractDefinition already existed. This "resolved" collissions on contract names by clobbering the original one with the new one, and could lead to scenarios where the clobber would only be discovered when the original ContractDefinition could not be found or referred to, which was an unhelpful InternalCompilerError. This change checks the m_contracts map for a collision first and will not let the ContractDefinition be changed to a new one once it's set, throwing a CompilerError with information about the conflict. | ||||
* | | | Merge pull request #1573 from ethereum/metadata-version | chriseth | 2017-01-17 | 6 | -1/+11 |
|\ \ \ | | | | | | | | | Store strict version number in metadata (exclude the platform) | ||||
| * | | | Include SOL_VERSION_COMMIT/SOL_VERSION_PLATFORM in buildinfo.h | Alex Beregszaszi | 2017-01-17 | 3 | -1/+6 |
| | | | | |||||
| * | | | Store strict version number in metadata (exclude the platform) | Alex Beregszaszi | 2017-01-17 | 4 | -1/+6 |
| | |/ | |/| | |||||
* | | | Merge pull request #1574 from ethereum/docs-version | chriseth | 2017-01-17 | 1 | -0/+18 |
|\ \ \ | | | | | | | | | Explain how version numbers are built | ||||
| * | | | Mention how our version maps to Semver | Alex Beregszaszi | 2017-01-17 | 1 | -0/+3 |
| | | | | |||||
| * | | | Explain how version numbers are built | Alex Beregszaszi | 2017-01-17 | 1 | -0/+15 |
| |/ / | |||||
* | | | Merge pull request #1575 from ethereum/docs-copyright-date | chriseth | 2017-01-17 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Update copyright date in docs | ||||
| * | | Update copyright date in docs | Alex Beregszaszi | 2017-01-17 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #1570 from ethereum/astidentifiers | chriseth | 2017-01-17 | 4 | -2/+11 |
|\ \ | | | | | | | Deterministic AST node identifiers. | ||||
| * | | Deterministic AST node identifiers. | chriseth | 2017-01-17 | 4 | -2/+11 |
|/ / | |||||
* / | Add git submodule init to build instructions (#1569) | Rhett Aultman | 2017-01-17 | 1 | -0/+5 |
|/ | |||||
* | Update SolidityLexer.py (#1567) | Nicola | 2017-01-16 | 1 | -0/+1 |
| | | | Added number unit keywords | ||||
* | Merge pull request #1564 from natzei/patch-1 | chriseth | 2017-01-13 | 1 | -1/+1 |
|\ | | | | | Update SolidityLexer.py | ||||
| * | Update SolidityLexer.py | Nicola | 2017-01-13 | 1 | -1/+1 |
|/ | | | 'payable' added as a keyword | ||||
* | Merge pull request #1562 from ethereum/gas-tier-enum-class | chriseth | 2017-01-13 | 3 | -141/+141 |
|\ | | | | | Make enum Tier into an enum class | ||||
| * | Make enum Tier into an enum class | Yoichi Hirai | 2017-01-13 | 3 | -141/+141 |
| | | |||||
* | | Merge pull request #1563 from ethereum/updateVersion | chriseth | 2017-01-13 | 3 | -3/+5 |
|\ \ | |/ |/| | Update version to 0.4.9. | ||||
| * | Update version to 0.4.9. | chriseth | 2017-01-13 | 3 | -3/+5 |
|/ | |||||
* | Update Changelog.md | chriseth | 2017-01-13 | 1 | -1/+1 |
| | |||||
* | Merge pull request #1479 from ethereum/function_variable_mixin | chriseth | 2017-01-13 | 9 | -67/+190 |
|\ | | | | | Disallow mixin of functions and attributes under the same name | ||||
| * | ast: events have FunctionType too | Yoichi Hirai | 2017-01-12 | 2 | -8/+17 |
| | | |||||
| * | analysis: use Declaration::functionType() in another location | Yoichi Hirai | 2017-01-12 | 1 | -11/+4 |
| | | |||||
| * | ast: add Declaration::functionType() | Yoichi Hirai | 2017-01-12 | 3 | -14/+80 |
| | | |||||
| * | Changelog: add a line about #1479 | Yoichi Hirai | 2017-01-12 | 1 | -0/+1 |
| | | |||||
| * | docs: document the resriction about a function and an event of the same ↵ | Yoichi Hirai | 2017-01-12 | 1 | -0/+7 |
| | | | | | | | | name, and so on | ||||
| * | test: allow multiple errors in modifier-function overriding | Yoichi Hirai | 2017-01-12 | 1 | -2/+6 |
| | | |||||
| * | analysis: avoid emscripten build failure | Yoichi Hirai | 2017-01-12 | 1 | -3/+3 |
| | | |||||
| * | analysis: changes necessary to compile std/StandardToken.sol | Yoichi Hirai | 2017-01-12 | 3 | -12/+58 |
| | | |||||
| * | analysis: allow some shadowings explicitly | Yoichi Hirai | 2017-01-12 | 3 | -56/+29 |
| | | |||||
| * | analysis: report errors when inheritance causes collision | Yoichi Hirai | 2017-01-12 | 1 | -1/+25 |
| | | |||||
* | | Merge pull request #1560 from ethereum/cmake | chriseth | 2017-01-13 | 2 | -0/+39 |
|\ \ | | | | | | | Travis CI: Install latest CMake | ||||
| * | | Travis CI: Install latest CMake | Paweł Bylica | 2017-01-12 | 2 | -0/+39 |
| | | | |||||
* | | | Merge pull request #1549 from ethereum/optimizeOptimizer | chriseth | 2017-01-13 | 12 | -461/+646 |
|\ \ \ | |/ / |/| | | Optimize optimizer | ||||
| * | | Minor changes from review. | chriseth | 2017-01-13 | 4 | -4/+3 |
| | | | |||||
| * | | Changelog entry. | chriseth | 2017-01-13 | 1 | -1/+2 |
| | | | |||||
| * | | Windows build fix. | chriseth | 2017-01-13 | 1 | -0/+2 |
| | | | |||||
| * | | Fix match groups. | chriseth | 2017-01-13 | 1 | -0/+1 |
| | | | |||||
| * | | Fix debug output. | chriseth | 2017-01-13 | 1 | -2/+8 |
| | | | |||||
| * | | Optimize constant optimization. | chriseth | 2017-01-13 | 2 | -37/+58 |
| | | | |||||
| * | | Optimise simplification rules (sort into bins). | chriseth | 2017-01-13 | 4 | -394/+514 |
| | | | |||||
| * | | Do not evaluate strings if assertion succeeds. | chriseth | 2017-01-13 | 1 | -20/+12 |
| | | | |||||
| * | | Optimize pattern matcher. | chriseth | 2017-01-13 | 2 | -16/+22 |
| | | | |||||
| * | | Optimise AssemblyItem::m_data. | chriseth | 2017-01-13 | 5 | -22/+59 |
|/ / | |||||
* | | Merge pull request #1548 from VoR0220/remappingBugFix | chriseth | 2017-01-12 | 4 | -9/+51 |
|\ \ | | | | | | | Remapping bug fix | ||||
| * | | fixed | VoR0220 | 2017-01-12 | 2 | -4/+4 |
| | | | | | | | | | | | | Signed-off-by: VoR0220 <rj@erisindustries.com> | ||||
| * | | added fix and a test for order independence of nested prefixing | VoR0220 | 2017-01-12 | 2 | -2/+20 |
| | | | | | | | | | | | | Signed-off-by: VoR0220 <rj@erisindustries.com> | ||||
| * | | cleanup | VoR0220 | 2017-01-12 | 3 | -16/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: VoR0220 <rj@erisindustries.com> fixup Signed-off-by: VoR0220 <rj@erisindustries.com> | ||||
| * | | changelog entry | VoR0220 | 2017-01-11 | 1 | -0/+2 |
| | | | | | | | | | | | | Signed-off-by: VoR0220 <rj@erisindustries.com> | ||||
| * | | fixed unused filepath bug | VoR0220 | 2017-01-11 | 1 | -2/+1 |
| | | | | | | | | | | | | Signed-off-by: VoR0220 <rj@erisindustries.com> | ||||
| * | | much smaller helper function | VoR0220 | 2017-01-10 | 2 | -5/+5 |
| | | | | | | | | | | | | Signed-off-by: VoR0220 <rj@erisindustries.com> | ||||
| * | | can do this purely on length. Also made prefix filesystem string for more ↵ | VoR0220 | 2017-01-09 | 1 | -27/+16 |
| | | | | | | | | | | | | | | | | | | accurate readings. Signed-off-by: VoR0220 <rj@erisindustries.com> | ||||
| * | | fixed test and added solution | VoR0220 | 2017-01-09 | 2 | -5/+28 |
| | | | | | | | | | | | | Signed-off-by: VoR0220 <rj@erisindustries.com> | ||||
| * | | added test | VoR0220 | 2017-01-09 | 1 | -0/+11 |
| | | | | | | | | | | | | Signed-off-by: VoR0220 <rj@erisindustries.com> | ||||
* | | | Merge pull request #1558 from anders94/doc-rewording | chriseth | 2017-01-12 | 1 | -2/+2 |
|\ \ \ | |_|/ |/| | | Re-wording for Clarity | ||||
| * | | Re-word somewhat bumpy sentence to be more clear. | Anders Brownworth | 2017-01-12 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #1555 from ethereum/chriseth-patch-1 | Yoichi Hirai | 2017-01-12 | 1 | -0/+3 |
|\ \ \ | |/ / |/| | | Changelog entry about assembly output | ||||
| * | | Changelog entry about assembly output | chriseth | 2017-01-11 | 1 | -0/+3 |
|/ / | |||||
* | | Merge pull request #1553 from federicobond/improve-grammar | chriseth | 2017-01-11 | 1 | -5/+11 |
|\ \ | | | | | | | Improve grammar specification | ||||
| * | | grammar.txt: Replace Identifier for Typename in NewExpression | Federico Bond | 2017-01-11 | 1 | -1/+1 |
| | | | |||||
| * | | grammar.txt: Add named function arguments | Federico Bond | 2017-01-11 | 1 | -1/+7 |
| | | | |||||
| * | | grammar.txt: Move StorageLocation? up to VariableDeclaration | Federico Bond | 2017-01-11 | 1 | -3/+3 |
|/ / | |||||
* | | Merge pull request #1330 from ethereum/assemblyDef | chriseth | 2017-01-11 | 5 | -51/+1056 |
|\ \ | | | | | | | Assembly definition. | ||||
| * | | Move explanatory sections and other small changes. | chriseth | 2017-01-09 | 1 | -183/+192 |
| | | | |||||
| * | | Typos and clarifications. | chriseth | 2017-01-04 | 1 | -13/+17 |
| | | | |||||
| * | | More information about switch, loops and functions. | chriseth | 2017-01-04 | 1 | -1/+78 |
| | | | |||||
| * | | Update to new assembly specification. | chriseth | 2017-01-03 | 1 | -31/+381 |
| | | | |||||
| * | | Rename programSize to bytecodeSize. | chriseth | 2017-01-03 | 1 | -1/+1 |
| | | | |||||
| * | | Assembly output for Assembly object. | chriseth | 2017-01-03 | 3 | -51/+105 |
| | | | |||||
| * | | Assembly definition. | chriseth | 2017-01-03 | 2 | -0/+511 |
| | | | |||||
* | | | Merge pull request #1542 from ethereum/publishTarball | chriseth | 2017-01-09 | 2 | -36/+49 |
|\ \ \ | |_|/ |/| | | Create source tarballs for releases. | ||||
| * | | Replace `` by $(). | chriseth | 2017-01-09 | 1 | -4/+3 |
| | | | |||||
| * | | Create source tarballs for releases. | chriseth | 2017-01-04 | 2 | -36/+50 |
| | | | |||||
* | | | Merge pull request #1537 from ethereum/absolute-path | chriseth | 2017-01-07 | 4 | -5/+15 |
|\ \ \ | | | | | | | | | absolute path detection is not confused by ".dir" | ||||
| * | | | Changelog: document #1537 | Yoichi Hirai | 2017-01-06 | 1 | -0/+1 |
| | | | | |||||
| * | | | test: add a test importing a file name starting with a period | Yoichi Hirai | 2017-01-04 | 1 | -0/+8 |
| | | | | |||||
| * | | | interface: change absolutePath() so that ".dir" is considered as an absolute ↵ | Yoichi Hirai | 2017-01-04 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | path fixes #1534 | ||||
| * | | | docs: clarify what are considered as absolute paths | Yoichi Hirai | 2017-01-04 | 1 | -2/+3 |
| |/ / | |||||
* | | | Merge pull request #1545 from federicobond/refactor-rename | chriseth | 2017-01-05 | 1 | -3/+3 |
|\ \ \ | |/ / |/| | | Rename contractName to typeName when parsing new expression | ||||
| * | | Rename contractName to typeName when parsing new expression | Federico Bond | 2017-01-05 | 1 | -3/+3 |
| | | | |||||
* | | | Merge pull request #1541 from ethereum/stabelnodejs | chriseth | 2017-01-03 | 1 | -0/+1 |
|\ \ \ | |_|/ |/| | | Require stable nodejs for deployment. | ||||
| * | | Require stable nodejs for deployment. | chriseth | 2017-01-03 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #1474 from ethereum/event-lookup-base-name | chriseth | 2017-01-03 | 4 | -9/+61 |
|\ \ \ | | | | | | | | | Event lookup with base name | ||||
| * | | | ast, codegen: enable accessing events through contract names. | Yoichi Hirai | 2017-01-03 | 3 | -9/+39 |
| | | | | | | | | | | | | | | | | Fixes #1286 | ||||
| * | | | test: add a test case for #1286 | Yoichi Hirai | 2017-01-03 | 1 | -0/+22 |
| | | | | |||||
* | | | | Merge pull request #1527 from federicobond/elementarytypenameconversion | chriseth | 2017-01-03 | 1 | -1/+8 |
|\ \ \ \ | | | | | | | | | | | Add ElementaryTypeNameExpression to grammar.txt | ||||
| * | | | | Add ElementaryTypeNameExpression to grammar.txt | Federico Bond | 2017-01-02 | 1 | -1/+8 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #1538 from ethereum/multi-keys | chriseth | 2017-01-03 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | doc: rephrase the case when two remapping keys are applicable | ||||
| * | | | | doc: rephrase the case when two remapping keys are applicable | Yoichi Hirai | 2017-01-02 | 1 | -2/+2 |
| | |/ / | |/| | | | | | | | | | | Fixes #1536 | ||||
* | | | | Merge pull request #1526 from federicobond/docs-grammar | chriseth | 2017-01-03 | 1 | -0/+9 |
|\ \ \ \ | |/ / / |/| | | | Add parsers and grammars to documentation | ||||
| * | | | Add parsers and grammars to documentation | Federico Bond | 2017-01-02 | 1 | -0/+9 |
| | | | | |||||
* | | | | Merge pull request #1530 from federicobond/remove-syntax-highlighting | chriseth | 2017-01-02 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | Remove wrong syntax highlighting in docs | ||||
| * | | | | Remove wrong syntax highlighting in docs | Federico Bond | 2016-12-29 | 1 | -0/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #1529 from federicobond/right-shifts | chriseth | 2017-01-02 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Add missing right-hand side expression for shifts | ||||
| * | | | | Add missing right-hand side expression for shifts | Federico Bond | 2016-12-28 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #1528 from federicobond/userdefinedtypename | chriseth | 2017-01-02 | 1 | -2/+10 |
|\ \ \ \ | | | | | | | | | | | Add UserDefinedTypeName to grammar.txt | ||||
| * | | | | Add UserDefinedTypeName to grammar.txt | Federico Bond | 2016-12-28 | 1 | -2/+10 |
| |/ / / | |||||
* | | | | Merge pull request #1531 from ethereum/srcmap | chriseth | 2017-01-02 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | libevmasm: OpPop() optimization keeps the source location | ||||
| * | | | libevmasm: OpPop() optimization keeps the source location | Yoichi Hirai | 2016-12-30 | 1 | -1/+1 |
|/ / / | | | | | | | | | | fixes #1521 | ||||
* | | | Merge pull request #1522 from federicobond/patch-2 | Yoichi Hirai | 2016-12-27 | 1 | -3/+6 |
|\ \ \ | | | | | | | | | Fix some grammar.txt inconsistencies | ||||
| * | | | Add unimplemented functions to grammar | Federico Bond | 2016-12-27 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix NumberLiteral rule for hex numbers | Federico Bond | 2016-12-25 | 1 | -1/+4 |
| | | | | |||||
| * | | | Fix StorageLocation position for ArrayTypeName rule in grammar | Federico Bond | 2016-12-25 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #1518 from mcoblenz/patch-2 | chriseth | 2016-12-22 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Corrected explanation of recursive contract creation | ||||
| * | | | Corrected explanation per discussion. | Michael Coblenz | 2016-12-22 | 1 | -2/+2 |
| | | | | |||||
| * | | | Clarified support for recursive creation. | Michael Coblenz | 2016-12-21 | 1 | -2/+2 |
| | | | | |||||
| * | | | Fixed misleading typo | Michael Coblenz | 2016-12-20 | 1 | -1/+1 |
| | |/ | |/| | | | | "now possible" should instead read "not possible." | ||||
* | | | Merge pull request #1519 from federicobond/patch-1 | Yoichi Hirai | 2016-12-22 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Fix mapping syntax in docs | ||||
| * | | Fix mapping syntax in docs | Federico Bond | 2016-12-22 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #1515 from ethereum/version | chriseth | 2016-12-16 | 3 | -3/+5 |
|\ \ | |/ |/| | Update develop version. |