aboutsummaryrefslogtreecommitdiffstats
path: root/libsolidity
Commit message (Expand)AuthorAgeFilesLines
* Rename Bare to BarecallAlex Beregszaszi2017-08-014-12/+12
* Fix for invalid clearing of memory in ecrecover.chriseth2017-07-281-1/+1
* Remove the need of jumping out of the fallbackAlex Beregszaszi2017-07-281-8/+4
* Disallow externalSignature for fallback functionsAlex Beregszaszi2017-07-281-0/+1
* Add isFallback() helperAlex Beregszaszi2017-07-284-6/+9
* Merge pull request #2635 from ethereum/fixCrashOnAssignmentToNonLValueAlex Beregszaszi2017-07-271-1/+3
|\
| * Fix crash on assignment to non-lvalue.chriseth2017-07-261-1/+3
* | Merge pull request #2652 from ethereum/fixMultiModifierchriseth2017-07-273-8/+11
|\ \
| * | Re-allow multiple modifiers per function.chriseth2017-07-273-8/+11
* | | Merge pull request #2645 from ethereum/assertsAlex Beregszaszi2017-07-277-51/+36
|\ \ \ | |/ / |/| |
| * | Use solAssert instead of boost throw where possibleAlex Beregszaszi2017-07-277-51/+36
* | | Merge pull request #2643 from ethereum/compilerstackYoichi Hirai2017-07-272-39/+55
|\ \ \
| * | | Reorder CompilerStack to be in logical orderAlex Beregszaszi2017-07-272-39/+55
| |/ /
* | | Merge pull request #2644 from ethereum/toodeepYoichi Hirai2017-07-272-1/+7
|\ \ \
| * | | Report location on stack too deep if possibleAlex Beregszaszi2017-07-272-1/+7
| |/ /
* | | Merge pull request #2646 from ethereum/standardcompilerYoichi Hirai2017-07-271-18/+23
|\ \ \
| * | | DocstringParsingError is not thrown anymore in StandardCompilerAlex Beregszaszi2017-07-271-16/+8
| * | | Catch FatalError in StandardCompilerAlex Beregszaszi2017-07-271-3/+16
| |/ /
* | | Merge pull request #2566 from ethereum/metadata-only-relevantchriseth2017-07-273-2/+39
|\ \ \ | |/ / |/| |
| * | Add template for merging setsAlex Beregszaszi2017-07-191-4/+1
| * | Avoid cyclic imports in referencedSourceUnitsAlex Beregszaszi2017-07-192-6/+11
| * | Only include files usde in metadataAlex Beregszaszi2017-07-191-0/+9
| * | Add option to recurse referencedSourceUnitsAlex Beregszaszi2017-07-192-5/+10
| * | Add referencedSourceUnits() helperAlex Beregszaszi2017-07-192-0/+13
| * | Add sourceUnit() helper to DeclarationAlex Beregszaszi2017-07-192-2/+10
* | | Merge pull request #1637 from ethereum/warn-shadowing-globalschriseth2017-07-264-52/+122
|\ \ \
| * | | Warn about shadowing variables.Alex Beregszaszi2017-07-254-52/+122
| | |/ | |/|
* | | Add CompilerStack::setOptimiserSettingsAlex Beregszaszi2017-07-263-9/+12
* | | Add CompilerStack::setLibrariesAlex Beregszaszi2017-07-263-6/+12
* | | Remove unused interfaces from CompilerStackAlex Beregszaszi2017-07-262-38/+4
|/ /
* | Cleanup fixed point type changeschriseth2017-07-203-61/+37
* | Change fixed point types to have digit countVoR02202017-07-204-59/+77
* | Migrate over to ErrorReporterRhett Aultman2017-07-191-1/+1
* | Warn if this is used in constructorAlex Beregszaszi2017-07-192-0/+15
|/
* Merge pull request #2589 from ethereum/rename-onchainmetadataYoichi Hirai2017-07-193-11/+11
|\
| * Rename onChainMetadata to metadataAlex Beregszaszi2017-07-193-11/+11
* | Merge pull request #2597 from ethereum/modifier-internalYoichi Hirai2017-07-191-1/+1
|\ \
| * | Mark modifiers as internalAlex Beregszaszi2017-07-191-1/+1
| |/
* | Merge pull request #2593 from ethereum/parser-error-textYoichi Hirai2017-07-191-1/+1
|\ \
| * | Update parser error for pragma/import/contractAlex Beregszaszi2017-07-191-1/+1
| |/
* / Remove unneccesary interface from NatspecAlex Beregszaszi2017-07-193-31/+6
|/
* Mark const variablesAlex Beregszaszi2017-07-181-4/+4
* Reorder code for readabilityAlex Beregszaszi2017-07-181-9/+9
* Include types in explicit conversion error messageAlex Beregszaszi2017-07-141-1/+8
* Disable large arrays for memory location tooAlex Beregszaszi2017-07-141-1/+5
* Issue error properly for oversized arrays for calldataAlex Beregszaszi2017-07-143-1/+23
* Merge pull request #2504 from ethereum/inlineasm-decl-emptyAlex Beregszaszi2017-07-133-12/+26
|\
| * Rename expectedItems to numVariablesAlex Beregszaszi2017-07-131-3/+3
| * Support parsing let statements without a valueAlex Beregszaszi2017-07-133-11/+25
* | Merge pull request #2567 from ethereum/refactorExceptionschriseth2017-07-133-19/+13
|\ \ | |/ |/|
| * Refactor exceptions and provide comment function.chriseth2017-07-133-19/+13
* | Add type error when attempting value transfer to a non-payable contractFederico Bond2017-07-133-0/+29
|/
* Merge pull request #2501 from ethereum/undef-macroschriseth2017-07-123-2/+47
|\
| * Move UndefMacros from libdevcore to libsolidity/parsingAlex Beregszaszi2017-07-023-2/+47
* | Issue proper warning trying to access calldata variables in inline assemblyAlex Beregszaszi2017-07-121-1/+4
* | Helper functions.chriseth2017-07-114-0/+40
* | Fix invalid "explicit storage keyword" warning for reference members of structs.chriseth2017-07-111-1/+1
* | Deprecate throw.chriseth2017-07-062-0/+13
* | Merge pull request #2528 from ethereum/warnNoStoragechriseth2017-07-062-5/+20
|\ \
| * | Warn if local storage reference variable does not use "storage" explicitly.chriseth2017-07-062-5/+20
* | | Merge pull request #2527 from ethereum/onlyASTIfAnalysisSuccessfulchriseth2017-07-061-2/+2
|\ \ \
| * | | Only output AST if the analysis was successful.chriseth2017-07-061-2/+2
| |/ /
* / / Do not omit error type.chriseth2017-07-061-4/+4
|/ /
* | Fix internal "variable already present" error.chriseth2017-07-051-0/+3
* | Merge pull request #2507 from ethereum/jsonio-safechriseth2017-07-032-14/+17
|\ \
| * | Use more refined states in StandardCompilerAlex Beregszaszi2017-07-031-6/+7
| * | Export CompilerStack stateAlex Beregszaszi2017-07-031-8/+10
| |/
* | Merge pull request #2503 from ethereum/julia-analyzerchriseth2017-07-032-4/+3
|\ \
| * | Add Julia mode as an option to EVMCodeTransformAlex Beregszaszi2017-07-032-3/+2
| * | Run analyzer in Julia mode if requested in AssemblyStackAlex Beregszaszi2017-07-021-1/+1
| |/
* | Add assert to shift helperAlex Beregszaszi2017-07-031-0/+2
* | Use shift helper in LValueAlex Beregszaszi2017-07-031-4/+2
* | More uses of shift helperAlex Beregszaszi2017-07-031-6/+10
* | Change shiftNumberOnStack to bitsAlex Beregszaszi2017-07-033-13/+13
* | Use shift helperAlex Beregszaszi2017-07-032-8/+8
* | Add shift helper to CompilerUtilsAlex Beregszaszi2017-07-032-0/+16
|/
* Remove parsing of why3 doc stringsAlex Beregszaszi2017-07-012-13/+1
* Remove Why3 error classAlex Beregszaszi2017-07-014-27/+0
* Warn on JUMP/JUMPI in inline assemblyAlex Beregszaszi2017-07-012-4/+11
* Merge pull request #2491 from ethereum/warnAboutCallcodeAlex Beregszaszi2017-07-011-0/+8
|\
| * Warn about callcode.chriseth2017-06-301-0/+8
* | Abort early if there is nothing to encode or decode.chriseth2017-06-302-3/+9
|/
* Merge pull request #2457 from ethereum/fixNegativeStackHeightAlex Beregszaszi2017-06-292-1/+18
|\
| * Document appendFunctionSelectorAlex Beregszaszi2017-06-291-0/+4
| * Stack adjustment and code generation for fallback function.chriseth2017-06-291-4/+6
| * Fix negative stack size checks.chriseth2017-06-282-0/+11
* | Use boost::starts_withAlex Beregszaszi2017-06-291-1/+1
* | Rename to isHexNumber()Alex Beregszaszi2017-06-293-5/+5
* | Add hasHexPrefix() to AST::LiteralAlex Beregszaszi2017-06-283-7/+16
|/
* Give min and max values in warning message.chriseth2017-06-281-1/+9
* Warn if using var x = 0chriseth2017-06-281-0/+24
* Merge pull request #2464 from federicobond/deprecate-function-type-nameschriseth2017-06-272-0/+14
|\
| * Warn deprecated usage of parameter names in function typesFederico Bond2017-06-272-0/+14
* | Merge pull request #2437 from ethereum/warnDoubleCopyStorageAlex Beregszaszi2017-06-272-0/+34
|\ \
| * | Warn about copies in storage that might overwrite unexpectedly.chriseth2017-06-262-0/+34
* | | Merge pull request #2459 from ethereum/noComparisonForSomeTypesAlex Beregszaszi2017-06-273-5/+15
|\ \ \
| * | | Only allow equality checks for internal function types.chriseth2017-06-261-1/+1
| * | | Disallow comparisons between some types.chriseth2017-06-263-5/+15
| |/ /
* | | Merge pull request #2453 from ethereum/memcopyAsForLoopAlex Beregszaszi2017-06-272-23/+20
|\ \ \ | |/ / |/| |
| * | Comment about zero length.chriseth2017-06-271-0/+2
| * | Reformat.chriseth2017-06-261-6/+9
| * | Use for loop for assembly memcopy.chriseth2017-06-261-23/+15
* | | Merge pull request #2450 from ethereum/addressstringAlex Beregszaszi2017-06-261-0/+2
|\ \ \
| * | | Fix strings interpreted as addresses.chriseth2017-06-221-0/+2
* | | | Merge pull request #2460 from ethereum/disallowMultiModifierAlex Beregszaszi2017-06-263-0/+18
|\ \ \ \
| * | | | Disallow invoking the same modifier multiple times.chriseth2017-06-243-0/+18
* | | | | Merge pull request #2442 from ethereum/remove-why3chriseth2017-06-264-1067/+0
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Remove Why3 generatorAlex Beregszaszi2017-06-254-1067/+0
| |/ / /
* | | | Merge pull request #2449 from federicobond/warn-bytesxx-decimalchriseth2017-06-261-1/+18
|\ \ \ \
| * | | | Warn if decimal literals are used in a bytesXX contextFederico Bond2017-06-241-1/+18
* | | | | Review suggestions.chriseth2017-06-241-1/+1
* | | | | Change invalid opcode to revert for input validation.chriseth2017-06-246-20/+52
| |/ / / |/| | |
* | | | Merge pull request #2448 from federicobond/constant-addresseschriseth2017-06-231-5/+5
|\ \ \ \
| * | | | Fix address literals not being treated as compile-time constantsFederico Bond2017-06-231-5/+5
* | | | | Merge pull request #2443 from ethereum/julia-asm-sizechriseth2017-06-231-0/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Support appendAssemblySize() in AbstractAssemblyAlex Beregszaszi2017-06-231-0/+5
* | | | | Merge pull request #2444 from ethereum/parser-scannerAlex Beregszaszi2017-06-233-5/+25
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Avoid including Scanner.h in ParserBase.hAlex Beregszaszi2017-06-233-5/+25
| | |_|/ | |/| |
* | | | Merge pull request #2452 from ethereum/fixPassingEmptyStringAlex Beregszaszi2017-06-231-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix ABI encoding of empty string literal.chriseth2017-06-221-1/+1
| | |/ | |/|
* | | Merge pull request #2408 from federicobond/constant-parameterschriseth2017-06-231-1/+8
|\ \ \ | |/ / |/| |
| * | Fix segmentation fault with constant function parametersFederico Bond2017-06-221-1/+8
| |/
* | Merge pull request #2404 from ethereum/methodidentifiersAlex Beregszaszi2017-06-223-18/+12
|\ \
| * | Make compiler.contractDefinition privateAlex Beregszaszi2017-06-221-3/+4
| * | Rework functionHashes into methodIdentifiersAlex Beregszaszi2017-06-223-7/+8
| * | Use compilerStack.functionHashes in StandardCompilerAlex Beregszaszi2017-06-221-9/+1
| |/
* / Merge interface/Exceptions and interface/UtilsAlex Beregszaszi2017-06-2218-61/+19
|/
* Merge pull request #2409 from federicobond/trailing-commas-2chriseth2017-06-191-3/+9
|\
| * Improve error reporting of trailing commasFederico Bond2017-06-161-3/+9
* | Merge pull request #2416 from federicobond/multiple-specifierschriseth2017-06-191-0/+6
|\ \
| * | Display error if payable or constant is specified multiple timesFederico Bond2017-06-171-0/+6
* | | Merge pull request #2225 from ethereum/julia-forchriseth2017-06-1915-77/+159
|\ \ \ | |/ / |/| |
| * | Split block code generation into main and finalize.chriseth2017-06-162-2/+2
| * | Helper to count the number of variables in a scope.chriseth2017-06-163-3/+12
| * | Add include file to forward-declare inline assembly structs.chriseth2017-06-166-77/+64
| * | For loops analysis.chriseth2017-06-162-4/+41
| * | Parse for statement in assembly parser / printerAlex Beregszaszi2017-06-1610-3/+52
| |/
* / Try to recover from parser errors where possibleFederico Bond2017-06-161-13/+22
|/
* Merge pull request #2382 from ruchevits/combined-json-hasheschriseth2017-06-152-0/+11
|\
| * Reverted functionHashes output to use method signature as keysEdward Ruchevits2017-06-141-1/+1
| * Allow including hashes of method signatures in --combined-json outputEdward Ruchevits2017-06-142-0/+11
* | Move subroutine helpers from CompilerContext to AssemblyAlex Beregszaszi2017-06-151-3/+3
* | Remove obsolete errorTag()Alex Beregszaszi2017-06-151-2/+0
* | Merge pull request #2192 from winsvega/developAlex Beregszaszi2017-06-151-17/+11
|\ \
| * | add new opcode instructions to the parserDimitry2017-06-151-17/+11
* | | Merge pull request #2381 from ethereum/fixcrashchriseth2017-06-151-4/+1
|\ \ \
| * | | Silence compiler warning.chriseth2017-06-141-1/+1
| * | | Fix a crash about a non-callable expression.chriseth2017-06-141-4/+1
| | |/ | |/|
* | | Merge pull request #2384 from ethereum/parseFunctionalInstructionschriseth2017-06-151-0/+13
|\ \ \ | |_|/ |/| |
| * | Enforce function arguments when parsing functional instructions.chriseth2017-06-141-0/+13
* | | Display user friendly instruction nameAlex Beregszaszi2017-06-141-5/+12
* | | Issue warning for using CREATE2 in inline assemblyAlex Beregszaszi2017-06-141-2/+3
* | | Merge pull request #2392 from federicobond/disallow-trailing-commaschriseth2017-06-141-4/+9
|\ \ \ | |/ / |/| |
| * | Forbid trailing commas in named argumentsFederico Bond2017-06-141-4/+9
| |/
* | Merge pull request #2331 from ethereum/ASTDocumentationEntrychriseth2017-06-141-0/+1
|\ \
| * | documentation field added to ContractDefinition-Nodedjudjuu2017-05-311-0/+1
* | | Merge pull request #2327 from ethereum/assembler-objectchriseth2017-06-142-5/+19
|\ \ \
| * | | Supply text representation of assemblyAlex Beregszaszi2017-06-091-1/+3
| * | | Introduce MachineAssemblyObjectAlex Beregszaszi2017-06-092-5/+17
* | | | Merge pull request #2389 from ethereum/moveLabelIDschriseth2017-06-144-25/+12
|\ \ \ \ | |_|_|/ |/| | |
| * | | Move "active variable" to analysis phase.chriseth2017-06-143-16/+10
| * | | Remove struct constructor.chriseth2017-06-142-2/+1
| * | | Move stack height to generation phase.chriseth2017-06-141-2/+0
| * | | Move LabelIDs to generation phase.chriseth2017-06-141-5/+1
| |/ /
* | | Add a warning about a varialbe of the name of an instructionYoichi Hirai2017-06-133-0/+27
* | | Warn if returndatasize/returndatacopy is usedAlex Beregszaszi2017-06-132-1/+20
|/ /
* | Merge pull request #2362 from ethereum/lowercase_instructionsAlex Beregszaszi2017-06-092-11/+30
|\ \
| * | Use lowercase when reporting instruction error.chriseth2017-06-092-11/+30
* | | Remove excess includesAlex Beregszaszi2017-06-092-1/+1
* | | Simplify CodeGenerator by remove seldom used caseAlex Beregszaszi2017-06-093-18/+2
* | | Remove obsolete AsmStackAlex Beregszaszi2017-06-092-175/+0
* | | Use inline assembly directly and not via AsmStackAlex Beregszaszi2017-06-091-3/+17
|/ /
* | Comments and consistent variable names.chriseth2017-06-091-4/+4
* | Fix: Copy resolver.chriseth2017-06-081-1/+1
* | Visitor bugfix.chriseth2017-06-082-6/+18
* | Remove error reporter from code generation phase.chriseth2017-06-086-24/+14
* | Some more comments.chriseth2017-06-081-2/+0
* | Correct stack height adjustment after returnsub.chriseth2017-06-081-1/+1
* | Generate only single error in inline assembly.chriseth2017-06-082-3/+12
* | Introduce machine-dependent stack adjustment.chriseth2017-06-081-4/+2
* | Initial EVM1.5 assembly implementation.chriseth2017-06-0810-21/+99
* | Refactor AssemblyStackAlex Beregszaszi2017-06-072-4/+7
* | Add analyze(block) to AssemblyStackAlex Beregszaszi2017-06-072-0/+18
* | Reset error list in parseAndAnalyzeAlex Beregszaszi2017-06-071-0/+1
* | Merge pull request #2332 from ethereum/fixLiteralPrintchriseth2017-06-062-2/+18
|\ \
| * | adjusted testcase and renamingdjudjuu2017-06-062-5/+3
| * | fix Literalprintdjudjuu2017-05-312-2/+20
| |/
* | Merge pull request #2336 from ethereum/expectExpressionchriseth2017-06-012-38/+29
|\ \
| * | Add comma.chriseth2017-06-011-1/+1
| * | Improved error message.chriseth2017-06-011-1/+1
| * | Refactor to use expectExpression in analyzer.chriseth2017-06-012-38/+29
* | | Fix state after CompilerStack.reset()Alex Beregszaszi2017-06-012-1/+26
* | | Remove unused functions from CompilerStackAlex Beregszaszi2017-06-012-48/+0
|/ /
* | Merge pull request #2317 from ethereum/keccak256chriseth2017-05-315-8/+10
|\ \ | |/ |/|
| * Alias sha3 to keccak256 in inline assemblyAlex Beregszaszi2017-05-301-0/+2
| * Rename the SHA3 assembly instruction to KECCAK256Alex Beregszaszi2017-05-304-8/+8
* | Refactor error reportingRhett Aultman2017-05-3039-663/+718
|/
* Merge pull request #2319 from ethereum/virtualBlockschriseth2017-05-295-21/+28
|\
| * Introduce virtual blocks for function arguments.chriseth2017-05-295-21/+28
* | Introduce LabelID typedef.chriseth2017-05-292-3/+4
|/
* Merge pull request #2311 from ethereum/julia-typeschriseth2017-05-295-13/+37
|\
| * Move builtin type list to the topAlex Beregszaszi2017-05-271-1/+7
| * Change error message for invalid typeAlex Beregszaszi2017-05-271-1/+1
| * Introduce Julia mode in AsmAnalyzerAlex Beregszaszi2017-05-275-7/+13
| * Validate that only basic types are used in JuliaAlex Beregszaszi2017-05-272-0/+21
| * Move constructor to AsmAnalyzer headerAlex Beregszaszi2017-05-272-11/+2
* | Pull out common code to a helperAlex Beregszaszi2017-05-272-24/+15
* | Remove duplicate codeAlex Beregszaszi2017-05-271-20/+18
* | Use the new ParserBase API in AsmParserAlex Beregszaszi2017-05-271-33/+33
* | Add scanner helpers to ParserBaseAlex Beregszaszi2017-05-271-1/+5
* | Move Solidity specific methods from ParserBase to the Solidity ParserAlex Beregszaszi2017-05-274-60/+60
|/
* More comments for assemblychriseth2017-05-261-0/+2
* Adapt EVM codegen to new namespace.chriseth2017-05-2613-78/+51
* Move EVM codegen to libjulia.chriseth2017-05-261-238/+0
* Support multiple assembly front and backends.chriseth2017-05-262-0/+170
* Merge pull request #2316 from ethereum/inlineasm-cleanupchriseth2017-05-261-5/+2
|\
| * Better error message for elementary operationsAlex Beregszaszi2017-05-261-5/+2
* | Merge pull request #2224 from ethereum/julia-switchchriseth2017-05-2611-2/+124
|\ \
| * | Better error messages for invalid switch casesAlex Beregszaszi2017-05-261-0/+4
| * | Disallow instructions as a switch expressionAlex Beregszaszi2017-05-261-0/+2
| * | Visit case bodies in scope fillerAlex Beregszaszi2017-05-262-1/+10
| * | Do not stop on first switch errorAlex Beregszaszi2017-05-261-5/+7
| * | Check token within parseCaseAlex Beregszaszi2017-05-262-7/+9
| * | Switch cases are not followed by colonAlex Beregszaszi2017-05-262-3/+2
| * | Change switch case string to LiteralAlex Beregszaszi2017-05-264-15/+26
| * | Implement switch statement in the assembly parser/printerAlex Beregszaszi2017-05-2610-2/+95
| |/
* | Also change error message.chriseth2017-05-261-1/+1
* | Scanner requires only the SourcesSet stateAlex Beregszaszi2017-05-251-1/+1
|/
* Uniform error messagesAlex Beregszaszi2017-05-241-3/+4
* Better error messages during parsing functional instructionsAlex Beregszaszi2017-05-241-0/+9
* Merge pull request #2301 from ethereum/ASTFunctionTypeFixchriseth2017-05-242-2/+4
|\
| * insert ParameterList-node in FunctionType-jsondjudjuu2017-05-242-2/+4
* | Merge pull request #2294 from ethereum/inlineasmchriseth2017-05-241-0/+1
|\ \
| * | Fix scope assert in AsmAnalyzerAlex Beregszaszi2017-05-241-0/+1
| |/
* | Merge pull request #2289 from ethereum/astjson-fixchriseth2017-05-241-1/+1
|\ \ | |/ |/|
| * Fix AST JSON converter type lookupAlex Beregszaszi2017-05-241-1/+1
* | Rename parseFunctionalInstruction to parseCallAlex Beregszaszi2017-05-242-4/+4
* | Reorder AsmData for readabilityAlex Beregszaszi2017-05-241-7/+14
* | Rename FunctionalAssignment to AssignmentAlex Beregszaszi2017-05-249-22/+21
* | Rename Assignment to StackAssignmentAlex Beregszaszi2017-05-249-15/+15
* | Merge pull request #2292 from roadriverrail/inline_asm_unused_warningAlex Beregszaszi2017-05-241-3/+0
|\ \ | |/ |/|
| * Drop the inline asm includes from StaticAnalyzerRhett Aultman2017-05-231-3/+0
* | Display actual error message and not assertion in analysisAlex Beregszaszi2017-05-231-1/+9
* | Enable a single right hand item on letAlex Beregszaszi2017-05-235-37/+7
* | Support multiple variables in a variable declaration in inline assemblyAlex Beregszaszi2017-05-236-15/+71
* | Merge pull request #2265 from roadriverrail/inline_asm_unused_warningchriseth2017-05-222-2/+24
|\|
| * Analyze InlineAssembly for variable useRhett Aultman2017-05-222-2/+24
* | Merge pull request #1810 from ethereum/compactJsonchriseth2017-05-229-471/+552
|\ \
| * | minor fixes and changelog updatedjudjuu2017-05-222-1/+2
| * | refactoring functionCallAnnotationdjudjuu2017-05-196-21/+51