[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [analitza] analitza: Improve flexibility of script importing
From:       Aleix Pol <aleixpol () kde ! org>
Date:       2013-10-01 1:25:26
Message-ID: E1VQoiM-0000nq-1y () scm ! kde ! org
[Download RAW message or body]

Git commit 3c02a7880b0251fea67f704ba9d54954bfef85e7 by Aleix Pol.
Committed on 01/10/2013 at 01:25.
Pushed by apol into branch 'master'.

Improve flexibility of script importing

Approprietly skip spaces between expressions, they don't have a meaning and
can confuse ::atEnd.

M  +2    -3    analitza/expressionstream.cpp
M  +6    -0    analitza/tests/analitzatest.cpp

http://commits.kde.org/analitza/3c02a7880b0251fea67f704ba9d54954bfef85e7

diff --git a/analitza/expressionstream.cpp b/analitza/expressionstream.cpp
index c0877c1..f0f14a6 100644
--- a/analitza/expressionstream.cpp
+++ b/analitza/expressionstream.cpp
@@ -47,11 +47,10 @@ Expression ExpressionStream::next()
 		m_last += m_dev->readLine()+'\n';
 		if(Expression::isCompleteExpression(m_last)) {
 			break;
-		} else if(m_dev->atEnd()) {
-			m_interrupted = true;
-			break;
 		}
 	}
+	m_dev->skipWhiteSpace();
+	m_interrupted = !Expression::isCompleteExpression(m_last);
 	QString last = m_last.trimmed();
 	return Analitza::Expression(last, Expression::isMathML(last));
 }
diff --git a/analitza/tests/analitzatest.cpp b/analitza/tests/analitzatest.cpp
index f41aaf1..6e71b96 100644
--- a/analitza/tests/analitzatest.cpp
+++ b/analitza/tests/analitzatest.cpp
@@ -477,6 +477,12 @@ void AnalitzaTest::testCorrection()
 		QVERIFY(b.isCorrect());
 	}
 	QCOMPARE(evalResult.toString(), result);
+
+	QString script = expression.join("\n");
+	script+="\n\n\n";
+	QTextStream stream(&script);
+	a->importScript(&stream);
+	QVERIFY(a->isCorrect());
 }
 
 void AnalitzaTest::testTypeUncorrection()
[prev in list] [next in list] [prev in thread] [next in thread]