Unverified Commit 8ebfea6e authored by yann300's avatar yann300 Committed by GitHub

Merge pull request #1256 from ethereum/returnCompilationResult

Return compilation result instead of a label && take in account the error prop…
parents 9a0c7935 48ade0d3
...@@ -73,10 +73,12 @@ export function compileFileOrFiles(filename: string, isDirectory: boolean, opts: ...@@ -73,10 +73,12 @@ export function compileFileOrFiles(filename: string, isDirectory: boolean, opts:
compiler.compile(sources, filepath) compiler.compile(sources, filepath)
} }
], function (err: Error | null | undefined, result: any) { ], function (err: Error | null | undefined, result: any) {
let errors = (result.errors || []).filter((e) => e.type === 'Error' || e.severity === 'error') let error: Error[] = []
if (result.error) error.push(result.error)
let errors = (result.errors || error).filter((e) => e.type === 'Error' || e.severity === 'error')
if (errors.length > 0) { if (errors.length > 0) {
if (!isBrowser) require('signale').fatal(errors) if (!isBrowser) require('signale').fatal(errors)
return cb(new Error('errors compiling')) return cb(errors)
} }
cb(err, result.contracts) cb(err, result.contracts)
}) })
...@@ -121,7 +123,7 @@ export function compileContractSources(sources: SrcIfc, importFileCb: any, opts: ...@@ -121,7 +123,7 @@ export function compileContractSources(sources: SrcIfc, importFileCb: any, opts:
let errors = (result.errors || error).filter((e) => e.type === 'Error' || e.severity === 'error') let errors = (result.errors || error).filter((e) => e.type === 'Error' || e.severity === 'error')
if (errors.length > 0) { if (errors.length > 0) {
if (!isBrowser) require('signale').fatal(errors) if (!isBrowser) require('signale').fatal(errors)
return cb(new Error('errors compiling')) return cb(errors)
} }
cb(err, result.contracts) cb(err, result.contracts)
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment