Add target contract name to the compiler

pull/1/head
Alex Beregszaszi 8 years ago
parent ca0bcc5a55
commit 0a5dd05b6f
  1. 6
      src/app.js
  2. 18
      src/app/compiler.js

@ -520,9 +520,11 @@ var run = function () {
}
compileTimeout = window.setTimeout(function () {
var files = {}
files[utils.fileNameFromKey(editor.getCacheFile())] = editor.getValue()
var target = utils.fileNameFromKey(editor.getCacheFile())
compiler.compile(files)
files[target] = editor.getValue()
compiler.compile(files, target)
}, 300)
}

@ -28,8 +28,8 @@ function Compiler (editor, handleImportCall) {
optimize = _optimize
}
var internalCompile = function (files, missingInputs) {
gatherImports(files, missingInputs, function (error, input) {
var internalCompile = function (files, target, missingInputs) {
gatherImports(files, target, missingInputs, function (error, input) {
if (error) {
self.lastCompilationResult = null
self.event.trigger('compilationFinished', [false, { 'error': error }, files])
@ -39,9 +39,9 @@ function Compiler (editor, handleImportCall) {
})
}
var compile = function (files) {
var compile = function (files, target) {
self.event.trigger('compilationStarted', [])
internalCompile(files)
internalCompile(files, target)
}
this.compile = compile
@ -120,7 +120,7 @@ function Compiler (editor, handleImportCall) {
self.event.trigger('compilationFinished', [false, data, source])
} else if (missingInputs !== undefined && missingInputs.length > 0) {
// try compiling again with the new set of inputs
internalCompile(source.sources, missingInputs)
internalCompile(source.sources, source.target, missingInputs)
} else {
data = updateInterface(data)
@ -208,10 +208,10 @@ function Compiler (editor, handleImportCall) {
worker.postMessage({cmd: 'loadVersion', data: url})
}
function gatherImports (files, importHints, cb) {
function gatherImports (files, target, importHints, cb) {
importHints = importHints || []
if (!compilerAcceptsMultipleFiles) {
cb(null, files[editor.getCacheFile()])
cb(null, files[target])
return
}
@ -246,14 +246,14 @@ function Compiler (editor, handleImportCall) {
cb(err)
} else {
files[m] = content
gatherImports(files, importHints, cb)
gatherImports(files, target, importHints, cb)
}
})
return
}
cb(null, { 'sources': files })
cb(null, { 'sources': files, 'target': target })
}
function truncateVersion (version) {

Loading…
Cancel
Save