From ea9e244da0acd2993723f3ed6047d8fc8d25fc7b Mon Sep 17 00:00:00 2001 From: Michael Reed Date: Mon, 3 Dec 2018 09:47:12 -0500 Subject: [PATCH] deprecated and replaced linefilter with linefilter! --- docs/src/library.md | 2 +- src/Reduce.jl | 1 + src/parser.jl | 4 ++-- src/rexpr.jl | 20 ++++++++++++-------- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/docs/src/library.md b/docs/src/library.md index c3ca400..d4e0194 100644 --- a/docs/src/library.md +++ b/docs/src/library.md @@ -47,7 +47,7 @@ Reduce.unfoldgen ``` ```@docs -Reduce.linefilter +Reduce.linefilter! ``` ```@docs diff --git a/src/Reduce.jl b/src/Reduce.jl index fb8edd6..96b7f74 100644 --- a/src/Reduce.jl +++ b/src/Reduce.jl @@ -1,6 +1,7 @@ __precompile__() module Reduce using ForceImport, SyntaxTree, LinearAlgebra +!isdefined(Reduce,:linefilter!) && (linefilter! = SyntaxTree.linefilter) # This file is part of Reduce.jl. It is licensed under the MIT license # Copyright (C) 2017 Michael Reed diff --git a/src/parser.jl b/src/parser.jl index 207425d..495096e 100644 --- a/src/parser.jl +++ b/src/parser.jl @@ -314,7 +314,7 @@ for mode ∈ [:expr,:unary,:switch,:args] :(print(qr, smp); smp = "") end)) end - push!(nsr,$((mode == :expr) ? :("("*String(take!(qr))*")" |> Meta.parse |> linefilter) : :qr)) + push!(nsr,$((mode == :expr) ? :("("*String(take!(qr))*")" |> Meta.parse |> linefilter!) : :qr)) end; else; :(nothing); end) elseif occursin("end",sh[en]) nothing @@ -600,7 +600,7 @@ end show_expr(io,expr.args[1]) show_expr(io,expr.args[2]) elseif expr.head == :block - lxpr = linefilter(expr) + lxpr = linefilter!(expr) if length(lxpr.args) == 1 show_expr(io,lxpr.args[1]) else diff --git a/src/rexpr.jl b/src/rexpr.jl index bfb5278..eb38b11 100644 --- a/src/rexpr.jl +++ b/src/rexpr.jl @@ -102,15 +102,19 @@ Reduce.linelength()::Integer and sets the output line length to the integer `tput cols`. It returns the output line length (so that it can be stored for later resetting of the output line if needed). """ function linelength() - c = read(`tput cols`,String) |> Meta.parse - global cols - if c ≠ cols - ws = rcall("ws") - rcall("linelength($c)") - rcall(ws) - cols = c + try + c = read(`tput cols`,String) |> Meta.parse + global cols + if c ≠ cols + ws = rcall("ws") + rcall("linelength($c)") + rcall(ws) + cols = c + end + return c + catch + ColCheck(false) end - return c end function show(io::IO, ::MIME"text/plain", r::RExpr)