diff options
| author | Maran <maran.hidskes@gmail.com> | 2014-04-01 20:20:55 +0800 |
|---|---|---|
| committer | Maran <maran.hidskes@gmail.com> | 2014-04-01 20:20:55 +0800 |
| commit | 0a8801082676d64f904cbb5b62c1159e0bbd7788 (patch) | |
| tree | 05e9c4ea80d5e01cca53d583318f43606418a19e /ethutil/parsing.go | |
| parent | 5f49a659c36dbfb8c330ddc3d4565c19a9a936b5 (diff) | |
| parent | 7277c420479239fbea78417e42c43ee0162c2728 (diff) | |
| download | go-tangerine-0a8801082676d64f904cbb5b62c1159e0bbd7788.tar go-tangerine-0a8801082676d64f904cbb5b62c1159e0bbd7788.tar.gz go-tangerine-0a8801082676d64f904cbb5b62c1159e0bbd7788.tar.bz2 go-tangerine-0a8801082676d64f904cbb5b62c1159e0bbd7788.tar.lz go-tangerine-0a8801082676d64f904cbb5b62c1159e0bbd7788.tar.xz go-tangerine-0a8801082676d64f904cbb5b62c1159e0bbd7788.tar.zst go-tangerine-0a8801082676d64f904cbb5b62c1159e0bbd7788.zip | |
Merge conflicts
Diffstat (limited to 'ethutil/parsing.go')
| -rw-r--r-- | ethutil/parsing.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ethutil/parsing.go b/ethutil/parsing.go index 8929f0829..16ed2d06d 100644 --- a/ethutil/parsing.go +++ b/ethutil/parsing.go @@ -131,7 +131,7 @@ func Instr(instr string) (int, []string, error) { // Script compilation functions // Compiles strings to machine code -func Compile(instructions ...interface{}) (script []string) { +func Assemble(instructions ...interface{}) (script []string) { script = make([]string, len(instructions)) for i, val := range instructions { |