Skip to content
Snippets Groups Projects
Commit e4dee8ef authored by Stéphane Adjemian's avatar Stéphane Adjemian
Browse files

Fixed compatibility issues with julia 0.5.

parent 1229372a
Branches
Tags
1 merge request!1381PR for #1286
...@@ -27,8 +27,8 @@ function compile(modfile) ...@@ -27,8 +27,8 @@ function compile(modfile)
unshift!(LOAD_PATH, pwd()) unshift!(LOAD_PATH, pwd())
end end
# Process modfile # Process modfile
println(string("Using ", WORD_SIZE, "-bit preprocessor")) println(string("Using ", Sys.WORD_SIZE, "-bit preprocessor"))
preprocessor = string(dirname(@__FILE__()), "/preprocessor", WORD_SIZE, "/dynare_m") preprocessor = string(dirname(@__FILE__()), "/preprocessor", Sys.WORD_SIZE, "/dynare_m")
run(`$preprocessor $modfile language=julia output=dynamic`) run(`$preprocessor $modfile language=julia output=dynamic`)
end end
...@@ -38,12 +38,12 @@ macro dynare(modfiles...) ...@@ -38,12 +38,12 @@ macro dynare(modfiles...)
for modfile in modfiles for modfile in modfiles
eval(:(compile($modfile))) eval(:(compile($modfile)))
basename = split(modfile, ".mod"; keep=false) basename = split(modfile, ".mod"; keep=false)
push!(ex.args, Expr(:import, symbol(basename[1]))) push!(ex.args, Expr(:import, Symbol(basename[1])))
end end
else else
eval(:(compile($modfiles))) eval(:(compile($modfiles)))
basename = split(modfiles[1], ".mod"; keep=false) basename = split(modfiles[1], ".mod"; keep=false)
push!(ex.args, Expr(:importall, symbol(basename[1]))) push!(ex.args, Expr(:importall, Symbol(basename[1])))
end end
return ex return ex
end end
......
...@@ -23,27 +23,27 @@ export Model, Endo, Exo, ExoDet, Param, dynare_model ...@@ -23,27 +23,27 @@ export Model, Endo, Exo, ExoDet, Param, dynare_model
abstract Atom abstract Atom
immutable Endo <: Atom immutable Endo <: Atom
name::UTF8String name::String
tex_name::UTF8String tex_name::String
long_name::UTF8String long_name::String
end end
immutable Exo <: Atom immutable Exo <: Atom
name::UTF8String name::String
tex_name::UTF8String tex_name::String
long_name::UTF8String long_name::String
end end
immutable ExoDet <: Atom immutable ExoDet <: Atom
name::UTF8String name::String
tex_name::UTF8String tex_name::String
long_name::UTF8String long_name::String
end end
immutable Param <: Atom immutable Param <: Atom
name::UTF8String name::String
tex_name::UTF8String tex_name::String
long_name::UTF8String long_name::String
end end
immutable AuxVars immutable AuxVars
...@@ -52,7 +52,7 @@ immutable AuxVars ...@@ -52,7 +52,7 @@ immutable AuxVars
orig_index::Int orig_index::Int
orig_lead_lag::Int orig_lead_lag::Int
eq_nbr::Int eq_nbr::Int
orig_expr::UTF8String orig_expr::String
end end
immutable PredVars immutable PredVars
...@@ -73,14 +73,14 @@ end ...@@ -73,14 +73,14 @@ end
immutable EquationTag immutable EquationTag
eq_nbr::Int eq_nbr::Int
name::UTF8String name::String
value::UTF8String value::String
end end
type Model type Model
fname::ASCIIString fname::String
dname::ASCIIString dname::String
dynare_version::ASCIIString dynare_version::String
endo::Vector{Endo} endo::Vector{Endo}
exo::Vector{Exo} exo::Vector{Exo}
exo_det::Vector{ExoDet} exo_det::Vector{ExoDet}
...@@ -111,7 +111,7 @@ type Model ...@@ -111,7 +111,7 @@ type Model
analytical_steady_state::Bool analytical_steady_state::Bool
user_written_analytical_steady_state::Bool user_written_analytical_steady_state::Bool
static_and_dynamic_models_differ::Bool static_and_dynamic_models_differ::Bool
equation_tags::Vector{UTF8String} equation_tags::Vector{String}
exo_names_orig_ord::Vector{Int} exo_names_orig_ord::Vector{Int}
sigma_e::Matrix{Float64} sigma_e::Matrix{Float64}
correlation_matrix::Matrix{Float64} correlation_matrix::Matrix{Float64}
...@@ -160,7 +160,7 @@ function dynare_model() ...@@ -160,7 +160,7 @@ function dynare_model()
false, # analytical_steady_state false, # analytical_steady_state
false, # user_written_analytical_steady_state false, # user_written_analytical_steady_state
false, # static_and_dynamic_models_differ false, # static_and_dynamic_models_differ
Array(ASCIIString,0), # equation_tags Array(String,0), # equation_tags
Array(Int64,1), # exo_names_orig_ord Array(Int64,1), # exo_names_orig_ord
Array(Float64, 0, 0), # sigma_e (Cov matrix of the structural innovations) Array(Float64, 0, 0), # sigma_e (Cov matrix of the structural innovations)
Array(Float64, 0, 0), # correlation_matrix (Corr matrix of the structural innovations) Array(Float64, 0, 0), # correlation_matrix (Corr matrix of the structural innovations)
......
...@@ -36,7 +36,7 @@ function pfmsolver_set_defaults() ...@@ -36,7 +36,7 @@ function pfmsolver_set_defaults()
end end
type Options type Options
dynare_version::ASCIIString dynare_version::String
linear::Bool linear::Bool
pfmsolver::PFMSolver pfmsolver::PFMSolver
end end
......
...@@ -21,7 +21,7 @@ module DynareOutput ...@@ -21,7 +21,7 @@ module DynareOutput
export Ouput, dynare_output export Ouput, dynare_output
type Output type Output
dynare_version::ASCIIString dynare_version::String
steady_state::Vector{Float64} steady_state::Vector{Float64}
exo_steady_state::Vector{Float64} exo_steady_state::Vector{Float64}
end end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment