Skip to content

Commit

Permalink
Update CEnum.jl again
Browse files Browse the repository at this point in the history
  • Loading branch information
Gnimuc committed May 4, 2021
1 parent 03264b5 commit 8dcb646
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 0 deletions.
22 changes: 22 additions & 0 deletions src/CEnum.jl
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
# Copyright (c) 2019 JuliaInterop

# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:

# The above copyright notice and this permission notice shall be included in all
# copies or substantial portions of the Software.

# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.

# copied from https://github.com/JuliaLang/julia/pull/30924
# modified to be in compliance with C99: http://port70.net/~nsz/c/c99/n1256.html#6.7.2.2
module CEnum
Expand Down Expand Up @@ -146,4 +166,6 @@ macro cenum(T, syms...)
return blk
end

include("operators.jl")

end # module
24 changes: 24 additions & 0 deletions src/operators.jl
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import Base: +, -, *, &, |, xor, ==, ~

for op in (:+, :-, :&, :|, :xor, :(==))
@eval begin
function ($op)(a::Cenum{T}, b::Cenum{S}) where {T<:Integer,S<:Integer}
N = promote_type(T, S)
($op)(N(a), N(b))
end
function ($op)(a::Cenum{T}, b::S) where {T<:Integer,S<:Integer}
N = promote_type(T, S)
($op)(N(a), N(b))
end
function ($op)(a::T, b::Cenum{S}) where {T<:Integer,S<:Integer}
N = promote_type(T, S)
($op)(N(a), N(b))
end
end
end

function ~(a::Cenum{T}) where {T<:Integer}
~(T(a))
end

Base.convert(::Type{T1}, x::Cenum{T2}) where {T1<:Integer,T2<:Integer} = convert(T1, T2(x))

0 comments on commit 8dcb646

Please sign in to comment.