mirrors
/
Weave.jl
mirror of https://github.com/mpastell/Weave.jl
1
0
Fork 0
Code Issues Releases Wiki Activity

Dispatch on when

pull/41/head
Giuseppe Ragusa 2016-05-02 19:33:54 +02:00
parent eecef35305
commit 1834b93cb3
1 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/run.jl
View File

@ -209,8 +209,6 @@ function eval_chunk(chunk::CodeChunk, report::Report, SandBox::Module)
chunk.result = run_code(chunk, report, SandBox)
if chunk.options[:term]
chunks = collect_results(chunk, TermResult())
elseif chunk.options[:display]
chunks = collect_results(chunk, DispResult())
elseif chunk.options[:hold]
chunks = collect_results(chunk, CollectResult())
else
@ -355,36 +353,6 @@ function collect_results(chunk::CodeChunk, fmt::ScriptResult)
return result_chunks
end
function collect_results(chunk::CodeChunk, fmt::DispResult)
content = ""
result_no = 1
result_chunks = CodeChunk[ ]
for r = chunk.result
#Check if there is any output from chunk
if strip(r.stdout) == "" && isempty(r.figures) && strip(r.rich_output) == ""
content *= r.code
else
content = "\n" * content * r.code
rchunk = CodeChunk(content, chunk.number, chunk.start_line, chunk.optionstring, copy(chunk.options))
content = ""
rchunk.result_no = result_no
result_no *=1
rchunk.figures = r.figures
rchunk.output = r.stdout * r.displayed
rchunk.rich_output = r.rich_output
push!(result_chunks, rchunk)
end
end
if content != ""
startswith(content, "\n") || (content = "\n" * content)
rchunk = CodeChunk(content, chunk.number, chunk.start_line, chunk.optionstring, copy(chunk.options))
push!(result_chunks, rchunk)
end
return result_chunks
end
function collect_results(chunk::CodeChunk, fmt::TermResult)
output = ""
prompt = chunk.options[:prompt]