From e76e823a3d7b5ea3873df70ea73132599df85706 Mon Sep 17 00:00:00 2001
From: Matti Pastell <matti.pastell@helsinki.fi>
Date: Tue, 6 Jan 2015 00:55:57 +0200
Subject: [PATCH] Made report object local, closes #3

---
 src/Weave.jl   | 23 ++++++++++++-----------
 src/readers.jl |  6 +++---
 src/run.jl     | 10 +++++-----
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/Weave.jl b/src/Weave.jl
index c4c0d94..0e0db6b 100644
--- a/src/Weave.jl
+++ b/src/Weave.jl
@@ -25,7 +25,7 @@ type Report <: Display
 
 end
 
-const report = Report()
+#const report = Report()
 
 const supported_mime_types =
     [MIME"image/png",
@@ -78,7 +78,7 @@ function tangle(source ; out_path=:doc, informat="noweb")
 
     outname = "$(cwd)/$(basename).jl"
     open(outname, "w") do io
-        for chunk in read(source, informat)
+        for chunk in read_doc(source, informat)
             if typeof(chunk) == CodeChunk
                 write(io, chunk.content*"\n")
             end
@@ -109,6 +109,7 @@ weave(source ; doctype = "pandoc", plotlib="Gadfly",
 """ ->
 function weave(source ; doctype = "pandoc", plotlib="Gadfly", informat="noweb", out_path=:doc, fig_path = "figures", fig_ext = nothing)
 
+    report = Report()
     cwd, fname = splitdir(abspath(source))
     basename = splitext(fname)[1]
     formatdict = formats[doctype].formatdict
@@ -153,8 +154,8 @@ function weave(source ; doctype = "pandoc", plotlib="Gadfly", informat="noweb",
     end
 
     pushdisplay(report)
-    parsed = read(source, informat)
-    executed = run(parsed)
+    parsed = read_doc(source, informat)
+    executed = run(parsed, report)
     popdisplay(report)
     formatted = format(executed, doctype)
     outname = "$(report.cwd)/$(report.basename).$(formatdict[:extension])"
@@ -170,7 +171,7 @@ end
 
 
 
-function run_block(code_str)
+function run_block(code_str, report::Report)
     oldSTDOUT = STDOUT
     result = ""
 
@@ -200,7 +201,7 @@ function run_block(code_str)
     return string("\n", result)
 end
 
-function run_term(code_str)
+function run_term(code_str, report::Report)
     prompt = "\njulia> "
     codestart = "\n\n"*report.formatdict[:codestart]
 
@@ -227,27 +228,27 @@ function run_term(code_str)
 end
 
 
-function run(parsed)
+function run(parsed, report::Report)
     #Clear sandbox for each document
     #Raises a warning, couldn't find a "cleaner"
     #way to do it.
     eval(parse("module ReportSandBox\nend"))
     executed = Any[]
     for chunk in copy(parsed)
-        result_chunk = eval_chunk(chunk)
+        result_chunk = eval_chunk(chunk, report::Report)
         push!(executed, result_chunk)
     end
     executed
 end
 
-function savefigs(chunk)
+function savefigs(chunk, report::Report)
     l_plotlib = lowercase(rcParams[:plotlib])
     if l_plotlib == "pyplot"
-      return savefigs_pyplot(chunk)
+      return savefigs_pyplot(chunk, report::Report)
     end
 end
 
-function savefigs_pyplot(chunk)
+function savefigs_pyplot(chunk, report::Report)
     fignames = String[]
     ext = report.formatdict[:fig_ext]
     figpath = joinpath(report.cwd, chunk.options[:fig_path])
diff --git a/src/readers.jl b/src/readers.jl
index f3d7884..6cd125b 100644
--- a/src/readers.jl
+++ b/src/readers.jl
@@ -14,15 +14,15 @@ const input_formats = @compat Dict{String, Any}(
 
 
 @doc "Read and parse input document" ->
-function Base.read(document, format="noweb")
+function read_doc(document::String, format="noweb"::String)
     document = bytestring(open(document) do io
         mmap_array(Uint8,(filesize(document),),io)
     end)
-    return parse(document, format)
+    return parse_doc(document, format)
 end
 
 @doc "Parse document from string" ->
-function Base.parse(document, format="noweb")
+function parse_doc(document::String, format="noweb"::String)
   #doctext = readall(open(document))
   lines = split(document, "\n")
 
diff --git a/src/run.jl b/src/run.jl
index 836623b..a06bc0b 100644
--- a/src/run.jl
+++ b/src/run.jl
@@ -1,5 +1,5 @@
 
-function eval_chunk(chunk::CodeChunk)
+function eval_chunk(chunk::CodeChunk, report::Report)
     info("Weaving chunk $(chunk.number) from line $(chunk.start_line)")
     defaults = copy(rcParams[:chunk_defaults])
     options = copy(chunk.options)
@@ -30,20 +30,20 @@ function eval_chunk(chunk::CodeChunk)
     end
 
     if chunk.options[:term]
-        chunk.output = run_term(chunk.content)
+        chunk.output = run_term(chunk.content, report::Report)
         chunk.options[:term_state] = report.term_state
     else
-        chunk.output = run_block(chunk.content)
+        chunk.output = run_block(chunk.content, report::Report)
     end
 
     if rcParams[:plotlib] == "PyPlot"
-        chunk.options[:fig] && (chunk.figures = savefigs(chunk))
+        chunk.options[:fig] && (chunk.figures = savefigs(chunk, report::Report))
     else
         chunk.options[:fig] && (chunk.figures = copy(report.figures))
     end
     chunk
 end
 
-function eval_chunk(chunk::DocChunk)
+function eval_chunk(chunk::DocChunk, report::Report)
     chunk
 end