Skip to content
Snippets Groups Projects
Commit 5f239375 authored by MichelJuillard's avatar MichelJuillard
Browse files

fixes for julia v0.5

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