diff options
| author | obscuren <geffobscura@gmail.com> | 2015-05-13 01:05:33 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-05-13 01:05:33 +0800 |
| commit | 8e24378cc1acb074b56de75bf0baf6feb7927677 (patch) | |
| tree | 71f866652de6b45da5ad4403b88f5def9a684e36 /common/compiler/solidity.go | |
| parent | 7d69679935ff8c04aebb60f27074f08c5e84ac95 (diff) | |
| parent | 8fe01b4bfa28ad5a1fdde7f9837e8f982843389a (diff) | |
| download | go-tangerine-0.9.20.tar go-tangerine-0.9.20.tar.gz go-tangerine-0.9.20.tar.bz2 go-tangerine-0.9.20.tar.lz go-tangerine-0.9.20.tar.xz go-tangerine-0.9.20.tar.zst go-tangerine-0.9.20.zip | |
Merge branch 'release/0.9.20'v0.9.20
Diffstat (limited to 'common/compiler/solidity.go')
| -rw-r--r-- | common/compiler/solidity.go | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/common/compiler/solidity.go b/common/compiler/solidity.go index 36d0e96cc..6790f9a1d 100644 --- a/common/compiler/solidity.go +++ b/common/compiler/solidity.go @@ -7,7 +7,6 @@ import ( "io/ioutil" "os" "os/exec" - "path" "path/filepath" "regexp" "strings" @@ -88,6 +87,10 @@ func (sol *Solidity) Info() string { return fmt.Sprintf("solc v%s\nSolidity Compiler: %s\n%s", sol.version, sol.solcPath, flair) } +func (sol *Solidity) Version() string { + return sol.version +} + func (sol *Solidity) Compile(source string) (contract *Contract, err error) { if len(source) == 0 { @@ -126,10 +129,10 @@ func (sol *Solidity) Compile(source string) (contract *Contract, err error) { _, file := filepath.Split(matches[0]) base := strings.Split(file, ".")[0] - codeFile := path.Join(wd, base+".binary") - abiDefinitionFile := path.Join(wd, base+".abi") - userDocFile := path.Join(wd, base+".docuser") - developerDocFile := path.Join(wd, base+".docdev") + codeFile := filepath.Join(wd, base+".binary") + abiDefinitionFile := filepath.Join(wd, base+".abi") + userDocFile := filepath.Join(wd, base+".docuser") + developerDocFile := filepath.Join(wd, base+".docdev") code, err := ioutil.ReadFile(codeFile) if err != nil { |