aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Change invalid opcode to revert for input validation.chriseth2017-06-247-20/+53
* Merge pull request #2461 from ethereum/fixWindows234chriseth2017-06-241-0/+0
|\
| * Update deps: Download boost again for Windows.chriseth2017-06-241-0/+0
|/
* Merge pull request #2213 from ethereum/jsoncompilerchriseth2017-06-232-120/+90
|\
| * Rewrite jsonCompiler using StandardCompilerAlex Beregszaszi2017-06-222-120/+90
* | Merge pull request #2455 from LefterisJP/bump_cpp_dependencieschriseth2017-06-231-0/+0
|\ \
| * | Bump cpp-dependencies to include jsoncpp fixLefteris Karapetsas2017-06-231-0/+0
* | | Merge pull request #2439 from ethereum/lll-varsAlex Beregszaszi2017-06-233-9/+35
|\ \ \
| * | | LLL: remove obsolete headerAlex Beregszaszi2017-06-231-6/+0
| * | | LLL: fix the set keyword (create symbol if not present)Alex Beregszaszi2017-06-232-3/+33
| * | | LLL: report correct name if a symbol was not foundAlex Beregszaszi2017-06-231-1/+1
| * | | LLL: do not allow empty variable namesAlex Beregszaszi2017-06-231-0/+2
* | | | Merge pull request #2448 from federicobond/constant-addresseschriseth2017-06-233-5/+16
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix address literals not being treated as compile-time constantsFederico Bond2017-06-232-5/+6
| * | | Check for constness of address constant.chriseth2017-06-231-0/+10
* | | | Merge pull request #2401 from federicobond/update-grammarchriseth2017-06-232-7/+17
|\ \ \ \
| * | | | Fix and improve grammar.txtFederico Bond2017-06-232-5/+8
| * | | | grammar.txt: Fix grammar for f.gas(p).value(q)() style callsFederico Bond2017-06-231-4/+11
* | | | | Merge pull request #2443 from ethereum/julia-asm-sizechriseth2017-06-234-4/+35
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Refactor updateReferenceAlex Beregszaszi2017-06-232-7/+11
| * | | | Support appendAssemblySize() in AbstractAssemblyAlex Beregszaszi2017-06-234-0/+27
| | |/ / | |/| |
* | | | Merge pull request #2454 from greggdourgarian/patch-1chriseth2017-06-231-1/+1
|\ \ \ \
| * | | | Update installing-solidity.rstgregg dourgarian2017-06-231-1/+1
|/ / / /
* | | | 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-235-2/+64
|\ \ \ \ | |/ / / |/| | |
| * | | Bug list entry.chriseth2017-06-232-1/+39
| * | | Fix ABI encoding of empty string literal.chriseth2017-06-222-1/+2
| * | | Test for passing empty string literal as function argument.chriseth2017-06-221-0/+23
* | | | Merge pull request #2426 from ethereum/miniMoustacheAlex Beregszaszi2017-06-237-0/+364
|\ \ \ \ | |_|/ / |/| | |
| * | | Changelog entry for Whiskers.chriseth2017-06-221-0/+1
| * | | Document Whiskers.Alex Beregszaszi2017-06-222-0/+21
| * | | Whiskers template systemchriseth2017-06-224-0/+342
* | | | Merge pull request #2408 from federicobond/constant-parameterschriseth2017-06-233-1/+29
|\ \ \ \
| * | | | Fix segmentation fault with constant function parametersFederico Bond2017-06-223-1/+29
* | | | | Merge pull request #2423 from federicobond/tuple-grammarchriseth2017-06-231-1/+4
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix grammar for tuple expressionsFederico Bond2017-06-201-1/+4
| |/ / /
* | | | Merge pull request #2440 from ethereum/lll-includechriseth2017-06-221-1/+7
|\ \ \ \ | |_|/ / |/| | |
| * | | LLL: report errors if (include) failedAlex Beregszaszi2017-06-221-1/+7
* | | | Merge pull request #2446 from benjaminion/lll-fix-msg-6-argsAlex Beregszaszi2017-06-222-1/+19
|\ \ \ \ | |_|_|/ |/| | |
| * | | LLL: Fix msg macro with six arguments.benjaminion2017-06-222-1/+19
|/ / /
* | | Merge pull request #2404 from ethereum/methodidentifiersAlex Beregszaszi2017-06-225-22/+17
|\ \ \
| * | | Make compiler.contractDefinition privateAlex Beregszaszi2017-06-222-5/+7
| * | | Rework functionHashes into methodIdentifiersAlex Beregszaszi2017-06-225-9/+10
| * | | Use compilerStack.functionHashes in StandardCompilerAlex Beregszaszi2017-06-221-9/+1
| |/ /
* | | Merge pull request #2438 from ethereum/exceptions-cleanupAlex Beregszaszi2017-06-2225-85/+43
|\ \ \
| * | | Merge interface/Exceptions and interface/UtilsAlex Beregszaszi2017-06-2220-63/+21
| * | | Remove unused errinfo typesAlex Beregszaszi2017-06-222-6/+0
| * | | Remove obscure DEV_IGNORE_EXCEPTIONS macroAlex Beregszaszi2017-06-222-4/+14
| * | | Use assertThrow where possibleAlex Beregszaszi2017-06-222-12/+8
* | | | Merge pull request #2415 from benjaminion/lll-fix-create-macrochriseth2017-06-222-2/+31
|\ \ \ \ | |/ / / |/| | |
| * | | LLL: Testcases for the two create built-in macros.benjaminion2017-06-221-0/+28
| * | | LLL: Fix for edge case in the create macros.benjaminion2017-06-221-2/+3
| |/ /
* | | Merge pull request #2399 from ethereum/lll-ifchriseth2017-06-224-20/+73
|\ \ \ | |/ / |/| |
| * | Replace obsolete assembly code in LLLAlex Beregszaszi2017-06-223-20/+11
| * | Add tests for when/unless/if in LLLAlex Beregszaszi2017-06-221-0/+62
* | | Merge pull request #2417 from benjaminion/lll-relabel-ecrecover-macroAlex Beregszaszi2017-06-222-1/+20
|\ \ \ | |/ / |/| |
| * | LLL: Test case for ecrecover built-in macro.benjaminion2017-06-221-0/+19
| * | LLL: Correctly label arguments to ecrecover built-in macro.benjaminion2017-06-221-1/+1
|/ /
* | Merge pull request #2425 from ethereum/removedebugbreakAlex Beregszaszi2017-06-223-163/+3
|\ \
| * | Remove debugbreak.chriseth2017-06-213-163/+3
* | | Merge pull request #2429 from DillonBArevalo/fix-votingchriseth2017-06-211-4/+4
|\ \ \ | |/ / |/| |
| * | Add weight == 0 condition to giveRightToVote functionDillon Arevalo2017-06-211-4/+4
|/ /
* | Merge pull request #2427 from ethereum/fixWindowschriseth2017-06-212-4/+5
|\ \ | |/ |/|
| * This might fix our windows tests.chriseth2017-06-202-4/+5
|/
* Merge pull request #2407 from jamesray1/patch-7chriseth2017-06-191-1/+1
|\
| * Update layout-of-source-files.rstchriseth2017-06-191-2/+2
| * Link for the semantic versioner for npmJames Ray2017-06-151-2/+2
* | 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-192-0/+24
|\ \
| * | Display error if payable or constant is specified multiple timesFederico Bond2017-06-172-0/+24
* | | Merge pull request #2225 from ethereum/julia-forchriseth2017-06-1921-143/+347
|\ \ \ | |/ / |/| |
| * | Test for variable redeclaration in for loopsAlex Beregszaszi2017-06-161-0/+5
| * | Fix test.chriseth2017-06-161-1/+1
| * | Mention functions in changelog.chriseth2017-06-161-0/+1
| * | Set source location for for start label.chriseth2017-06-161-0/+1
| * | Helper for visiting statements.chriseth2017-06-162-3/+10
| * | Some more parsing tests.chriseth2017-06-161-0/+14
| * | Functionality tests for for.chriseth2017-06-161-0/+49
| * | Changelog and documentation.chriseth2017-06-162-26/+15
| * | Code generation for for-loops.chriseth2017-06-161-6/+38
| * | Split block code generation into main and finalize.chriseth2017-06-164-25/+29
| * | Some more tests.chriseth2017-06-161-2/+14
| * | Helper to count the number of variables in a scope.chriseth2017-06-164-6/+14
| * | Add include file to forward-declare inline assembly structs.chriseth2017-06-167-77/+65
| * | For loops analysis.chriseth2017-06-162-4/+41
| * | Parse for statement in assembly parser / printerAlex Beregszaszi2017-06-1613-18/+75
| |/
* | Merge pull request #2373 from jamesray1/patch-14chriseth2017-06-161-1/+1
|\ \
| * | Create types.rstJames Ray2017-06-151-1/+1
| * | Create types.rstJames Ray2017-06-121-1/+1
* | | Merge pull request #2386 from ethereum/utf8-fixchriseth2017-06-163-1/+12
|\ \ \
| * | | Changelog entry.chriseth2017-06-161-0/+1
| * | | Fix UTF-8 validation for high codepoints (>10000)Alex Beregszaszi2017-06-162-1/+11
|/ / /
* | | Merge pull request #2411 from federicobond/recover-parserchriseth2017-06-161-13/+22
|\ \ \ | |_|/ |/| |
| * | Try to recover from parser errors where possibleFederico Bond2017-06-161-13/+22
|/ /
* | Merge pull request #2402 from ethereum/grammar-updatesAlex Beregszaszi2017-06-151-4/+5
|\ \
| * | Support dialect of assembly in grammarAlex Beregszaszi2017-06-151-1/+1
| * | Support interface contractsAlex Beregszaszi2017-06-151-1/+1
| * | Support AssemblyLabel in grammarAlex Beregszaszi2017-06-151-1/+2
| * | Fix AssemblyAssignment in grammarAlex Beregszaszi2017-06-151-1/+1
* | | Merge pull request #2397 from ethereum/doublepushchriseth2017-06-155-8/+56
|\ \ \
| * | | Fix lll test.chriseth2017-06-151-1/+1
| * | | Peephole optimizer for double push.chriseth2017-06-154-7/+55
* | | | Merge pull request #2363 from ethereum/windows_bytecodedirchriseth2017-06-152-4/+5
|\ \ \ \
| * | | | Change windows CI to use the same bytecode directory as linux.chriseth2017-06-152-4/+5
| |/ / /
* | | | Merge pull request #2382 from ruchevits/combined-json-hasheschriseth2017-06-154-9/+15
|\ \ \ \
| * | | | Reverted functionHashes output to use method signature as keysEdward Ruchevits2017-06-141-1/+1
| * | | | Removed duplicate codeEdward Ruchevits2017-06-141-9/+1
| * | | | Allow including hashes of method signatures in --combined-json outputEdward Ruchevits2017-06-143-0/+14
* | | | | Merge pull request #2398 from ethereum/assembly-cleanupchriseth2017-06-155-22/+18
|\ \ \ \ \
| * | | | | Move subroutine helpers from CompilerContext to AssemblyAlex Beregszaszi2017-06-153-5/+11
| * | | | | Remove single use Assembly::popToAlex Beregszaszi2017-06-152-3/+3
| * | | | | Remove obsolete Assembly::outAlex Beregszaszi2017-06-153-10/+3
| * | | | | Remove obsolete errorTag()Alex Beregszaszi2017-06-153-4/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #2396 from ethereum/asm-auxchriseth2017-06-153-3/+13
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 'develop' into asm-auxchriseth2017-06-158-25/+44
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #2192 from winsvega/developAlex Beregszaszi2017-06-158-24/+43
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | add new opcode instructions to the parserDimitry2017-06-158-24/+43
| | * | | Match substring in tests to avoid metadata issuesAlex Beregszaszi2017-06-151-2/+2
| | * | | Print auxiliary data in the assemblyAlex Beregszaszi2017-06-153-2/+10
| | * | | Print assembly even if there's no data sectionAlex Beregszaszi2017-06-151-1/+3
| |/ / / |/| | |
* | | | Merge pull request #2381 from ethereum/fixcrashchriseth2017-06-153-5/+16
|\ \ \ \
| * | | | Silence compiler warning.chriseth2017-06-141-1/+1
| * | | | Fix a crash about a non-callable expression.chriseth2017-06-143-5/+16
* | | | | Merge pull request #2384 from ethereum/parseFunctionalInstructionschriseth2017-06-154-3/+29
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Clarify functional style.chriseth2017-06-141-2/+4
| * | | | Enforce function arguments when parsing functional instructions.chriseth2017-06-143-1/+25
* | | | | Merge pull request #2394 from ethereum/lll-shiftschriseth2017-06-152-0/+23
|\ \ \ \ \
| * | | | | Support shl/shr in LLLAlex Beregszaszi2017-06-142-0/+23
| |/ / / /
* | | | | Merge pull request #2149 from ethereum/eip-createchriseth2017-06-147-8/+30
|\ \ \ \ \
| * | | | | Additional test.chriseth2017-06-141-0/+8
| * | | | | Display user friendly instruction nameAlex Beregszaszi2017-06-141-5/+12
| * | | | | Issue warning for using CREATE2 in inline assemblyAlex Beregszaszi2017-06-141-2/+3
| * | | | | Introduce CREATE2 in the assemblerAlex Beregszaszi2017-06-145-3/+9
* | | | | | Merge pull request #2364 from VoR0220/abiSpecchriseth2017-06-143-0/+348
|\ \ \ \ \ \
| * | | | | | try to get rid of warningRJ Catalano2017-06-141-1/+1
| * | | | | | Include abi specs in index and fix styling.chriseth2017-06-133-60/+65
| * | | | | | Formatting of heading.chriseth2017-06-121-1/+2
| * | | | | | Change fixed number example.chriseth2017-06-121-10/+11
| * | | | | | Include structs.chriseth2017-06-121-21/+39
| * | | | | | some small fixes to the names and underlining; still need to fix the fixed po...RJ Catalano2017-06-101-15/+11
| * | | | | | begin abi spec translation into solidity docsRJ Catalano2017-06-101-0/+327
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #2395 from ethereum/json-licenseAlex Beregszaszi2017-06-142-1/+8
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Include trailing zero in licenseAlex Beregszaszi2017-06-141-1/+1
| * | | | | Include license text in emscripten outputAlex Beregszaszi2017-06-141-0/+7
| | |/ / / | |/| | |
* | | | | Merge pull request #2392 from federicobond/disallow-trailing-commaschriseth2017-06-142-4/+20
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Forbid trailing commas in named argumentsFederico Bond2017-06-142-4/+20
* | | | | Merge pull request #2393 from ethereum/license_char_arraychriseth2017-06-142-2/+9
|\ \ \ \ \
| * | | | | Move 0x to cmake file.chriseth2017-06-142-3/+4
| * | | | | Convert license to character array.chriseth2017-06-142-2/+8
| | |_|/ / | |/| | |
* | | | | Merge pull request #2331 from ethereum/ASTDocumentationEntrychriseth2017-06-144-6/+37
|\ \ \ \ \
| * | | | | tests for non-legacy modedjudjuu2017-06-071-0/+8
| * | | | | new test case and indentation fixdjudjuu2017-06-062-4/+26
| * | | | | adjusted test-casesdjudjuu2017-05-312-2/+2
| * | | | | documentation field added to ContractDefinition-Nodedjudjuu2017-05-311-0/+1
* | | | | | Merge pull request #2327 from ethereum/assembler-objectchriseth2017-06-143-7/+37
|\ \ \ \ \ \
| * | | | | | Nicer machine output in CLIAlex Beregszaszi2017-06-091-1/+8
| * | | | | | Supply text representation of assemblyAlex Beregszaszi2017-06-092-1/+7
| * | | | | | Introduce MachineAssemblyObjectAlex Beregszaszi2017-06-093-6/+23
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #2390 from travs/patch-1chriseth2017-06-141-0/+3
|\ \ \ \ \ \
| * | | | | | Add linter-soliumTravis Jacobs2017-06-141-0/+3
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #2389 from ethereum/moveLabelIDschriseth2017-06-146-58/+65
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | 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-143-11/+9
| * | | | | Move LabelIDs to generation phase.chriseth2017-06-143-31/+47
* | | | | | Merge pull request #2354 from benjaminion/patch-2Alex Beregszaszi2017-06-142-1/+38
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | LLL: fix handling of "sha3" expressionbenjaminion2017-06-142-1/+38
|/ / / / /
* | | | | Merge pull request #2350 from benjaminion/patch-1Yoichi Hirai2017-06-142-4/+1
|\ \ \ \ \
| * | | | | Change opcode generated by (panic) to INVALIDbenjaminion2017-06-142-4/+1
* | | | | | Clarify statement about receiving etherchriseth2017-06-141-1/+2
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #2275 from ethereum/returndata_lllchriseth2017-06-1313-6/+108
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add a warning about a varialbe of the name of an instructionYoichi Hirai2017-06-134-1/+28
| * | | | Add a failing test as suggested inYoichi Hirai2017-06-131-0/+9
| * | | | Add a test about checking a warningYoichi Hirai2017-06-131-2/+14
| * | | | test: Add different styles of returndatacopy and returndatasizeYoichi Hirai2017-06-131-0/+10
| * | | | Warn if returndatasize/returndatacopy is usedAlex Beregszaszi2017-06-132-1/+20
| * | | | Mention RETURNDATACOPY in GasMeter and SemanticInformationYoichi Hirai2017-06-132-0/+4
| * | | | Add a changelog entryYoichi Hirai2017-06-131-3/+4
| * | | | libevmasm: add RETURNDATACOPY and RETURNDATASIZEYoichi Hirai2017-06-134-0/+20
* | | | | Merge pull request #2353 from ethereum/license_outputAlex Beregszaszi2017-06-133-3/+31
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove copyright notice.chriseth2017-06-121-1/+0
| * | | | Include license and warranty statement with solc.chriseth2017-06-093-3/+32
* | | | | Merge pull request #2375 from ethereum/macro_with_zero_argsAlex Beregszaszi2017-06-133-2/+20
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | More informative testYoichi Hirai2017-06-131-2/+2
| * | | | Fix the expectation about the parseYoichi Hirai2017-06-131-1/+1
| * | | | Add an end-to-end test about LLL macro with zero argumentsYoichi Hirai2017-06-121-0/+12
| * | | | liblll: allow macros with no argumentsYoichi Hirai2017-06-121-1/+1
| * | | | Add a test that fails about an LLL macro with no argumentsYoichi Hirai2017-06-121-0/+6
* | | | | Merge pull request #2368 from jamesray1/patch-5chriseth2017-06-121-1/+1
|\ \ \ \ \
| * | | | | DoxygenJames Ray2017-06-111-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #2372 from jamesray1/patch-13chriseth2017-06-121-1/+2
|\ \ \ \ \
| * | | | | Added linebreak.chriseth2017-06-121-1/+2
| * | | | | Create types.rstJames Ray2017-06-121-1/+1
| |/ / / /
* | | | | Merge pull request #2366 from sandakersmann/patch-1chriseth2017-06-121-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Undo changes to building from source.chriseth2017-06-121-4/+3
| * | | | Fixed "building-from-source" linkMarius Kjærstad2017-06-101-4/+5
| |/ / /
* | | | Merge pull request #2374 from jamesray1/patch-18Yoichi Hirai2017-06-121-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Create types.rstJames Ray2017-06-121-1/+1
|/ / /
* | | Merge pull request #2362 from ethereum/lowercase_instructionsAlex Beregszaszi2017-06-093-14/+33
|\ \ \
| * | | Use lowercase when reporting instruction error.chriseth2017-06-093-14/+33
| |/ /
* | | Merge pull request #2360 from ethereum/codegen-cleanupchriseth2017-06-094-19/+3
|\ \ \
| * | | Remove excess includesAlex Beregszaszi2017-06-092-1/+1
| * | | Simplify CodeGenerator by remove seldom used caseAlex Beregszaszi2017-06-093-18/+2
|/ / /
* | | Merge pull request #2359 from ethereum/remove-asmstackAlex Beregszaszi2017-06-094-179/+17
|\ \ \ | |/ / |/| |
| * | Remove obsolete AsmStackAlex Beregszaszi2017-06-093-176/+0
| * | Use inline assembly directly and not via AsmStackAlex Beregszaszi2017-06-091-3/+17
|/ /
* | Merge pull request #2304 from ethereum/evm15asmAlex Beregszaszi2017-06-0924-193/+1046
|\ \
| * | Add test for two functions calling eachotherAlex Beregszaszi2017-06-091-0/+1
| * | Comments and consistent variable names.chriseth2017-06-094-17/+18
| * | Fix compiler warning.chriseth2017-06-081-1/+1
| * | Fix: Copy resolver.chriseth2017-06-081-1/+1
| * | Visitor bugfix.chriseth2017-06-082-6/+18
| * | Missing stack height check for variable declaration.chriseth2017-06-081-0/+1
| * | Remove error reporter from code generation phase.chriseth2017-06-088-45/+29
| * | Some more comments.chriseth2017-06-085-12/+25
| * | Test for embedded functions.chriseth2017-06-082-0/+32
| * | Correct stack height adjustment after returnsub.chriseth2017-06-085-6/+6
| * | Generate only single error in inline assembly.chriseth2017-06-082-3/+12
| * | Move inline assembly to new abstraction and test both backends.chriseth2017-06-081-14/+25
| * | Introduce machine-dependent stack adjustment.chriseth2017-06-083-15/+28
| * | Test for accessing outer inline assembly scope.chriseth2017-06-082-2/+60
| * | Initial EVM1.5 assembly implementation.chriseth2017-06-0820-139/+857
|/ /
* | Merge pull request #2348 from ethereum/asmstack-analyzechriseth2017-06-082-0/+22
|\ \
| * | 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 #2351 from AndreMiras/patch-1Yoichi Hirai2017-06-081-0/+6
|\ \ \ | |/ / |/| |
| * | Update installing-solidity.rst on Gentoo LinuxAndreMiras2017-06-081-0/+6
|/ /
* | Merge pull request #2332 from ethereum/fixLiteralPrintchriseth2017-06-063-3/+19
|\ \
| * | adjusted testcase and renamingdjudjuu2017-06-063-6/+4
| * | fix Literalprintdjudjuu2017-05-312-2/+20
| |/
* | Merge pull request #2341 from ethernomad/patch-3chriseth2017-06-061-1/+1
|\ \
| * | for free => automaticallyJonathan Brown2017-06-031-1/+1
* | | Merge pull request #2342 from roadriverrail/ignore_qtcreator_settingschriseth2017-06-061-0/+1
|\ \ \
| * | | Ignore the CMakeLists.txt.user qtcreator makesRhett Aultman2017-06-031-0/+1
| |/ /
* | | Merge pull request #2345 from ethereum/logochriseth2017-06-062-0/+32
|\ \ \ | |/ / |/| |
| * | Include logo in introAlex Beregszaszi2017-06-051-0/+5
| * | Import logo from browser-solidity#16e74469Alex Beregszaszi2017-06-051-0/+27
|/ /
* | 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
* | | Merge pull request #2335 from ethereum/compilerstack-cleanupchriseth2017-06-012-31/+8
|\ \ \ | |/ / |/| |
| * | 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-3122-113/+183
|\ \ | |/ |/|
| * Add inline assembly test for sha3/keccak256Alex Beregszaszi2017-05-302-0/+47
| * Document keccak256 in assemblyAlex Beregszaszi2017-05-301-0/+2