roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Fixed shebang check. Previously it would hang on an unknown shebang

Browse Source
This commit is contained in:
obscuren 2014-07-04 13:05:07 +02:00
parent 633027d980
commit d5bcc01eae
1 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
ethutil/script.go
View File

@ -10,28 +10,36 @@ import (
// General compile function // General compile function
func Compile(script string) (ret []byte, err error) { func Compile(script string) (ret []byte, err error) {
c := strings.Split(script, "\n")[0] if len(script) > 2 {
line := strings.Split(script, "\n")[0]
if c == "#!serpent" { if line[0:2] == "#!" {
byteCode, err := serpent.Compile(script) switch line {
if err != nil { case "#!serpent":
return nil, err byteCode, err := serpent.Compile(script)
} if err != nil {
return nil, err
return byteCode, nil
} else {
compiler := mutan.NewCompiler(backend.NewEthereumBackend())
byteCode, errors := compiler.Compile(strings.NewReader(script))
if len(errors) > 0 {
var errs string
for _, er := range errors {
if er != nil {
errs += er.Error()
} }
}
return nil, fmt.Errorf("%v", errs)
}
return byteCode, nil return byteCode, nil
}
} else {
compiler := mutan.NewCompiler(backend.NewEthereumBackend())
byteCode, errors := compiler.Compile(strings.NewReader(script))
if len(errors) > 0 {
var errs string
for _, er := range errors {
if er != nil {
errs += er.Error()
}
}
return nil, fmt.Errorf("%v", errs)
}
return byteCode, nil
}
} }
return nil, nil
} }