preprocessor: JSON: place local variables in one list. Closes #1495

preprocessor/ModelTree.cc

@@ -1453,12 +1453,20 @@ ModelTree::writeJsonModelLocalVariables(ostream &output, deriv_node_temp_terms_t
   for (size_t i = 0; i < equations.size(); i++)
     equations[i]->collectVariables(eModelLocalVariable, used_local_vars);
 
-  output << "\"external_functions_model_local_variables\": [";
-  for (set<int>::const_iterator it = used_local_vars.begin();
-       it != used_local_vars.end(); ++it)
+  output << "\"model_local_variables\": [";
+  bool printed = false;
+  for (vector<int>::const_iterator it = local_variables_vector.begin();
+       it != local_variables_vector.end(); it++)
+    if (used_local_vars.find(*it) != used_local_vars.end())
       {
+        if (printed)
+          output << ", ";
+        else
+          printed = true;
+
+        int id = *it;
         vector<string> efout;
-      expr_t value = local_variables_table.find(*it)->second;
+        expr_t value = local_variables_table.find(id)->second;
         value->writeJsonExternalFunctionOutput(efout, tt, tef_terms);
         for (vector<string>::const_iterator it1 = efout.begin(); it1 != efout.end(); it1++)
           {
@@ -1466,21 +1474,9 @@ ModelTree::writeJsonModelLocalVariables(ostream &output, deriv_node_temp_terms_t
               output << ", ";
             output << *it1;
           }
-    }
-  output << "]"
-         << ", \"model_local_variables\": [";
-  bool printed = false;
-  for (vector<int>::const_iterator it = local_variables_vector.begin();
-       it != local_variables_vector.end(); it++)
-    if (used_local_vars.find(*it) != used_local_vars.end())
-      {
-        int id = *it;
-        expr_t value = local_variables_table.find(id)->second;
 
-        if (printed)
+        if (!efout.empty())
           output << ", ";
-        else
-          printed = true;
 
         /* We append underscores to avoid name clashes with "g1" or "oo_" (see
            also VariableNode::writeOutput) */