improved clogged pipe detection and circumvention

src/Reduce.jl

@@ -73,6 +73,10 @@ function ReduceCheck(output) # check for REDUCE errors
  contains(output,"***** ")|contains(output,"+++ ") && throw(ReduceError(output))
 end
 
+function PipeClogged(tf::Bool,c::Int,info::String)
+ warn("Reduce pipe clogged by $info, $(tf ? "success" : "failure") after $c tries")
+end
+
 clear(rs::PSL) = (write(rs.input,";\n"); readavailable(rs.output))
 clears = (()->(c=true; return (tf=c)->(c≠tf && (c=tf); return c)))()
 
@@ -171,9 +175,11 @@ function Load()
  !contains(dirname(@__FILE__),"appveyor") &&
  println(split(String(banner),'\n')[rcsl ? 1 : end-3])
  ColCheck(false)
+ else
+ ReduceCheck(banner)
+ rcsl = contains(banner," CSL ")
+ println(split(String(banner),'\n')[rcsl ? 1 : end-3])
  end
- ReduceCheck(banner)
- rcsl = contains(banner," CSL ")
  load_package(:rlfi)
  offs |> RExpr |> rcall
  show(DevNull,"text/latex",R"int(sinh(e**i*z),z)")

src/calculus.jl

@@ -61,7 +61,20 @@ end
 //(a::T,expr::ExprSymbol;be=0) where T <: AbstractFloat = //(RExpr(a),RExpr(expr);be=be) |> parse
 function //(a::T,b::T;be=0) where T <: AbstractFloat
  isnan(a) | isnan(b) | (isinf(a) & isinf(b)) && return NaN
- return //(RExpr(a),RExpr(b);be=be) |> parse |> eval
+ out = //(RExpr(a),RExpr(b);be=be) |> parse |> eval
+ if out == nothing
+ c = 1
+ f = SubFail()
+ h = SubHold()
+ while out == nothing && c < f
+ sleep(sqrt(c)*h)
+ out = //(RExpr(a),RExpr(b);be=be) |> parse |> eval
+ c += 1
+ end
+ PipeClogged(out ≠ nothing, c, "rational division")
+ out == nothing && throw(ReduceError("If generated code relies on many floating point divisions, try setting `Reduce.Rational(false)` and use `Reduce.Reset()`, since rational division is the default."))
+ end
+ return out
 end
 
 export ∑, ∏

src/rexpr.jl

@@ -259,9 +259,9 @@ ColCheck = ( () -> begin
  w = _subst(sym == :r ? symrjl : symjlr, a[s])
  c += 1
  end
- warn("Reduce pipe clogged, $(w ≠ "" ? "success" : "failure") after $c tries")
+ PipeClogged(w ≠ "", c, "substitution")
  end
- w ≠ "" && (a[s] = w)
+ w ≠ "" ? (a[s] = w) : info("If this is a recurring problem, try with `Reduce.SubCall(false)`.")
  end
  if sym == :r
  a[s] == "inf" && (a[s] = "Inf")