Hello community,
here is the log from the commit of package kalgebra for openSUSE:Factory checked in at 2011-11-14 14:00:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kalgebra (Old)
and /work/SRC/openSUSE:Factory/.kalgebra.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kalgebra", Maintainer is "kde-maintainers@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kalgebra/kalgebra.changes 2011-10-06 16:04:51.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kalgebra.new/kalgebra.changes 2011-11-14 14:00:07.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Nov 2 20:18:37 CET 2011 - dmueller@suse.de
+
+- update to 4.7.3
+ * see http://kde.org/announcements/changelogs/changelog4_7_2to4_7_3.php for details
+
+-------------------------------------------------------------------
Old:
----
kalgebra-4.7.2.tar.bz2
New:
----
kalgebra-4.7.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kalgebra.spec ++++++
--- /var/tmp/diff_new_pack.T8VCsH/_old 2011-11-14 14:00:08.000000000 +0100
+++ /var/tmp/diff_new_pack.T8VCsH/_new 2011-11-14 14:00:08.000000000 +0100
@@ -32,7 +32,7 @@
Group: Productivity/Scientific/Math
Summary: Math Expression Solver and Plotter
Url: http://edu.kde.org
-Version: 4.7.2
+Version: 4.7.3
Release: 1
Source0: %{name}-%version.tar.bz2
Patch0: 4_6_BRANCH.diff
++++++ kalgebra-4.7.2.tar.bz2 -> kalgebra-4.7.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.7.2/analitza/CMakeLists.txt new/kalgebra-4.7.3/analitza/CMakeLists.txt
--- old/kalgebra-4.7.2/analitza/CMakeLists.txt 2011-10-02 15:23:42.000000000 +0200
+++ new/kalgebra-4.7.3/analitza/CMakeLists.txt 2011-10-28 09:43:07.000000000 +0200
@@ -62,6 +62,6 @@
DESTINATION ${INCLUDE_INSTALL_DIR}/analitza/ COMPONENT Devel)
install(FILES
- # ../FindAnalitza.cmake
+ ../cmake/FindAnalitza.cmake
DESTINATION ${DATA_INSTALL_DIR}/cmake/modules)
endif(INSTALL_ANALITZA_HEADERS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.7.2/analitza/expressiontype.cpp new/kalgebra-4.7.3/analitza/expressiontype.cpp
--- old/kalgebra-4.7.2/analitza/expressiontype.cpp 2011-10-02 15:23:42.000000000 +0200
+++ new/kalgebra-4.7.3/analitza/expressiontype.cpp 2011-10-28 09:43:07.000000000 +0200
@@ -72,10 +72,12 @@
if(current->canReduceTo(*it)) {
data.insert(it.key(), minimumType(*current, *it));
} else {
+ bool correct=false;
ExpressionType t(Many);
- ExpressionType t1(*it); t1.addAssumption(it.key(), *it);
- ExpressionType t2(*current); t2.addAssumption(it.key(), *current);
+ ExpressionType t1(*it); correct= t1.addAssumption(it.key(), *it);
+ ExpressionType t2(*current); correct|=t2.addAssumption(it.key(), *current);
+ Q_ASSERT(correct);
t.addAlternative(t1);
t.addAlternative(t2);
@@ -210,7 +212,7 @@
return ret;
}
-void ExpressionType::addAssumption(const QString& bvar, const Analitza::ExpressionType& t)
+bool ExpressionType::addAssumption(const QString& bvar, const Analitza::ExpressionType& t)
{
ExpressionType toadd=t;
addAssumptions(t.assumptions());
@@ -221,9 +223,12 @@
m_assumptions.insert(bvar, toadd);
else {
toadd=minimumType(toadd,*it);
- Q_ASSERT(!toadd.isError());
+ if(toadd.isError())
+ return false;
*it=toadd;
}
+
+ return true;
}
void ExpressionType::removeAssumptions(const QStringList& bvarStrings)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.7.2/analitza/expressiontype.h new/kalgebra-4.7.3/analitza/expressiontype.h
--- old/kalgebra-4.7.2/analitza/expressiontype.h 2011-10-02 15:23:42.000000000 +0200
+++ new/kalgebra-4.7.3/analitza/expressiontype.h 2011-10-28 09:43:07.000000000 +0200
@@ -64,7 +64,7 @@
QList<ExpressionType> parameters() const { Q_ASSERT(m_type==Lambda); return m_contained; }
ExpressionType returnValue() const;
- void addAssumption(const QString& bvar, const ExpressionType& t);
+ bool addAssumption(const QString& bvar, const ExpressionType& t);
QMap assumptions() const;
QMap& assumptions();
ExpressionType assumptionFor(const QString& bvar) const { return m_assumptions.value(bvar); }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.7.2/analitza/expressiontypechecker.cpp new/kalgebra-4.7.3/analitza/expressiontypechecker.cpp
--- old/kalgebra-4.7.2/analitza/expressiontypechecker.cpp 2011-10-02 15:23:42.000000000 +0200
+++ new/kalgebra-4.7.3/analitza/expressiontypechecker.cpp 2011-10-28 09:43:07.000000000 +0200
@@ -256,7 +256,8 @@
current=typeForVar(var->name());
} else {
current=ExpressionType(Analitza::ExpressionType::Any, m_stars++);
- current.addAssumption(var->name(), current);
+ bool ret = current.addAssumption(var->name(), current);
+ Q_ASSERT(ret);
if(var->depth()<0 && !isVariableDefined(var->name()) && !m_calculating.contains(var->name()))
m_deps += var->name();
@@ -392,8 +393,9 @@
anyContainer.addAlternative(anyList);
anyContainer.addAlternative(anyVector);
- anyItem.addAssumption(static_cast(c->domain())->name(), anyContainer);
- tt=anyItem;
+ bool ret = anyItem.addAssumption(static_cast(c->domain())->name(), anyContainer);
+ if(ret)
+ tt=anyItem;
} else if(current.type()==ExpressionType::Vector || current.type()==ExpressionType::List) {
tt=current.contained();
tt.addAssumptions(current.assumptions());
@@ -451,6 +453,7 @@
// qDebug() << "OOOOOOOOOOOOOOOOOOOOOOO" << c->toString() << ret /*<< stars*/ << ret.assumptions() << "||||" << t << exps;
ExpressionType ret2(ExpressionType::Many);
+ bool error=false;
foreach(const ExpressionType& type, t) {
ExpressionType returntype(type.parameters().last());
returntype.addAssumptions(type.assumptions());
@@ -460,7 +463,9 @@
if(itf!=returntype.assumptions().constEnd() && itf->type()==ExpressionType::Lambda) {
ExpressionType oldt=ExpressionType::minimumType(*itf, type);
- oldt.addAssumption(name, oldt);
+ error=!oldt.addAssumption(name, oldt);
+ if(error)
+ break;
QMap stars;
stars=ExpressionType::computeStars(stars, type, oldt);
bool b=ExpressionType::matchAssumptions(&stars, oldt.assumptions(), type.assumptions());
@@ -471,9 +476,11 @@
returntype=oldt.parameters().last();
// printAssumptions("reeeeet", returntype);
- returntype.addAssumption(name, oldt);
+ error = !returntype.addAssumption(name, oldt); //can't happen, we already checked it's not an assumption
} else {
- returntype.addAssumption(name, type);
+ error = !returntype.addAssumption(name, type);
+ if(error)
+ break;
}
}
@@ -482,7 +489,11 @@
ret2.addAlternative(returntype);
}
- current=ret2;
+ if(error) {
+// addError(i18n("Cannot call '%1'", c->m_params.first()->toString()));
+ current=ExpressionType(ExpressionType::Error);
+ } else
+ current=ret2;
} else {
ExpressionType ret(ExpressionType::Many), signature(returned);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.7.2/analitza/tests/typechecktest.cpp new/kalgebra-4.7.3/analitza/tests/typechecktest.cpp
--- old/kalgebra-4.7.2/analitza/tests/typechecktest.cpp 2011-10-02 15:23:42.000000000 +0200
+++ new/kalgebra-4.7.3/analitza/tests/typechecktest.cpp 2011-10-28 09:43:07.000000000 +0200
@@ -209,6 +209,7 @@
if(t.isCorrect())
qDebug() << "wrong type:" << result.toString();
QVERIFY(!t.isCorrect());
+// QVERIFY(!t.errors().isEmpty());
}
void TypeCheckTest::testUncorrection_data()
@@ -235,6 +236,10 @@
QTest::newRow("charvsreal") << "union(\"lalala\", list{1,2,3})";
QTest::newRow("boolvsreal") << "or(true, false)+2";
+ QTest::newRow("argscount") << "f:=(x,y)->f(x)";
+
+ QTest::newRow("twoargs") << "(x->x(3))((x,y)->x+y)";
+ QTest::newRow("times") << "x(x+1)";
//TODO: Add invalid recursive call
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.7.2/analitzagui/CMakeLists.txt new/kalgebra-4.7.3/analitzagui/CMakeLists.txt
--- old/kalgebra-4.7.2/analitzagui/CMakeLists.txt 2011-10-02 15:23:42.000000000 +0200
+++ new/kalgebra-4.7.3/analitzagui/CMakeLists.txt 2011-10-28 09:43:07.000000000 +0200
@@ -41,6 +41,7 @@
algebrahighlighter.h
analitzaguiexport.h
operatorsmodel.h
+ variablesmodel.h
DESTINATION ${INCLUDE_INSTALL_DIR}/analitzagui/ COMPONENT Devel)
endif(INSTALL_ANALITZA_HEADERS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.7.2/analitzagui/expressionedit.cpp new/kalgebra-4.7.3/analitzagui/expressionedit.cpp
--- old/kalgebra-4.7.2/analitzagui/expressionedit.cpp 2011-10-02 15:23:42.000000000 +0200
+++ new/kalgebra-4.7.3/analitzagui/expressionedit.cpp 2011-10-28 09:43:07.000000000 +0200
@@ -49,6 +49,7 @@
QPalette p=palette();
p.setColor(backgroundRole(), p.color(QPalette::Active, QPalette::ToolTipBase));
+ p.setColor(foregroundRole(), p.color(QPalette::Active, QPalette::ToolTipText));
setPalette(p);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.7.2/cmake/FindAnalitza.cmake new/kalgebra-4.7.3/cmake/FindAnalitza.cmake
--- old/kalgebra-4.7.2/cmake/FindAnalitza.cmake 1970-01-01 01:00:00.000000000 +0100
+++ new/kalgebra-4.7.3/cmake/FindAnalitza.cmake 2011-10-28 09:43:07.000000000 +0200
@@ -0,0 +1,27 @@
+# Find libanalitza
+# Once done this will define
+#
+# ANALITZA_FOUND - system has Analitza Library
+# ANALITZA_INCLUDES - the Analitza include directory
+# ANALITZA_LIBS - link these to use Analitza
+# ANALITZA_VERSION - the version of the Analitza Library
+
+# Copyright (c) 2011, Aleix Pol Gonzalez
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+find_library(ANALITZA_LIBRARY NAMES analitza HINTS ${KDE4_LIB_INSTALL_DIR} ${QT_LIBRARY_DIR})
+find_library(ANALITZAGUI_LIBRARY NAMES analitzagui HINTS ${KDE4_LIB_INSTALL_DIR} ${QT_LIBRARY_DIR})
+
+find_path(ANALITZA_INCLUDE_DIR NAMES analitza/analitzaexport.h HINTS ${KDE4_INCLUDE_INSTALL_DIR} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR})
+
+if(ANALITZA_INCLUDE_DIR AND ANALITZA_LIBRARY)
+ set(ANALITZA_LIBS ${analitza_LIB_DEPENDS} ${ANALITZA_LIBRARY} ${ANALITZAGUI_LIBRARY})
+ set(ANALITZA_INCLUDES ${ANALITZA_INCLUDE_DIR}/KDE ${ANALITZA_INCLUDE_DIR})
+endif(ANALITZA_INCLUDE_DIR AND ANALITZA_LIBRARY)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Analitza DEFAULT_MSG ANALITZA_INCLUDE_DIR ANALITZA_LIBRARY)
+
+mark_as_advanced(ANALITZA_INCLUDE_DIR ANALITZA_LIBRARY)
Files old/kalgebra-4.7.2/doc/index.cache.bz2 and new/kalgebra-4.7.3/doc/index.cache.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.7.2/kalgebra.kdev4 new/kalgebra-4.7.3/kalgebra.kdev4
--- old/kalgebra-4.7.2/kalgebra.kdev4 1970-01-01 01:00:00.000000000 +0100
+++ new/kalgebra-4.7.3/kalgebra.kdev4 2011-10-28 09:43:07.000000000 +0200
@@ -0,0 +1,3 @@
+[Project]
+Manager=KDevCMakeManager
+Name=kalgebra
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalgebra-4.7.2/plasmoid/kalgebraplasmoid.desktop new/kalgebra-4.7.3/plasmoid/kalgebraplasmoid.desktop
--- old/kalgebra-4.7.2/plasmoid/kalgebraplasmoid.desktop 2011-10-02 15:23:42.000000000 +0200
+++ new/kalgebra-4.7.3/plasmoid/kalgebraplasmoid.desktop 2011-10-28 09:43:07.000000000 +0200
@@ -97,6 +97,7 @@
Comment[sl]=Računalo
Comment[sv]=Kalkylator
Comment[tr]=Bir Hesap Makinesi
+Comment[ug]=ھېسابلىغۇچ
Comment[uk]=Калькулятор
Comment[x-test]=xxA Calculatorxx
Comment[zh_CN]=一个计算器
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org