Skip to content
This repository was archived by the owner on Oct 12, 2019. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
language: julia
os:
- linux
- osx
julia:
- release
- 0.3
- 0.4
- 0.5
- nightly
notifications:
email: false
Expand Down
12 changes: 6 additions & 6 deletions src/generate_arrays.jl
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ function generate_arrays(maxSz::Integer)
const reductions = ((:sum,:+),(:prod,:*),(:minimum,:min),(:maximum,:max))

# expression functions
vecTyp(n) = symbol(string("Vector",n))
vecTyp(n) = @compat Symbol(string("Vector",n))
vecTypT(n) = Expr(:curly, vecTyp(n), :T)
matTyp(r,c) = symbol(string("Matrix",r,"x",c))
matTyp(r,c) = @compat Symbol(string("Matrix",r,"x",c))
matTypT(r,c) = Expr(:curly, matTyp(r,c,), :T)
elt(i) = symbol(string("e",i))
col(i) = symbol(string("c",i))
elt(i) = @compat Symbol(string("e",i))
col(i) = @compat Symbol(string("c",i))
mem(s,e) = Expr(:.,s,Expr(:quote,e))
velt(v,i) = mem(v,elt(i))
melt(m,i,j) = mem(mem(m,col(j)),elt(i))
Expand All @@ -78,7 +78,7 @@ function generate_arrays(maxSz::Integer)
ctorn_body = :($TypT())
ctor1_body = :($TypT())
for i = 1:sz
local arg = symbol(string("a",i))
local arg = @compat Symbol(string("a",i))
push!(ctorn_sig.args, :($arg::T))
push!(ctorn_body.args, arg)
push!(ctor1_body.args, :a)
Expand Down Expand Up @@ -269,7 +269,7 @@ function generate_arrays(maxSz::Integer)
ctorn_body = :($TypT())
ctor1_body = :($TypT())
for i = 1:cSz
local arg = symbol(string("a",i))
local arg = @compat Symbol(string("a",i))
push!(ctorn_sig.args, :($arg::$ColTypT))
push!(ctorn_body.args, arg)
push!(ctor1_body.args, :a)
Expand Down