Skip to content

RFC: Show symbols with a colon #1459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 27, 2012
Merged

RFC: Show symbols with a colon #1459

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ceeceb3
Make unexpected values in an AST show as interpolations.
Oct 27, 2012
1bf294c
Rename show_quoted to show_indented, make it show non-AST:s like show.
Oct 27, 2012
00df401
Remove superfluous @ from macro call printing in AST:s
toivoh Oct 27, 2012
0144695
Make symbols show as eg :x. Still print as x.
Oct 27, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 18 additions & 16 deletions base/show.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ show(io, x) = ccall(:jl_show_any, Void, (Any, Any,), io::IOStream, x)
showcompact(io, x) = show(io, x)
showcompact(x) = showcompact(OUTPUT_STREAM::IOStream, x)

show(io, s::Symbol) = print(io, s)
show(io, s::Symbol) = show_indented(io, s)
show(io, tn::TypeName) = show(io, tn.name)
show(io, ::Nothing) = print(io, "nothing")
show(io, b::Bool) = print(io, b ? "true" : "false")
Expand Down Expand Up @@ -87,25 +87,25 @@ unquoted(ex::Expr) = ex.args[1]

## AST printing ##

# show(ex::Expr) delegates to show_quoted(),
# show(ex::Expr) delegates to show_indented(),
# which shows the contents using show_unquoted(),
# which shows subexpressions using show_unquoted()
# ==> AST:s are printed wrapped in a single quotation
show_quoted( x) = show_quoted(OUTPUT_STREAM, x)
show_quoted( io::IO, x) = show_quoted(io, x, 0)
show_quoted( io::IO, x, indent) = show(io, x)
show_indented(x) = show_indented(OUTPUT_STREAM, x)
show_indented(io::IO, x) = show_indented(io, x, 0)
show_indented(io::IO, x, indent) = show(io, x)
show_unquoted(x) = show_unquoted(OUTPUT_STREAM, x)
show_unquoted(io::IO, x) = show_unquoted(io, x, 0)
show_unquoted(io::IO, x, indent) = show(io, x)
show_unquoted(io::IO, x, indent) = (print(io,"\$("); show(io,x); print(io,')'))

## Quoted AST printing ##

typealias ExprNode Union(SymbolNode, LineNumberNode, LabelNode, GotoNode,
TopNode, QuoteNode)
show(io::IO, ex::ExprNode) = show_quoted(io, ex)
show(io::IO, ex::ExprNode) = show_indented(io, ex)

show(io::IO, ex::Expr) = show_quoted(io, ex)
function show_quoted(io::IO, ex::Expr, indent::Int)
show(io::IO, ex::Expr) = show_indented(io, ex)
function show_indented(io::IO, ex::Expr, indent::Int)
if is(ex.head, :block) || is(ex.head, :body)
show_block(io, "quote", ex, indent); print(io, "end")
elseif contains([:tuple, :vcat, :cell1], ex.head)
Expand All @@ -114,12 +114,11 @@ function show_quoted(io::IO, ex::Expr, indent::Int)
default_show_quoted(io, ex, indent)
end
end
function show_quoted(io::IO, sym::Symbol, indent::Int)
function show_indented(io::IO, sym::Symbol, indent::Int)
if is(sym,:(:)) || is(sym,:(==)); print(io, ":($sym)")
else print(io, ":$sym")
end
end
show_quoted(io::IO, ex, indent::Int) = default_show_quoted(io, ex, indent)
function default_show_quoted(io::IO, ex, indent::Int)
print(io, ":( ")
show_unquoted(io, ex, indent + indent_width)
Expand Down Expand Up @@ -179,6 +178,10 @@ end

## Unquoted AST printing ##

show_unquoted(io::IO, sym::Symbol, indent::Int) = print(io, sym)
show_unquoted(io::IO, x::Number, indent::Int) = show(io, x)
show_unquoted(io::IO, x::String, indent::Int) = show(io, x)

const _expr_infix_wide = Set(:(=), :(+=), :(-=), :(*=), :(/=), :(\=), :(&=),
:(|=), :($=), :(>>>=), :(>>=), :(<<=), :(&&), :(||))
const _expr_infix = Set(:(:), :(<:), :(->), :(=>), symbol("::"))
Expand Down Expand Up @@ -225,7 +228,6 @@ function show_unquoted(io::IO, ex::Expr, indent::Int)
print(io, head, ' ')
show_list(io, args, ", ", indent)
elseif is(head, :macrocall) && nargs >= 1
print(io, '@')
show_list(io, args, ' ', indent)
elseif is(head, :typealias) && nargs == 2
print(io, "typealias ")
Expand All @@ -249,7 +251,7 @@ function show_unquoted(io::IO, ex::Expr, indent::Int)
elseif contains([:for,:while,:function,:if,:type,:module],head) && nargs==2
show_block(io, head, args[1], args[2], indent); print(io, "end")
elseif is(head, :quote) && nargs == 1
show_quoted(io, args[1], indent)
show_indented(io, args[1], indent)
elseif is(head, :gotoifnot) && nargs == 2
print(io, "unless ")
show_list(io, args, " goto ", indent)
Expand All @@ -259,10 +261,10 @@ function show_unquoted(io::IO, ex::Expr, indent::Int)
print(io, "nothing")
else
print(io, "\$(expr(")
show_quoted(io, ex.head, indent)
show_indented(io, ex.head, indent)
for arg in args
print(io, ", ")
show_quoted(io, arg, indent)
show_indented(io, arg, indent)
end
print(io, "))")
end
Expand All @@ -275,7 +277,7 @@ show_unquoted(io::IO, ex::LineNumberNode) = show_linenumber(io, ex.line)
show_unquoted(io::IO, ex::LabelNode) = print(io, ex.label, ": ")
show_unquoted(io::IO, ex::GotoNode) = print(io, "goto ", ex.label)
show_unquoted(io::IO, ex::TopNode) = print(io, "top(", ex.name, ')')
show_unquoted(io::IO, ex::QuoteNode, ind::Int) = show_quoted(io, ex.value, ind)
show_unquoted(io::IO, ex::QuoteNode, ind::Int) = show_indented(io,ex.value,ind)
function show_unquoted(io::IO, ex::SymbolNode)
print(io, ex.name)
show_expr_type(io, ex.typ)
Expand Down