diff --git a/julia/v0.5/Dynare.jl b/julia/v0.5/Dynare.jl index 82efd64f2d672b17931f8b69fa72cdfeefa732bd..751d19f728df905a6ef4cd00cdd67968c134eb98 100644 --- a/julia/v0.5/Dynare.jl +++ b/julia/v0.5/Dynare.jl @@ -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 diff --git a/julia/v0.5/DynareModel.jl b/julia/v0.5/DynareModel.jl index 6c4b6110e938a654fcd3b2740dc712db8b81775e..3c5bff16f53bc3401e8cb32a78e74e9b9d266b32 100644 --- a/julia/v0.5/DynareModel.jl +++ b/julia/v0.5/DynareModel.jl @@ -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) diff --git a/julia/v0.5/DynareOptions.jl b/julia/v0.5/DynareOptions.jl index b25bdc27cd0e09ce9a6da651d3aaac6ddadb5871..9e32bde2db8654caca52cf85ab36b46ba812d8d9 100644 --- a/julia/v0.5/DynareOptions.jl +++ b/julia/v0.5/DynareOptions.jl @@ -36,7 +36,7 @@ function pfmsolver_set_defaults() end type Options - dynare_version::ASCIIString + dynare_version::String linear::Bool pfmsolver::PFMSolver end diff --git a/julia/v0.5/DynareOutput.jl b/julia/v0.5/DynareOutput.jl index b3ca48a23a3ea399b792d37b881774376375f8e9..d4c129bf89e11ba4e18db29c25288f417698285f 100644 --- a/julia/v0.5/DynareOutput.jl +++ b/julia/v0.5/DynareOutput.jl @@ -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