From 5dbe54316bb8f6fd77b5577f31ffbc21cac7d611 Mon Sep 17 00:00:00 2001
From: Shuhei Kadowaki <aviatesk@gmail.com>
Date: Sat, 9 May 2020 03:17:57 +0900
Subject: [PATCH] isnothing utility

---
 src/Weave.jl | 13 +++++++++----
 src/run.jl   | 20 ++++++++++----------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/Weave.jl b/src/Weave.jl
index f8a0773..2db7b40 100644
--- a/src/Weave.jl
+++ b/src/Weave.jl
@@ -14,6 +14,11 @@ function __init__()
     )
 end
 
+@static @isdefined(isnothing) || begin
+    isnothing(::Any) = false
+    isnothing(::Nothing) = true
+end
+
 """
     list_out_formats()
 
@@ -152,10 +157,10 @@ function weave(
         )
     end
 
-    template !== nothing && (doc.template = template)
-    highlight_theme !== nothing && (doc.highlight_theme = highlight_theme)
-    # theme != nothing && (doc.theme = theme) # Reserved for themes
-    css !== nothing && (doc.css = css)
+    isnothing(template) || (doc.template = template)
+    isnothing(highlight_theme) || (doc.highlight_theme = highlight_theme)
+    # isnothing(theme) || (doc.theme = theme) # Reserved for themes
+    isnothing(css) || (doc.css = css)
 
     doc = run_doc(
         doc,
diff --git a/src/run.jl b/src/run.jl
index d65d9f2..9a2adfe 100644
--- a/src/run.jl
+++ b/src/run.jl
@@ -91,7 +91,7 @@ function run_doc(
     try
         if cache !== :off && cache !== :refresh
             cached = read_cache(doc, cache_path)
-            cached === nothing && @info "No cached results found, running code"
+            isnothing(cached) && @info "No cached results found, running code"
         else
             cached = nothing
         end
@@ -256,10 +256,10 @@ function capture_output(expr, SandBox::Module, term, disp, lastline, throw_error
     try
         obj = Core.eval(SandBox, expr)
         if (term || disp) && (typeof(expr) != Expr || expr.head != :toplevel)
-            obj != nothing && display(obj)
+            isnothing(obj) || display(obj)
             # This shows images and lone variables, result can
             # Handle last line sepately
-        elseif lastline && obj != nothing
+        elseif lastline && !isnothing(obj)
             (typeof(expr) != Expr || expr.head != :toplevel) && display(obj)
         end
     catch E
@@ -305,7 +305,7 @@ function eval_chunk(chunk::CodeChunk, report::Report, SandBox::Module)
     report.fignum = 1
     report.cur_chunk = chunk
 
-    if haskey(report.formatdict, :out_width) && chunk.options[:out_width] == nothing
+    if haskey(report.formatdict, :out_width) && isnothing(chunk.options[:out_width])
         chunk.options[:out_width] = report.formatdict[:out_width]
     end
 
@@ -350,10 +350,10 @@ end
 function get_figname(report::Report, chunk; fignum = nothing, ext = nothing)
     figpath = joinpath(report.cwd, chunk.options[:fig_path])
     isdir(figpath) || mkpath(figpath)
-    ext == nothing && (ext = chunk.options[:fig_ext])
-    fignum == nothing && (fignum = report.fignum)
+    isnothing(ext) && (ext = chunk.options[:fig_ext])
+    isnothing(fignum) && (fignum = report.fignum)
 
-    chunkid = (chunk.options[:label] == nothing) ? chunk.number : chunk.options[:label]
+    chunkid = isnothing(chunk.options[:label]) ? chunk.number : chunk.options[:label]
     full_name = joinpath(
         report.cwd,
         chunk.options[:fig_path],
@@ -383,13 +383,13 @@ end
 
 """Get output file name based on out_path"""
 function get_outname(out_path::Symbol, doc::WeaveDoc; ext = nothing)
-    ext == nothing && (ext = doc.format.formatdict[:extension])
+    isnothing(ext) && (ext = doc.format.formatdict[:extension])
     outname = "$(doc.cwd)/$(doc.basename).$ext"
 end
 
 """Get output file name based on out_path"""
 function get_outname(out_path::AbstractString, doc::WeaveDoc; ext = nothing)
-    ext == nothing && (ext = doc.format.formatdict[:extension])
+    isnothing(ext) && (ext = doc.format.formatdict[:extension])
     splitted = splitext(out_path)
     if (splitted[2]) == ""
         outname = "$(doc.cwd)/$(doc.basename).$ext"
@@ -400,7 +400,7 @@ end
 
 function set_rc_params(doc::WeaveDoc, fig_path, fig_ext)
     formatdict = doc.format.formatdict
-    if fig_ext == nothing
+    if isnothing(fig_ext)
         doc.chunk_defaults[:fig_ext] = formatdict[:fig_ext]
     else
         doc.chunk_defaults[:fig_ext] = fig_ext