Skip to content

Commit 3080090

Browse files
author
milktrader
committed
added Compat package and fixes JuliaGizmos#42
1 parent a04b3f1 commit 3080090

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

REQUIRE

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
julia 0.2-
2+
Compat 0.4.0

src/Reactive.jl

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
module Reactive
22

3+
using Compat
34
using Base.Order
45
using Base.Collections
56

@@ -30,7 +31,7 @@ eltype{T}(::Signal{T}) = T
3031

3132
# A topological order
3233
begin
33-
local counter = uint(0)
34+
local counter = @compat UInt(0)
3435

3536
function next_rank()
3637
counter += 1
@@ -60,7 +61,8 @@ Input{T}(v::T) = Input{T}(v)
6061
# in this library that return signals.
6162
abstract Node{T} <: Signal{T}
6263

63-
function add_child!(parents::(Signal...), child::Signal)
64+
#function add_child!(parents::Tuple{Vararg{Signal}}, child::Signal)
65+
function add_child!(parents::@compat(Tuple{Vararg{Signal}}), child::Signal)
6466
for p in parents
6567
push!(p.children, child)
6668
end
@@ -71,7 +73,7 @@ type Lift{T} <: Node{T}
7173
rank::Uint
7274
children::Vector{Signal}
7375
f::Callable
74-
signals::(Signal...)
76+
signals::@compat Tuple{Vararg{Signal}}
7577
value::T
7678

7779
function Lift(f::Callable, signals, init)
@@ -160,10 +162,10 @@ end
160162
type Merge{T} <: Node{T}
161163
rank::Uint
162164
children::Vector{Signal}
163-
signals::(Signal...)
165+
signals::@compat Tuple{Vararg{Signal}}
164166
ranks::Dict{Signal, Int}
165167
value::T
166-
function Merge(signals::(Signal...))
168+
function Merge(signals::@compat Tuple{Vararg{Signal}})
167169
if length(signals) < 1
168170
error("Merge requires at least one as argument.")
169171
end

0 commit comments

Comments
 (0)