#include "math_stringinset.h"
#include "math_symbolinset.h"
#include "math_parser.h"
-#include "support/std_sstream.h"
#include "debug.h"
#include "support/filetools.h"
#include "support/lstrings.h"
#include <algorithm>
+#include <sstream>
using lyx::support::cmd_ret;
using lyx::support::getVectorFromString;
void extractStrings(MathArray & ar)
{
//lyxerr << "\nStrings from: " << ar << endl;
- for (MathArray::size_type i = 0; i < ar.size(); ++i) {
+ for (size_t i = 0; i < ar.size(); ++i) {
if (!ar[i]->asCharInset())
continue;
string s = charSequence(ar.begin() + i, ar.end());
{
//lyxerr << "\nMatrices from: " << ar << endl;
// first pass for explicitly delimited stuff
- for (MathArray::size_type i = 0; i < ar.size(); ++i) {
+ for (size_t i = 0; i < ar.size(); ++i) {
if (!ar[i]->asDelimInset())
continue;
MathArray const & arr = ar[i]->asDelimInset()->cell(0);
}
// second pass for AMS "pmatrix" etc
- for (MathArray::size_type i = 0; i < ar.size(); ++i)
+ for (size_t i = 0; i < ar.size(); ++i)
if (ar[i]->asAMSArrayInset())
ar[i] = MathAtom(new MathMatrixInset(*(ar[i]->asGridInset())));
//lyxerr << "\nMatrices to: " << ar << endl;
// convert this inset somehow to a number
bool extractNumber(MathArray const & ar, int & i)
{
- istringstream is(charSequence(ar.begin(), ar.end()).c_str());
+ istringstream is(charSequence(ar.begin(), ar.end()));
is >> i;
return is;
}
bool extractNumber(MathArray const & ar, double & d)
{
- istringstream is(charSequence(ar.begin(), ar.end()).c_str());
+ istringstream is(charSequence(ar.begin(), ar.end()));
is >> d;
return is;
}
{
// use indices rather than iterators for the loop because we are going
// to modify the array.
- for (MathArray::size_type i = 0; i < ar.size(); ++i) {
+ for (size_t i = 0; i < ar.size(); ++i) {
// check whether this is the begin of the sequence
if (!testOpen(ar[i]))
continue;
void splitScripts(MathArray & ar)
{
//lyxerr << "\nScripts from: " << ar << endl;
- for (MathArray::size_type i = 0; i < ar.size(); ++i) {
+ for (size_t i = 0; i < ar.size(); ++i) {
// is this script inset?
if (!ar[i]->asScriptInset())
continue;
void extractExps(MathArray & ar)
{
//lyxerr << "\nExps from: " << ar << endl;
- for (MathArray::size_type i = 0; i + 1 < ar.size(); ++i) {
+ for (size_t i = 0; i + 1 < ar.size(); ++i) {
// is this 'e'?
if (ar[i]->getChar() != 'e')
continue;
void extractNumbers(MathArray & ar)
{
//lyxerr << "\nNumbers from: " << ar << endl;
- for (MathArray::size_type i = 0; i < ar.size(); ++i) {
+ for (size_t i = 0; i < ar.size(); ++i) {
if (!ar[i]->asCharInset())
continue;
if (!isDigitOrSimilar(ar[i]->asCharInset()->getChar()))
return;
//lyxerr << "\nFunctions from: " << ar << endl;
- for (MathArray::size_type i = 0; i + 1 < ar.size(); ++i) {
+ for (size_t i = 0; i + 1 < ar.size(); ++i) {
MathArray::iterator it = ar.begin() + i;
MathArray::iterator jt = it + 1;
return;
//lyxerr << "\nIntegrals from: " << ar << endl;
- for (MathArray::size_type i = 0; i + 1 < ar.size(); ++i) {
+ for (size_t i = 0; i + 1 < ar.size(); ++i) {
MathArray::iterator it = ar.begin() + i;
// search 'd'
return;
//lyxerr << "\nSums from: " << ar << endl;
- for (MathArray::size_type i = 0; i + 1 < ar.size(); ++i) {
+ for (size_t i = 0; i + 1 < ar.size(); ++i) {
MathArray::iterator it = ar.begin() + i;
// is this a sum name?
void extractDiff(MathArray & ar)
{
//lyxerr << "\nDiffs from: " << ar << endl;
- for (MathArray::size_type i = 0; i < ar.size(); ++i) {
+ for (size_t i = 0; i < ar.size(); ++i) {
MathArray::iterator it = ar.begin() + i;
// is this a "differential fraction"?
return;
//lyxerr << "\nLimits from: " << ar << endl;
- for (MathArray::size_type i = 0; i + 2 < ar.size(); ++i) {
+ for (size_t i = 0; i + 2 < ar.size(); ++i) {
MathArray::iterator it = ar.begin() + i;
// is this a limit function?
break;
// search line with "Incorrect syntax"
- istringstream is(out.c_str());
+ istringstream is(out);
string line;
while (is) {
getline(is, line);
string out = captureOutput("mint -i 1 -S -s -q -q", expr + ';');
if (out.empty())
break; // expression syntax is ok
- istringstream is(out.c_str());
+ istringstream is(out);
string line;
getline(is, line);
if (line.find("on line") != 0)
break;
// search line with single caret
- istringstream is(out.c_str());
+ istringstream is(out);
string line;
while (is) {
getline(is, line);