Fixed indentation if c and c++ files.

parent 6d573547
...@@ -229,15 +229,15 @@ enum TrinaryOpcode ...@@ -229,15 +229,15 @@ enum TrinaryOpcode
}; };
enum external_function_type enum external_function_type
{ {
ExternalFunctionWithoutDerivative, ExternalFunctionWithoutDerivative,
ExternalFunctionWithFirstDerivative, ExternalFunctionWithFirstDerivative,
ExternalFunctionWithFirstandSecondDerivative, ExternalFunctionWithFirstandSecondDerivative,
ExternalFunctionNumericalFirstDerivative, ExternalFunctionNumericalFirstDerivative,
ExternalFunctionFirstDerivative, ExternalFunctionFirstDerivative,
ExternalFunctionNumericalSecondDerivative, ExternalFunctionNumericalSecondDerivative,
ExternalFunctionSecondDerivative ExternalFunctionSecondDerivative
}; };
enum PriorDistributions enum PriorDistributions
{ {
...@@ -1452,9 +1452,9 @@ public: ...@@ -1452,9 +1452,9 @@ public:
exogenous = vector<unsigned int>(exogenous_arg); exogenous = vector<unsigned int>(exogenous_arg);
other_endogenous = vector<unsigned int>(other_endogenous_arg); other_endogenous = vector<unsigned int>(other_endogenous_arg);
is_linear = is_linear_arg; endo_nbr = endo_nbr_arg; Max_Lag = Max_Lag_arg; Max_Lead = Max_Lead_arg; u_count_int = u_count_int_arg; is_linear = is_linear_arg; endo_nbr = endo_nbr_arg; Max_Lag = Max_Lag_arg; Max_Lead = Max_Lead_arg; u_count_int = u_count_int_arg;
nb_col_jacob = nb_col_jacob_arg; nb_col_jacob = nb_col_jacob_arg;
det_exo_size = det_exo_size_arg; nb_col_det_exo_jacob = nb_col_det_exo_jacob_arg; det_exo_size = det_exo_size_arg; nb_col_det_exo_jacob = nb_col_det_exo_jacob_arg;
exo_size = exo_size_arg; nb_col_exo_jacob = nb_col_exo_jacob_arg; exo_size = exo_size_arg; nb_col_exo_jacob = nb_col_exo_jacob_arg;
other_endo_size = other_endo_size_arg; nb_col_other_endo_jacob = nb_col_other_endo_jacob_arg; other_endo_size = other_endo_size_arg; nb_col_other_endo_jacob = nb_col_other_endo_jacob_arg;
}; };
inline inline
...@@ -1468,7 +1468,7 @@ public: ...@@ -1468,7 +1468,7 @@ public:
is_linear = is_linear_arg; endo_nbr = endo_nbr_arg; Max_Lag = Max_Lag_arg; Max_Lead = Max_Lead_arg; u_count_int = u_count_int_arg; is_linear = is_linear_arg; endo_nbr = endo_nbr_arg; Max_Lag = Max_Lag_arg; Max_Lead = Max_Lead_arg; u_count_int = u_count_int_arg;
nb_col_jacob = nb_col_jacob_arg; nb_col_jacob = nb_col_jacob_arg;
det_exo_size = 0; exo_size = 0; other_endo_size = 0; det_exo_size = 0; exo_size = 0; other_endo_size = 0;
nb_col_det_exo_jacob = 0;nb_col_exo_jacob = 0;nb_col_other_endo_jacob = 0; nb_col_det_exo_jacob = 0; nb_col_exo_jacob = 0; nb_col_other_endo_jacob = 0;
} }
inline unsigned int inline unsigned int
get_size() get_size()
...@@ -2026,4 +2026,3 @@ public: ...@@ -2026,4 +2026,3 @@ public:
#endif #endif
#pragma pack(pop) #pragma pack(pop)
#endif #endif
This diff is collapsed.
...@@ -181,7 +181,7 @@ private: ...@@ -181,7 +181,7 @@ private:
const OptionsList options_list; const OptionsList options_list;
public: public:
RamseyModelStatement(const SymbolList &symbol_list_arg, RamseyModelStatement(const SymbolList &symbol_list_arg,
const OptionsList &options_list_arg); const OptionsList &options_list_arg);
virtual void checkPass(ModFileStructure &mod_file_struct, WarningConsolidation &warnings); virtual void checkPass(ModFileStructure &mod_file_struct, WarningConsolidation &warnings);
virtual void writeOutput(ostream &output, const string &basename, bool minimal_workspace) const; virtual void writeOutput(ostream &output, const string &basename, bool minimal_workspace) const;
}; };
...@@ -189,11 +189,12 @@ public: ...@@ -189,11 +189,12 @@ public:
class RamseyConstraintsStatement : public Statement class RamseyConstraintsStatement : public Statement
{ {
public: public:
struct Constraint { struct Constraint
{
int endo; int endo;
BinaryOpcode code; BinaryOpcode code;
expr_t expression; expr_t expression;
}; };
typedef vector<Constraint> constraints_t; typedef vector<Constraint> constraints_t;
private: private:
const constraints_t constraints; const constraints_t constraints;
...@@ -226,7 +227,7 @@ private: ...@@ -226,7 +227,7 @@ private:
const OptionsList options_list; const OptionsList options_list;
public: public:
DiscretionaryPolicyStatement(const SymbolList &symbol_list_arg, DiscretionaryPolicyStatement(const SymbolList &symbol_list_arg,
const OptionsList &options_list_arg); const OptionsList &options_list_arg);
virtual void checkPass(ModFileStructure &mod_file_struct, WarningConsolidation &warnings); virtual void checkPass(ModFileStructure &mod_file_struct, WarningConsolidation &warnings);
virtual void writeOutput(ostream &output, const string &basename, bool minimal_workspace) const; virtual void writeOutput(ostream &output, const string &basename, bool minimal_workspace) const;
}; };
...@@ -476,7 +477,8 @@ public: ...@@ -476,7 +477,8 @@ public:
/*! \param model_tree_arg the model tree used to store the objective function. /*! \param model_tree_arg the model tree used to store the objective function.
It is owned by the PlannerObjectiveStatement, and will be deleted by its destructor */ It is owned by the PlannerObjectiveStatement, and will be deleted by its destructor */
PlannerObjectiveStatement(StaticModel *model_tree_arg); PlannerObjectiveStatement(StaticModel *model_tree_arg);
virtual ~PlannerObjectiveStatement(); virtual
~PlannerObjectiveStatement();
/*! \todo check there are only endogenous variables at the current period in the objective /*! \todo check there are only endogenous variables at the current period in the objective
(no exogenous, no lead/lag) */ (no exogenous, no lead/lag) */
virtual void checkPass(ModFileStructure &mod_file_struct, WarningConsolidation &warnings); virtual void checkPass(ModFileStructure &mod_file_struct, WarningConsolidation &warnings);
...@@ -566,7 +568,7 @@ private: ...@@ -566,7 +568,7 @@ private:
const OptionsList options_list; const OptionsList options_list;
public: public:
MSSBVARIrfStatement(const SymbolList &symbol_list_arg, MSSBVARIrfStatement(const SymbolList &symbol_list_arg,
const OptionsList &options_list_arg); const OptionsList &options_list_arg);
virtual void checkPass(ModFileStructure &mod_file_struct, WarningConsolidation &warnings); virtual void checkPass(ModFileStructure &mod_file_struct, WarningConsolidation &warnings);
virtual void writeOutput(ostream &output, const string &basename, bool minimal_workspace) const; virtual void writeOutput(ostream &output, const string &basename, bool minimal_workspace) const;
}; };
...@@ -726,7 +728,7 @@ public: ...@@ -726,7 +728,7 @@ public:
int lag; int lag;
int variable; int variable;
expr_t value; expr_t value;
}; };
typedef vector< svar_identification_restriction > svar_identification_restrictions_t; typedef vector< svar_identification_restriction > svar_identification_restrictions_t;
private: private:
...@@ -740,7 +742,7 @@ public: ...@@ -740,7 +742,7 @@ public:
SvarIdentificationStatement(const svar_identification_restrictions_t &restrictions_arg, SvarIdentificationStatement(const svar_identification_restrictions_t &restrictions_arg,
const bool &upper_cholesky_present_arg, const bool &upper_cholesky_present_arg,
const bool &lower_cholesky_present_arg, const bool &lower_cholesky_present_arg,
const bool &constants_exclusion_present_arg, const bool &constants_exclusion_present_arg,
const SymbolTable &symbol_table_arg); const SymbolTable &symbol_table_arg);
virtual void checkPass(ModFileStructure &mod_file_struct, WarningConsolidation &warnings); virtual void checkPass(ModFileStructure &mod_file_struct, WarningConsolidation &warnings);
virtual void writeOutput(ostream &output, const string &basename, bool minimal_workspace) const; virtual void writeOutput(ostream &output, const string &basename, bool minimal_workspace) const;
...@@ -845,11 +847,11 @@ public: ...@@ -845,11 +847,11 @@ public:
void writeOutputHelper(ostream &output, const string &field, const string &lhs_field) const; void writeOutputHelper(ostream &output, const string &field, const string &lhs_field) const;
}; };
class BasicPriorStatement : public Statement class BasicPriorStatement : public Statement
{ {
public: public:
virtual ~BasicPriorStatement(); virtual
~BasicPriorStatement();
protected: protected:
const string name; const string name;
const string subsample_name; const string subsample_name;
...@@ -952,7 +954,8 @@ public: ...@@ -952,7 +954,8 @@ public:
class BasicOptionsStatement : public Statement class BasicOptionsStatement : public Statement
{ {
public: public:
virtual ~BasicOptionsStatement(); virtual
~BasicOptionsStatement();
protected: protected:
const string name; const string name;
const string subsample_name; const string subsample_name;
......
...@@ -102,7 +102,7 @@ ConfigFile::getConfigFileInfo(const string &config_file) ...@@ -102,7 +102,7 @@ ConfigFile::getConfigFileInfo(const string &config_file)
if (config_file.empty()) if (config_file.empty())
{ {
string defaultConfigFile (""); string defaultConfigFile("");
// Test OS and try to open default file // Test OS and try to open default file
#if defined(_WIN32) || defined(__CYGWIN32__) #if defined(_WIN32) || defined(__CYGWIN32__)
if (getenv("APPDATA") == NULL) if (getenv("APPDATA") == NULL)
...@@ -122,42 +122,41 @@ ConfigFile::getConfigFileInfo(const string &config_file) ...@@ -122,42 +122,41 @@ ConfigFile::getConfigFileInfo(const string &config_file)
defaultConfigFile += "\\dynare.ini"; defaultConfigFile += "\\dynare.ini";
} }
#else #else
if (getenv("HOME") == NULL) if (getenv("HOME") == NULL)
{ {
if (parallel || parallel_test)
cerr << "ERROR: ";
else
cerr << "WARNING: ";
cerr << "HOME environment variable not found." << endl;
if (parallel || parallel_test)
exit(EXIT_FAILURE);
}
else
{
defaultConfigFile += getenv("HOME");
defaultConfigFile += "/.dynare";
}
#endif
configFile = new ifstream(defaultConfigFile.c_str(), fstream::in);
if (!configFile->is_open())
if (parallel || parallel_test) if (parallel || parallel_test)
{ cerr << "ERROR: ";
cerr << "ERROR: Could not open the default config file (" << defaultConfigFile << ")" << endl;
exit(EXIT_FAILURE);
}
else else
return; cerr << "WARNING: ";
} cerr << "HOME environment variable not found." << endl;
else if (parallel || parallel_test)
{ exit(EXIT_FAILURE);
configFile = new ifstream(config_file.c_str(), fstream::in); }
if (!configFile->is_open()) else
{
defaultConfigFile += getenv("HOME");
defaultConfigFile += "/.dynare";
}
#endif
configFile = new ifstream(defaultConfigFile.c_str(), fstream::in);
if (!configFile->is_open())
if (parallel || parallel_test)
{ {
cerr << "ERROR: Couldn't open file " << config_file << endl;; cerr << "ERROR: Could not open the default config file (" << defaultConfigFile << ")" << endl;
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
} else
return;
}
else
{
configFile = new ifstream(config_file.c_str(), fstream::in);
if (!configFile->is_open())
{
cerr << "ERROR: Couldn't open file " << config_file << endl;;
exit(EXIT_FAILURE);
}
}
string name, computerName, port, userName, password, remoteDrive, string name, computerName, port, userName, password, remoteDrive,
remoteDirectory, dynarePath, matlabOctavePath, operatingSystem, remoteDirectory, dynarePath, matlabOctavePath, operatingSystem,
...@@ -271,7 +270,7 @@ ConfigFile::getConfigFileInfo(const string &config_file) ...@@ -271,7 +270,7 @@ ConfigFile::getConfigFileInfo(const string &config_file)
vector<string> tokenizedPath; vector<string> tokenizedPath;
split(tokenizedPath, tokenizedLine.back(), is_any_of(":"), token_compress_on); split(tokenizedPath, tokenizedLine.back(), is_any_of(":"), token_compress_on);
for (vector<string>::iterator it = tokenizedPath.begin(); for (vector<string>::iterator it = tokenizedPath.begin();
it != tokenizedPath.end(); it++ ) it != tokenizedPath.end(); it++)
if (!it->empty()) if (!it->empty())
{ {
trim(*it); trim(*it);
...@@ -375,7 +374,7 @@ ConfigFile::getConfigFileInfo(const string &config_file) ...@@ -375,7 +374,7 @@ ConfigFile::getConfigFileInfo(const string &config_file)
for (tokenizer<char_separator<char> >::iterator it = tokens.begin(); for (tokenizer<char_separator<char> >::iterator it = tokens.begin();
it != tokens.end(); it++) it != tokens.end(); it++)
{ {
string token (*it); string token(*it);
if (token.compare("(") == 0) if (token.compare("(") == 0)
{ {
begin_weight = true; begin_weight = true;
...@@ -525,10 +524,10 @@ void ...@@ -525,10 +524,10 @@ void
ConfigFile::checkPass(WarningConsolidation &warnings) const ConfigFile::checkPass(WarningConsolidation &warnings) const
{ {
bool global_init_file_declared = false; bool global_init_file_declared = false;
for (vector<Hook *>::const_iterator it = hooks.begin() ; it != hooks.end(); it++) for (vector<Hook *>::const_iterator it = hooks.begin(); it != hooks.end(); it++)
{ {
const map <string, string> hookmap = (*it)->get_hooks(); const map <string, string> hookmap = (*it)->get_hooks();
for (map <string, string>::const_iterator mapit = hookmap.begin() ; mapit != hookmap.end(); mapit++) for (map <string, string>::const_iterator mapit = hookmap.begin(); mapit != hookmap.end(); mapit++)
if (mapit->first.compare("global_init_file") == 0) if (mapit->first.compare("global_init_file") == 0)
if (global_init_file_declared == true) if (global_init_file_declared == true)
{ {
...@@ -686,10 +685,10 @@ vector<string> ...@@ -686,10 +685,10 @@ vector<string>
ConfigFile::getIncludePaths() const ConfigFile::getIncludePaths() const
{ {
vector<string> include_paths; vector<string> include_paths;
for (vector<Path *>::const_iterator it = paths.begin() ; it != paths.end(); it++) for (vector<Path *>::const_iterator it = paths.begin(); it != paths.end(); it++)
{ {
map <string, vector<string> > pathmap = (*it)->get_paths(); map <string, vector<string> > pathmap = (*it)->get_paths();
for (map <string, vector<string> >::const_iterator mapit = pathmap.begin() ; mapit != pathmap.end(); mapit++) for (map <string, vector<string> >::const_iterator mapit = pathmap.begin(); mapit != pathmap.end(); mapit++)
for (vector<string>::const_iterator vecit = mapit->second.begin(); vecit != mapit->second.end(); vecit++) for (vector<string>::const_iterator vecit = mapit->second.begin(); vecit != mapit->second.end(); vecit++)
include_paths.push_back(*vecit); include_paths.push_back(*vecit);
} }
...@@ -699,10 +698,10 @@ ConfigFile::getIncludePaths() const ...@@ -699,10 +698,10 @@ ConfigFile::getIncludePaths() const
void void
ConfigFile::writeHooks(ostream &output) const ConfigFile::writeHooks(ostream &output) const
{ {
for (vector<Hook *>::const_iterator it = hooks.begin() ; it != hooks.end(); it++) for (vector<Hook *>::const_iterator it = hooks.begin(); it != hooks.end(); it++)
{ {
map <string, string> hookmap = (*it)->get_hooks(); map <string, string> hookmap = (*it)->get_hooks();
for (map <string, string>::const_iterator mapit = hookmap.begin() ; mapit != hookmap.end(); mapit++) for (map <string, string>::const_iterator mapit = hookmap.begin(); mapit != hookmap.end(); mapit++)
output << "options_." << mapit->first << " = '" << mapit->second << "';" << endl; output << "options_." << mapit->first << " = '" << mapit->second << "';" << endl;
} }
} }
......
...@@ -37,18 +37,26 @@ public: ...@@ -37,18 +37,26 @@ public:
private: private:
map<string, string> hooks; map<string, string> hooks;
public: public:
inline map<string, string>get_hooks() { return hooks; }; inline map<string, string>
get_hooks()
{
return hooks;
};
}; };
class Path class Path
{ {
public: public:
Path(vector<string> &includepath_arg); Path(vector<string> &includepath_arg);
~Path(); ~Path();
private: private:
map<string, vector<string> > paths; map<string, vector<string> > paths;
public: public:
inline map<string, vector<string> >get_paths() { return paths; }; inline map<string, vector<string> >
get_paths()
{
return paths;
};
}; };
class SlaveNode class SlaveNode
......
...@@ -109,7 +109,8 @@ private: ...@@ -109,7 +109,8 @@ private:
public: public:
DataTree(SymbolTable &symbol_table_arg, NumericalConstants &num_constants_arg, ExternalFunctionsTable &external_functions_table_arg); DataTree(SymbolTable &symbol_table_arg, NumericalConstants &num_constants_arg, ExternalFunctionsTable &external_functions_table_arg);
virtual ~DataTree(); virtual
~DataTree();
//! Some predefined constants //! Some predefined constants
expr_t Zero, One, Two, MinusOne, NaN, Infinity, MinusInfinity, Pi; expr_t Zero, One, Two, MinusOne, NaN, Infinity, MinusInfinity, Pi;
......
This diff is collapsed.
...@@ -283,7 +283,7 @@ public: ...@@ -283,7 +283,7 @@ public:
//! Returns number of static only equations //! Returns number of static only equations
size_t staticOnlyEquationsNbr() const; size_t staticOnlyEquationsNbr() const;
//! Returns number of dynamic only equations //! Returns number of dynamic only equations
size_t dynamicOnlyEquationsNbr() const; size_t dynamicOnlyEquationsNbr() const;
...@@ -341,7 +341,7 @@ public: ...@@ -341,7 +341,7 @@ public:
//! Transforms the model by creating aux vars for the diff of forward vars //! Transforms the model by creating aux vars for the diff of forward vars
/*! If subset is empty, does the transformation for all fwrd vars; otherwise /*! If subset is empty, does the transformation for all fwrd vars; otherwise
restrict it to the vars in subset */ restrict it to the vars in subset */
void differentiateForwardVars(const vector<string> &subset); void differentiateForwardVars(const vector<string> &subset);
//! Fills eval context with values of model local variables and auxiliary variables //! Fills eval context with values of model local variables and auxiliary variables
...@@ -539,7 +539,7 @@ DynamicModel::checkHessianZero() const ...@@ -539,7 +539,7 @@ DynamicModel::checkHessianZero() const
return second_derivatives.empty(); return second_derivatives.empty();
} }
//! Classes to re-order derivatives for various sparse storage formats //! Classes to re-order derivatives for various sparse storage formats
class derivative class derivative
{ {
public: public:
...@@ -547,14 +547,17 @@ public: ...@@ -547,14 +547,17 @@ public:
long unsigned int col_nbr; long unsigned int col_nbr;
unsigned int row_nbr; unsigned int row_nbr;
expr_t value; expr_t value;
derivative(long unsigned int arg1, long unsigned int arg2, int arg3, expr_t arg4): derivative(long unsigned int arg1, long unsigned int arg2, int arg3, expr_t arg4) :
linear_address(arg1), col_nbr(arg2), row_nbr(arg3), value(arg4) {}; linear_address(arg1), col_nbr(arg2), row_nbr(arg3), value(arg4)
{
};
}; };
class derivative_less_than class derivative_less_than
{ {
public: public:
bool operator()(const derivative & d1, const derivative & d2) const bool
operator()(const derivative &d1, const derivative &d2) const
{ {
return d1.linear_address < d2.linear_address; return d1.linear_address < d2.linear_address;
} }
......
...@@ -124,8 +124,8 @@ main(int argc, char **argv) ...@@ -124,8 +124,8 @@ main(int argc, char **argv)
clear_all = false; clear_all = false;
else if (strlen(argv[arg]) >= 19 && !strncmp(argv[arg], "params_derivs_order", 19)) else if (strlen(argv[arg]) >= 19 && !strncmp(argv[arg], "params_derivs_order", 19))
{ {
if (strlen(argv[arg]) >= 22 || argv[arg][19] != '=' || if (strlen(argv[arg]) >= 22 || argv[arg][19] != '='
!(argv[arg][20] == '0' || argv[arg][20] == '1' || argv[arg][20] == '2')) || !(argv[arg][20] == '0' || argv[arg][20] == '1' || argv[arg][20] == '2'))
{ {
cerr << "Incorrect syntax for params_derivs_order option" << endl; cerr << "Incorrect syntax for params_derivs_order option" << endl;
usage(); usage();
...@@ -222,12 +222,12 @@ main(int argc, char **argv) ...@@ -222,12 +222,12 @@ main(int argc, char **argv)
size_t equal_index = string(argv[arg]).find('='); size_t equal_index = string(argv[arg]).find('=');
if (equal_index != string::npos) if (equal_index != string::npos)
{ {
string key = string(argv[arg]).erase(equal_index).erase(0,2); string key = string(argv[arg]).erase(equal_index).erase(0, 2);
defines[key] = string(argv[arg]).erase(0, equal_index+1); defines[key] = string(argv[arg]).erase(0, equal_index+1);
} }
else else
{ {
string key = string(argv[arg]).erase(0,2); string key = string(argv[arg]).erase(0, 2);
defines[key] = "1"; defines[key] = "1";
} }
} }
...@@ -239,36 +239,36 @@ main(int argc, char **argv) ...@@ -239,36 +239,36 @@ main(int argc, char **argv)
<< "must not be separated from -I by whitespace." << endl; << "must not be separated from -I by whitespace." << endl;
usage(); usage();
} }
path.push_back(string(argv[arg]).erase(0,2)); path.push_back(string(argv[arg]).erase(0, 2));
} }
else if (strlen(argv[arg]) >= 6 && !strncmp(argv[arg], "output", 6)) else if (strlen(argv[arg]) >= 6 && !strncmp(argv[arg], "output", 6))
{ {
if (strlen(argv[arg]) <= 7 || argv[arg][6] != '=') if (strlen(argv[arg]) <= 7 || argv[arg][6] != '=')
{ {
cerr << "Incorrect syntax for ouput option" << endl; cerr << "Incorrect syntax for ouput option" << endl;
usage(); usage();
} }
if (strlen(argv[arg]) == 14 && !strncmp(argv[arg] + 7, "dynamic", 7)) if (strlen(argv[arg]) == 14 && !strncmp(argv[arg] + 7, "dynamic", 7))
output_mode = dynamic; output_mode = dynamic;
else if (strlen(argv[arg]) == 12 && !strncmp(argv[arg] + 7, "first", 5)) else if (strlen(argv[arg]) == 12 && !strncmp(argv[arg] + 7, "first", 5))
output_mode = first; output_mode = first;
else if (strlen(argv[arg]) == 13 && !strncmp(argv[arg] + 7, "second", 6)) else if (strlen(argv[arg]) == 13 && !strncmp(argv[arg] + 7, "second", 6))
output_mode = second; output_mode = second;
else if (strlen(argv[arg]) == 12 && !strncmp(argv[arg] + 7, "third", 5)) else if (strlen(argv[arg]) == 12 && !strncmp(argv[arg] + 7, "third", 5))
output_mode = third; output_mode = third;
else else
{ {
cerr << "Incorrect syntax for ouput option" << endl; cerr << "Incorrect syntax for ouput option" << endl;
usage(); usage();
} }
} }
else if (strlen(argv[arg]) >= 8 && !strncmp(argv[arg], "language", 8)) else if (strlen(argv[arg]) >= 8 && !strncmp(argv[arg], "language", 8))
{ {
if (strlen(argv[arg]) <= 9 || argv[arg][8] != '=') if (strlen(argv[arg]) <= 9 || argv[arg][8] != '=')
{ {
cerr << "Incorrect syntax for language option" << endl; cerr << "Incorrect syntax for language option" << endl;
usage(); usage();
} }
if (strlen(argv[arg]) == 14 && !strncmp(argv[arg] + 9, "julia", 5)) if (strlen(argv[arg]) == 14 && !strncmp(argv[arg] + 9, "julia", 5))
language = julia; language = julia;
......
...@@ -60,9 +60,9 @@ main2(stringstream &in, string &basename, bool debug, bool clear_all, bool clear ...@@ -60,9 +60,9 @@ main2(stringstream &in, string &basename, bool debug, bool clear_all, bool clear
mod_file->writeOutputFiles(basename, clear_all, clear_global, no_log, no_warn, console, nograph, mod_file->writeOutputFiles(basename, clear_all, clear_global, no_log, no_warn, console, nograph,
nointeractive, config_file, check_model_changes, minimal_workspace, compute_xrefs nointeractive, config_file, check_model_changes, minimal_workspace, compute_xrefs
#if defined(_WIN32) || defined(__CYGWIN32__) || defined(__MINGW32__) #if defined(_WIN32) || defined(__CYGWIN32__) || defined(__MINGW32__)
, cygwin, msvc, mingw , cygwin, msvc, mingw
#endif #endif
); );