Skip to content
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

Jump to bottom

Add Char * String and Char * Char #22532

Merged
merged 10 commits into from
Jul 11, 2017
Merged

Add Char * String and Char * Char #22532

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c20972c
added char concat methods
Jun 25, 2017
c6dec74
added char concat methods
Jun 25, 2017
7ce7e1a
added more tests
Jun 25, 2017
7313f5d
condense methods
Jun 25, 2017
c377c83
update docstring
Jun 26, 2017
f9dd68c
add ...
Jun 26, 2017
7d557d2
Minor docstring improvement
ararslan Jun 30, 2017
df56a8f
Remove line
ararslan Jun 30, 2017
2fbec25
Merge branch 'master' into char_concat
ararslan Jun 30, 2017
a1577a1
Add back the ...
ararslan Jul 11, 2017
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
11 changes: 6 additions & 5 deletions base/strings/basic.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,18 +56,19 @@ sizeof(s::AbstractString) = error("type $(typeof(s)) has no canonical binary rep
eltype(::Type{<:AbstractString}) = Char

"""
```
*(s::AbstractString, t::AbstractString)
```
*(s::Union{Char, AbstractString}, t::Union{Char, AbstractString})
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

... on the second input


Concatenate strings. The `*` operator is an alias to this function.
Concatenate strings and characters. The `*` operator is an alias to this function.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"[...] and characters to a [`String`](@ref)." perhaps?

Also, this is the * function, its an alias for itself!?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would make it like this:

"""
    *(s::Union{AbstractString, Char}, t::Union{AbstractString, Char})

Concatenate strings and/or characters, producing a [`String`](@ref). This is equivalent
to calling the [`string`](@ref) function on the arguments.
"""


Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

delete the blank line

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought we had been putting lines between the headers and contents in docstring?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I guess not.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

recently moving towards getting rid of them everywhere

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

K, thanks for the heads up

```jldoctest
julia> "Hello " * "world"
"Hello world"

julia> 'j' * "ulia"
"julia"
```
"""
(*)(s1::AbstractString, ss::AbstractString...) = string(s1, ss...)
(*)(s1::Union{Char, AbstractString}, ss::Union{Char, AbstractString}...) = string(s1, ss...)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aside from some of the linalg code, typically there isn't a space after the comma in Union. Probably best to keep consistency within this file and alike.


one(::Union{T,Type{T}}) where {T<:AbstractString} = convert(T, "")

Expand Down
7 changes: 7 additions & 0 deletions test/strings/basic.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,3 +469,10 @@ Base.endof(x::CharStr) = endof(x.chars)
# issue #12495: check that logical indexing attempt raises ArgumentError
@test_throws ArgumentError "abc"[[true, false, true]]
@test_throws ArgumentError "abc"[BitArray([true, false, true])]

@test "ab" * "cd" == "abcd"
@test 'a' * "bc" == "abc"
@test "ab" * 'c' == "abc"
@test 'a' * 'b' == "ab"
@test 'a' * "b" * 'c' == "abc"
@test "a" * 'b' * 'c' == "abc"