From c5ed3260bc7ac8c772dfb707ce5266297526c0e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?=
 <sebastien.villemot@sciencespo.fr>
Date: Wed, 28 Jun 2017 15:06:54 +0200
Subject: [PATCH] Fix various typos (thanks lintian).

(cherry picked from commit 1ff5c3f5718b787b60948153b1e93d465e6b8d68)
---
 dynare++/kord/korder.cweb            | 4 ++--
 dynare++/kord/korder_stoch.hweb      | 2 +-
 mex/sources/bytecode/SparseMatrix.cc | 4 ++--
 mex/sources/bytecode/bytecode.cc     | 2 +-
 preprocessor/DynamicModel.cc         | 2 +-
 preprocessor/DynareMain.cc           | 4 ++--
 preprocessor/ModFile.cc              | 2 +-
 preprocessor/StaticModel.cc          | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dynare++/kord/korder.cweb b/dynare++/kord/korder.cweb
index ce5684143..a73360e38 100644
--- a/dynare++/kord/korder.cweb
+++ b/dynare++/kord/korder.cweb
@@ -159,9 +159,9 @@ KOrder::KOrder(int num_stat, int num_pred, int num_both, int num_forw,
 	KORD_RAISE_IF(gy.nrows() != ypart.ny(),
 				  "Wrong number of rows in gy in KOrder constructor");
 	KORD_RAISE_IF(gu.nrows() != ypart.ny(),
-				  "Wrong number of rows in gu in KOrder constuctor");
+				  "Wrong number of rows in gu in KOrder constructor");
 	KORD_RAISE_IF(gu.ncols() != nu,
-				  "Wrong number of columns in gu in KOrder constuctor");
+				  "Wrong number of columns in gu in KOrder constructor");
 
 	// set nvs:
 	nvs[0] = ypart.nys(); nvs[1] = nu; nvs[2] = nu; nvs[3] = 1;
diff --git a/dynare++/kord/korder_stoch.hweb b/dynare++/kord/korder_stoch.hweb
index 83d7cd6f4..0587c9a3a 100644
--- a/dynare++/kord/korder_stoch.hweb
+++ b/dynare++/kord/korder_stoch.hweb
@@ -64,7 +64,7 @@ public:@;
 	@<|IntegDerivs| constructor code@>;
 };
 
-@ This constuctor integrates a rule (namely its $g^{**}$ part) with
+@ This constructor integrates a rule (namely its $g^{**}$ part) with
 respect to $u=\tilde\sigma\eta$, and stores to the object the
 derivatives of this integral $h$ at $(y^*,u,\sigma)=(\tilde
 y^*,0,\tilde\sigma)$. The original container of $g^{**}$, the moments of
diff --git a/mex/sources/bytecode/SparseMatrix.cc b/mex/sources/bytecode/SparseMatrix.cc
index 7db7341cb..1ef1239a6 100644
--- a/mex/sources/bytecode/SparseMatrix.cc
+++ b/mex/sources/bytecode/SparseMatrix.cc
@@ -6708,7 +6708,7 @@ dynSparseMatrix::Simulate_Newton_Two_Boundaries(int blck, int y_size, int y_kmin
         {
           if (restart > 2)
             {
-              mexPrintf("Divergence or slowdown occured during simulation.\nIn the next iteration, pivoting method will be applied to all periods.\n");
+              mexPrintf("Divergence or slowdown occurred during simulation.\nIn the next iteration, pivoting method will be applied to all periods.\n");
               symbolic = false;
               alt_symbolic = true;
               markowitz_c_s = markowitz_c;
@@ -6716,7 +6716,7 @@ dynSparseMatrix::Simulate_Newton_Two_Boundaries(int blck, int y_size, int y_kmin
             }
           else
             {
-              mexPrintf("Divergence or slowdown occured during simulation.\nIn the next iteration, pivoting method will be applied for a longer period.\n");
+              mexPrintf("Divergence or slowdown occurred during simulation.\nIn the next iteration, pivoting method will be applied for a longer period.\n");
               start_compare = min(tbreak_g, periods);
               restart++;
             }
diff --git a/mex/sources/bytecode/bytecode.cc b/mex/sources/bytecode/bytecode.cc
index 80ba1b450..2bac3e3f2 100644
--- a/mex/sources/bytecode/bytecode.cc
+++ b/mex/sources/bytecode/bytecode.cc
@@ -773,7 +773,7 @@ main(int nrhs, const char *prhs[])
       for (vector<s_plan>::iterator it = splan.begin(); it != splan.end(); it++)
         {
           mexPrintf("----------------------------------------------------------------------------------------------------\n");
-          mexPrintf("suprise #%d\n", i+1);
+          mexPrintf("surprise #%d\n", i+1);
           if (it->exo.length())
             mexPrintf(" plan fliping var=%s (%d) exo=%s (%d) for the following periods and with the following values:\n", it->var.c_str(), it->var_num, it->exo.c_str(), it->exo_num);
           else
diff --git a/preprocessor/DynamicModel.cc b/preprocessor/DynamicModel.cc
index 6ade56517..2f1147cbb 100644
--- a/preprocessor/DynamicModel.cc
+++ b/preprocessor/DynamicModel.cc
@@ -510,7 +510,7 @@ DynamicModel::writeModelEquationsOrdered_M(const string &dynamic_basename) const
                 }
               else
                 {
-                  cerr << "Type missmatch for equation " << equation_ID+1  << "\n";
+                  cerr << "Type mismatch for equation " << equation_ID+1  << "\n";
                   exit(EXIT_FAILURE);
                 }
               output << ";\n";
diff --git a/preprocessor/DynareMain.cc b/preprocessor/DynareMain.cc
index 887cf2818..104a0783a 100644
--- a/preprocessor/DynareMain.cc
+++ b/preprocessor/DynareMain.cc
@@ -245,7 +245,7 @@ main(int argc, char **argv)
         {
           if (strlen(argv[arg]) <= 7 || argv[arg][6] != '=')
             {
-              cerr << "Incorrect syntax for ouput option" << endl;
+              cerr << "Incorrect syntax for output option" << endl;
               usage();
             }
           if (strlen(argv[arg]) == 14 && !strncmp(argv[arg] + 7, "dynamic", 7))
@@ -258,7 +258,7 @@ main(int argc, char **argv)
             output_mode = third;
           else
             {
-              cerr << "Incorrect syntax for ouput option" << endl;
+              cerr << "Incorrect syntax for output option" << endl;
               usage();
             }
         }
diff --git a/preprocessor/ModFile.cc b/preprocessor/ModFile.cc
index b5d37cfe6..8d6150a26 100644
--- a/preprocessor/ModFile.cc
+++ b/preprocessor/ModFile.cc
@@ -232,7 +232,7 @@ ModFile::checkPass(bool nostrict)
 
       if (mod_file_struct.dsge_prior_weight_initialized && mod_file_struct.dsge_prior_weight_in_estimated_params)
         {
-          cerr << "ERROR: dsge_prior_weight cannot be both initalized and estimated." << endl;
+          cerr << "ERROR: dsge_prior_weight cannot be both initialized and estimated." << endl;
           exit(EXIT_FAILURE);
         }
     }
diff --git a/preprocessor/StaticModel.cc b/preprocessor/StaticModel.cc
index 1038ac532..6ee91f88b 100644
--- a/preprocessor/StaticModel.cc
+++ b/preprocessor/StaticModel.cc
@@ -341,7 +341,7 @@ StaticModel::writeModelEquationsOrdered_M(const string &static_basename) const
                 }
               else
                 {
-                  cerr << "Type missmatch for equation " << equation_ID+1  << "\n";
+                  cerr << "Type mismatch for equation " << equation_ID+1  << "\n";
                   exit(EXIT_FAILURE);
                 }
               output << ";\n";
-- 
GitLab