Hello community,
here is the log from the commit of package gle-graphics for openSUSE:Factory
checked in at 2015-01-20 12:31:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gle-graphics (Old)
and /work/SRC/openSUSE:Factory/.gle-graphics.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gle-graphics"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gle-graphics/gle-graphics.changes
2013-10-02 14:49:03.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.gle-graphics.new/gle-graphics.changes
2015-01-20 12:32:15.000000000 +0100
@@ -1,0 +2,8 @@
+Mon Jan 12 09:47:33 UTC 2015 - mvysko...@opensuse.org
+
+- Update to 4.2.3c, bugfix release
+ * see ChangeLog.txt for more details
+- obsoleted gle-graphics-gcc47.patch, already upstream
+- obsoleted overflow.patch, already upstream
+
+-------------------------------------------------------------------
Old:
----
gle-graphics-4.2.4bf-src.tar.gz
gle-graphics-gcc47.patch
overflow.patch
New:
----
gle-graphics-4.2.4cf-src.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gle-graphics.spec ++++++
--- /var/tmp/diff_new_pack.XAHigM/_old 2015-01-20 12:32:17.000000000 +0100
+++ /var/tmp/diff_new_pack.XAHigM/_new 2015-01-20 12:32:17.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package gle-graphics
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: gle-graphics
-Version: 4.2.4b
+Version: 4.2.4c
Release: 0
Summary: GLE is a graphics scripting language
License: BSD-3-Clause
@@ -34,9 +34,6 @@
Source1000: gle-graphics-rpmlintrc
# PATCH-UPSTREAM: needs for build with gcc4.4 - was sent to upstream
Patch0: gle-graphics-gcc44.patch
-# PATCH-FIX-UPSTREAM gle-graphics-gcc47.patch zai...@opensuse.org -- Fix build
for gcc4.7
-Patch1: gle-graphics-gcc47.patch
-Patch2: overflow.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: c++_compiler
@@ -122,8 +119,6 @@
%setup -q
%patch0 -b .gcc44
-%patch1 -b .gcc47
-%patch2 -b .overflow
cp %{SOURCE3} .
++++++ gle-graphics-4.2.4bf-src.tar.gz -> gle-graphics-4.2.4cf-src.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gle-graphics-4.2.4b/ChangeLog.txt
new/gle-graphics-4.2.4c/ChangeLog.txt
--- old/gle-graphics-4.2.4b/ChangeLog.txt 2012-01-14 14:49:17.000000000
+0100
+++ new/gle-graphics-4.2.4c/ChangeLog.txt 2012-03-08 23:55:01.000000000
+0100
@@ -1,3 +1,24 @@
+4.2.4c (March, 2012)
+
+Bug Fixes
+
+ Added checks on number of data sets, bar definitions, and fill definitions
(QGLE crash reports 02/07/2012 and 02/16/2012)
+ Save .glerc in user's AppData on Windows
+ Added manifest to prevent AUC Virtualization on Windows Vista and above
+ Search "C:\Program Files (x86)" on 64 bit Windows for installed software
+ Fixed type in manual: logfit -> logefit
+ Fixed bug in tokenizer
+ Fixed crash when parsing "let d1 = x.x" (QGLE crash report 02/28/2012)
+ Fix for message "QWidget::setWindowModified: The window title does not
contain a '[*]' placeholder"
+ Fixed bug in centering of .inc output (reported by Antonio DiCesare)
+ Bug 3485409: GLE should check for Cairo version >= 1.10.0
+ Added Python script to generate GLE palette functions (contributed by
Brandon Aubie)
+ Fixed "too many open files" when including bitmaps in filled boxes
(reported by Alexis Letessier)
+ Fixed issue with filled boxes (reported by Alexis Letessier)
+ Make GLE compile with GCC 4.7.x (issue raised by Terje R�sten)
+ Support other 64bit systems besides x86
+ Fixed more GLU problems introduced in Qt4.8
+
4.2.4b (January, 2012)
Bug Fixes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gle-graphics-4.2.4b/README.txt
new/gle-graphics-4.2.4c/README.txt
--- old/gle-graphics-4.2.4b/README.txt 2012-02-08 17:15:01.000000000 +0100
+++ new/gle-graphics-4.2.4c/README.txt 2010-06-14 17:34:39.000000000 +0200
@@ -19,7 +19,7 @@
4.3 Compiling on OS/2 (with GCC 3.2.1)
4.4 Notes for all platforms
5. Source code organization
-6. License (BSD, qgle: GPL-2.0)
+6. License (BSD)
1. What is GLE?
---------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gle-graphics-4.2.4b/config.i
new/gle-graphics-4.2.4c/config.i
--- old/gle-graphics-4.2.4b/config.i 2012-01-14 14:49:17.000000000 +0100
+++ new/gle-graphics-4.2.4c/config.i 2012-03-08 23:55:01.000000000 +0100
@@ -45,7 +45,7 @@
BASE_NAME =GLE
MAJOR_VERSION_NUMBER =4
MINOR_VERSION_NUMBER =2
-BUILD_NUMBER =4b
+BUILD_NUMBER =4c
VERSION_NUMBER =$(MAJOR_VERSION_NUMBER).$(MINOR_VERSION_NUMBER)
VERSION_INFO =-DGLEVN="\"$(VERSION_NUMBER).$(BUILD_NUMBER)\""
TAG
=$(MODULE_NAME)_R_$(MAJOR_VERSION_NUMBER)_$(MINOR_VERSION_NUMBER)_$(BUILD_NUMBER)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gle-graphics-4.2.4b/configure
new/gle-graphics-4.2.4c/configure
--- old/gle-graphics-4.2.4b/configure 2012-01-14 15:03:44.000000000 +0100
+++ new/gle-graphics-4.2.4c/configure 2012-03-08 23:55:23.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for gle-graphics 4.2.4b.
+# Generated by GNU Autoconf 2.68 for gle-graphics 4.2.4c.
#
# Report bugs to <glx-gene...@lists.sourceforge.net>.
#
@@ -560,8 +560,8 @@
# Identity of this package.
PACKAGE_NAME='gle-graphics'
PACKAGE_TARNAME='gle-graphics'
-PACKAGE_VERSION='4.2.4b'
-PACKAGE_STRING='gle-graphics 4.2.4b'
+PACKAGE_VERSION='4.2.4c'
+PACKAGE_STRING='gle-graphics 4.2.4c'
PACKAGE_BUGREPORT='glx-gene...@lists.sourceforge.net'
PACKAGE_URL=''
@@ -605,6 +605,8 @@
ac_subst_vars='LTLIBOBJS
LIBOBJS
HAVE_EXTRA_FONTS
+QT_LDFLAGS
+QT_CPPFLAGS
QT_LIBGLU_LIB
QT_RPATH
QT_CONFIG
@@ -1299,7 +1301,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures gle-graphics 4.2.4b to adapt to many kinds of systems.
+\`configure' configures gle-graphics 4.2.4c to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1368,7 +1370,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of gle-graphics 4.2.4b:";;
+ short | recursive ) echo "Configuration of gle-graphics 4.2.4c:";;
esac
cat <<\_ACEOF
@@ -1489,7 +1491,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-gle-graphics configure 4.2.4b
+gle-graphics configure 4.2.4c
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1844,7 +1846,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by gle-graphics $as_me 4.2.4b, which was
+It was created by gle-graphics $as_me 4.2.4c, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2196,7 +2198,7 @@
-GLE_VERSION=4.2.4b
+GLE_VERSION=4.2.4c
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
@@ -2941,6 +2943,10 @@
GLE_SNAPSHOT=""
+QT_CPPFLAGS=$CPPFLAGS
+QT_LDFLAGS=$LDFLAGS
+
+
ac_aux_dir=
for ac_dir in platform/autoconf "$srcdir"/platform/autoconf; do
if test -f "$ac_dir/install-sh"; then
@@ -4880,12 +4886,12 @@
pkg_cv_cairo_CFLAGS="$cairo_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"cairo >= 1.2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "cairo >= 1.2.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"cairo >= 1.10.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "cairo >= 1.10.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_cairo_CFLAGS=`$PKG_CONFIG --cflags "cairo >= 1.2.0" 2>/dev/null`
+ pkg_cv_cairo_CFLAGS=`$PKG_CONFIG --cflags "cairo >= 1.10.0" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -4896,12 +4902,12 @@
pkg_cv_cairo_LIBS="$cairo_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"cairo >= 1.2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "cairo >= 1.2.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"cairo >= 1.10.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "cairo >= 1.10.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_cairo_LIBS=`$PKG_CONFIG --libs "cairo >= 1.2.0" 2>/dev/null`
+ pkg_cv_cairo_LIBS=`$PKG_CONFIG --libs "cairo >= 1.10.0" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -4921,9 +4927,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- cairo_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
"cairo >= 1.2.0" 2>&1`
+ cairo_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
"cairo >= 1.10.0" 2>&1`
else
- cairo_PKG_ERRORS=`$PKG_CONFIG --print-errors "cairo >= 1.2.0"
2>&1`
+ cairo_PKG_ERRORS=`$PKG_CONFIG --print-errors "cairo >= 1.10.0"
2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$cairo_PKG_ERRORS" >&5
@@ -5635,6 +5641,8 @@
+
+
ac_config_files="$ac_config_files Makefile src/gle/Makefile
src/gle/bitmap/Makefile src/gle/letzfitz/Makefile src/gle/surface/Makefile
src/gle/tokens/Makefile src/fbuild/Makefile src/makefmt/Makefile
src/manip/Makefile src/TeX/Makefile src/gui/MakefileAC src/gui/qgle.pro
src/doc/gle.1 platform/autoconf/gle-graphics.pc
platform/autopackage/gle4.apspec"
cat >confcache <<\_ACEOF
@@ -6156,7 +6164,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by gle-graphics $as_me 4.2.4b, which was
+This file was extended by gle-graphics $as_me 4.2.4c, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6218,7 +6226,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-gle-graphics config.status 4.2.4b
+gle-graphics config.status 4.2.4c
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gle-graphics-4.2.4b/configure.ac
new/gle-graphics-4.2.4c/configure.ac
--- old/gle-graphics-4.2.4b/configure.ac 2012-01-14 15:03:38.000000000
+0100
+++ new/gle-graphics-4.2.4c/configure.ac 2012-03-08 23:55:01.000000000
+0100
@@ -36,7 +36,7 @@
# #
########################################################################
-m4_define([gle_cr_version], [4.2.4b])
+m4_define([gle_cr_version], [4.2.4c])
AC_INIT(gle-graphics, [gle_cr_version], glx-gene...@lists.sourceforge.net)
AC_CONFIG_HEADER(src/config.h)
@@ -139,6 +139,13 @@
GLE_SNAPSHOT=""
dnl
********************************************************************************
+dnl remember CPPFLAGS for qmake
+dnl
********************************************************************************
+
+QT_CPPFLAGS=$CPPFLAGS
+QT_LDFLAGS=$LDFLAGS
+
+dnl
********************************************************************************
dnl check CPU type and OS
dnl
********************************************************************************
@@ -540,7 +547,7 @@
dnl
********************************************************************************
if test "x$with_cairo" != "xno"; then
- PKG_CHECK_MODULES([cairo], [cairo >= 1.2.0],
+ PKG_CHECK_MODULES([cairo], [cairo >= 1.10.0],
[
HAVE_CAIRO=1
AC_MSG_RESULT([ cairo CFLAGS: $cairo_CFLAGS])
@@ -886,6 +893,8 @@
AC_SUBST(QT_CONFIG)
AC_SUBST(QT_RPATH)
AC_SUBST(QT_LIBGLU_LIB)
+AC_SUBST(QT_CPPFLAGS)
+AC_SUBST(QT_LDFLAGS)
AC_SUBST(HAVE_EXTRA_FONTS)
AC_CONFIG_FILES([Makefile src/gle/Makefile src/gle/bitmap/Makefile
src/gle/letzfitz/Makefile src/gle/surface/Makefile src/gle/tokens/Makefile
src/fbuild/Makefile src/makefmt/Makefile src/manip/Makefile src/TeX/Makefile
src/gui/MakefileAC src/gui/qgle.pro src/doc/gle.1
platform/autoconf/gle-graphics.pc platform/autopackage/gle4.apspec])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gle-graphics-4.2.4b/contrib/packagers/nsis/gle.nsi
new/gle-graphics-4.2.4c/contrib/packagers/nsis/gle.nsi
--- old/gle-graphics-4.2.4b/contrib/packagers/nsis/gle.nsi 2011-11-09
22:47:28.000000000 +0100
+++ new/gle-graphics-4.2.4c/contrib/packagers/nsis/gle.nsi 2012-03-08
23:55:01.000000000 +0100
@@ -113,6 +113,8 @@
GLENotExists:
SetOutPath "$INSTDIR\bin"
SetOverwrite try
+ File "gle.exe.manifest"
+ File /oname=qgle.exe.manifest "gle.exe.manifest"
File "..\..\..\build\bin\*.*"
File "C:\cygwin\mingw\bin\mingwm10.dll"
File "C:\cygwin\mingw\bin\libgcc_s_dw2-1.dll"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gle-graphics-4.2.4b/gle-refman/graph/graph.tex
new/gle-graphics-4.2.4c/gle-refman/graph/graph.tex
--- old/gle-graphics-4.2.4b/gle-refman/graph/graph.tex 2011-11-22
22:28:37.000000000 +0100
+++ new/gle-graphics-4.2.4c/gle-refman/graph/graph.tex 2012-03-05
23:13:11.000000000 +0100
@@ -628,7 +628,7 @@
The following routines are available :
\begin{itemize}
\item \texttt{linfit}\index{linfit}: fits the data in \textit{dm} to the
straight line equation $y = m \cdot x + b$.
-\item \texttt{logfit}\index{logfit}: fits the data in \textit{dm} to the
equation $y = a \cdot \exp(b \cdot x)$.
+\item \texttt{logefit}\index{logefit}: fits the data in \textit{dm} to the
equation $y = a \cdot \exp(b \cdot x)$.
\item \texttt{log10fit}\index{log10fit}: fits the data in \textit{dm} to the
equation $y = a \cdot 10^{b \cdot x}$.
\item \texttt{powxfit}\index{powxfit}: fits the data in \textit{dm} to the
equation $y = a \cdot x^b$.
\end{itemize}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gle-graphics-4.2.4b/src/gle/bitmap/img2ps.cpp
new/gle-graphics-4.2.4c/src/gle/bitmap/img2ps.cpp
--- old/gle-graphics-4.2.4b/src/gle/bitmap/img2ps.cpp 2011-11-09
22:55:39.000000000 +0100
+++ new/gle-graphics-4.2.4c/src/gle/bitmap/img2ps.cpp 2012-02-19
22:07:34.000000000 +0100
@@ -262,6 +262,10 @@
m_Palette = NULL;
}
+GLEFileBitmap::~GLEFileBitmap() {
+ close();
+}
+
int GLEFileBitmap::open(const string& fname) {
setFName(fname);
m_In = fopen(fname.c_str(), "rb");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gle-graphics-4.2.4b/src/gle/bitmap/img2ps.h
new/gle-graphics-4.2.4c/src/gle/bitmap/img2ps.h
--- old/gle-graphics-4.2.4b/src/gle/bitmap/img2ps.h 2011-10-26
23:10:54.000000000 +0200
+++ new/gle-graphics-4.2.4c/src/gle/bitmap/img2ps.h 2012-02-19
22:07:34.000000000 +0100
@@ -157,6 +157,7 @@
FILE* m_In;
public:
GLEFileBitmap();
+ virtual ~GLEFileBitmap();
virtual int open(const string& fname);
virtual void close();
int read16BE();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gle-graphics-4.2.4b/src/gle/config.cpp
new/gle-graphics-4.2.4c/src/gle/config.cpp
--- old/gle-graphics-4.2.4b/src/gle/config.cpp 2010-08-29 22:23:30.000000000
+0200
+++ new/gle-graphics-4.2.4c/src/gle/config.cpp 2012-03-08 23:55:01.000000000
+0100
@@ -259,15 +259,24 @@
}
}
-bool try_save_config(const string& fname, GLEInterface* iface) {
+bool try_save_config(const string& fname, GLEInterface* iface, bool isUser) {
ConfigCollection* collection = iface->getConfig()->getRCFile();
if (collection->allDefaults()) {
return true;
}
+ if (fname == "") {
+ return false;
+ }
+ if (IsAbsPath(fname)) {
+ std::string dirname;
+ GetDirName(fname, dirname);
+ EnsureMkDir(dirname);
+ }
ofstream fout(fname.c_str());
if (!fout.is_open()) {
return false;
}
+ CmdLineOption* versionOption =
collection->getSection(GLE_CONFIG_GLE)->getOption(GLE_CONFIG_GLE_VERSION);
ostringstream out;
out << "Save configuration to: '" << fname << "'";
GLEOutputStream* output = iface->getOutput();
@@ -278,7 +287,7 @@
fout << "begin config " << sec->getName() << endl;
for (int j = 0; j < sec->getNbOptions(); j++) {
CmdLineOption* option = sec->getOption(j);
- if (!option->allDefaults()) {
+ if (!option->allDefaults() && (!isUser ||
option != versionOption)) {
fout << "\t" << option->getName() << "
= ";
for (int k = 0; k <
option->getMaxNbArgs(); k++) {
if (k != 0) fout << " ";
@@ -660,7 +669,7 @@
string myloc = loc;
#ifdef __WIN32__
if (myloc.length() == 0) {
- myloc = "C:\\Program Files";
+ GLEGetEnv("ProgramFiles", myloc);
}
#endif
find_deps(myloc, iface);
@@ -669,10 +678,10 @@
void do_save_config() {
GLEInterface* iface = GLEGetInterfacePointer();
string conf_name = GLE_TOP_DIR + DIR_SEP + "glerc";
- bool is_ok = try_save_config(conf_name, iface);
+ bool is_ok = try_save_config(conf_name, iface, false);
if (!is_ok) {
string user_conf = iface->getUserConfigLocation();
- is_ok = try_save_config(user_conf, iface);
+ is_ok = try_save_config(user_conf, iface, true);
}
if (!is_ok) {
ostringstream err;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gle-graphics-4.2.4b/src/gle/core.cpp
new/gle-graphics-4.2.4c/src/gle/core.cpp
--- old/gle-graphics-4.2.4b/src/gle/core.cpp 2011-12-31 15:16:24.000000000
+0100
+++ new/gle-graphics-4.2.4c/src/gle/core.cpp 2012-02-26 14:53:54.000000000
+0100
@@ -2255,6 +2255,7 @@
g_throw_parser_error("can't open bitmap file: '",
fname.c_str(), "'");
}
g_bitmap(bitmap, wx, wy, type);
+ bitmap->close();
delete bitmap;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gle-graphics-4.2.4b/src/gle/eval.cpp
new/gle-graphics-4.2.4c/src/gle/eval.cpp
--- old/gle-graphics-4.2.4b/src/gle/eval.cpp 2011-11-23 23:30:23.000000000
+0100
+++ new/gle-graphics-4.2.4c/src/gle/eval.cpp 2012-03-04 23:42:40.000000000
+0100
@@ -278,6 +278,9 @@
stk[nstk-1] = (int)stk[nstk-1] % (int)stk[nstk];
nstk--;
break;
+ case 25: /* . */
+ g_throw_parser_error("operator '.' does not apply to a
numeric type");
+ break;
/* String Binary operators 30..49 ----------------------- */
case 31: /* + */
*otyp = 2;
@@ -296,38 +299,55 @@
}
break;
case 32: /* - */
+ g_throw_parser_error("operator '-' does not apply to a
string type");
break;
case 33: /* * */
+ g_throw_parser_error("operator '*' does not apply to a
string type");
break;
case 34: /* / */
+ g_throw_parser_error("operator '/' does not apply to a
string type");
break;
case 35: /* ^ */
+ g_throw_parser_error("operator '^' does not apply to a
string type");
break;
case 36: /* = */
*otyp = 1;
nstk--;
- if (str_i_equals(stk_str[nstk],stk_str[nstk+1]))
- stk[nstk]=true;
- else
- stk[nstk]=false;
+ stk[nstk] = str_i_equals(stk_str[nstk],
stk_str[nstk+1]);
break;
case 37: /* < */
+ *otyp = 1;
+ nstk--;
+ stk[nstk] = str_i_cmp(stk_str[nstk], stk_str[nstk+1]) <
0;
break;
case 38: /* <= */
+ *otyp = 1;
+ nstk--;
+ stk[nstk] = str_i_cmp(stk_str[nstk], stk_str[nstk+1])
<= 0;
break;
case 39: /* > */
+ *otyp = 1;
+ nstk--;
+ stk[nstk] = str_i_cmp(stk_str[nstk], stk_str[nstk+1]) >
0;
break;
case 40: /* >= */
+ *otyp = 1;
+ nstk--;
+ stk[nstk] = str_i_cmp(stk_str[nstk], stk_str[nstk+1])
>= 0;
break;
case 41: /* <> */
*otyp = 1;
nstk--;
- if (str_i_equals(stk_str[nstk],stk_str[nstk+1]))
- stk[nstk]=false;
- else
- stk[nstk]=true;
+ stk[nstk] = !str_i_equals(stk_str[nstk],
stk_str[nstk+1]);
+ break;
+ case 42: /* .AND. */
+ g_throw_parser_error("operator 'AND' does not apply to
a string type");
+ break;
+ case 43: /* .OR. */
+ g_throw_parser_error("operator 'OR' does not apply to a
string type");
break;
- case 42: /* .OR. */
+ case 44: /* % */
+ g_throw_parser_error("operator '%' does not apply to a
string type");
break;
case 45: /* . */
*otyp = 2;
@@ -867,7 +887,7 @@
*/
getGLERunInstance()->sub_call(*(pcode+c)-LOCAL_START_INDEX,stk,stk_str,&nstk,otyp);
} else {
- gprint("Unrecognised pcode exp prim %d at
position=%d \n",*(pcode+c),c);
+ g_throw_parser_error("unrecognized byte code
expression");
}
break;
}
@@ -939,7 +959,7 @@
}
if (pcode[(*cp)] == 8) {
/* Single constant */
- union {double d; int l[1];} both;
+ union {double d; int l[2];} both;
both.l[0] = *(pcode+ ++(*cp));
both.l[1] = 0;
dbg gprint("Constant %ld \n",both.l[0]);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gle-graphics-4.2.4b/src/gle/gle-interface/gle-base.h
new/gle-graphics-4.2.4c/src/gle/gle-interface/gle-base.h
--- old/gle-graphics-4.2.4b/src/gle/gle-interface/gle-base.h 2011-05-15
12:14:01.000000000 +0200
+++ new/gle-graphics-4.2.4c/src/gle/gle-interface/gle-base.h 2012-02-19
22:07:34.000000000 +0100
@@ -130,7 +130,7 @@
template <class T> class GLERCVector : public vector< GLERC<T> > {
public:
- inline void add(T* elem) { push_back(GLERC<T>(elem)); }
+ inline void add(T* elem) { this->push_back(GLERC<T>(elem)); }
inline T* get(int i) { return (*this)[i].get(); }
};
@@ -139,15 +139,15 @@
GLEVectorAutoDelete() : vector<T*>() {
}
~GLEVectorAutoDelete() {
- deleteAll();
+ this->deleteAll();
}
void clear() {
- deleteAll();
+ this->deleteAll();
vector<T*>::clear();
}
void deleteAll() {
for (typename vector<T*>::size_type i = 0; i <
vector<T*>::size(); i++) {
- T* elem = at(i);
+ T* elem = this->at(i);
if (elem != NULL) delete elem;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gle-graphics-4.2.4b/src/gle/gle-interface.cpp
new/gle-graphics-4.2.4c/src/gle/gle-interface.cpp
--- old/gle-graphics-4.2.4b/src/gle/gle-interface.cpp 2011-12-31
15:22:58.000000000 +0100
+++ new/gle-graphics-4.2.4c/src/gle/gle-interface.cpp 2012-03-08
23:55:01.000000000 +0100
@@ -632,16 +632,22 @@
}
string GLEInterface::getUserConfigLocation() {
+ string location;
#if defined(__UNIX__) || defined (__OS2__)
- const char* home = getenv("HOME");
- if (home != NULL && home[0] != 0) {
- string home_str(home);
- AddDirSep(home_str);
- home_str += ".glerc";
- return home_str;
+ GLEGetEnv("HOME", location);
+ #endif
+ #ifdef __WIN32__
+ GLEGetEnv("APPDATA", location);
+ if (location != "") {
+ AddDirSep(location);
+ location += "gle-graphics.org";
}
#endif
- return string("");
+ if (location != "") {
+ AddDirSep(location);
+ location += ".glerc";
+ }
+ return location;
}
string GLEInterface::getManualLocation() {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gle-graphics-4.2.4b/src/gle/graph.cpp
new/gle-graphics-4.2.4c/src/gle/graph.cpp
--- old/gle-graphics-4.2.4b/src/gle/graph.cpp 2012-01-01 23:05:56.000000000
+0100
+++ new/gle-graphics-4.2.4c/src/gle/graph.cpp 2012-03-08 23:55:01.000000000
+0100
@@ -560,6 +560,9 @@
3dbar .5 .5 top black,black,black side red,green,blue notop */
int ng = 0,fi;
char *ss;
+ if (g_nbar + 1 >= MAX_NB_BAR) {
+ g_throw_parser_error("too many bar commands in graph block");
+ }
g_nbar++;
br[g_nbar] = new bar_struct();
br[g_nbar]->ngrp = 0;
@@ -650,6 +653,9 @@
/* fill d1,d2 color green xmin 1 xmax 2 ymin 1 ymax 2 */
/* fill d1 color green xmin 1 xmax 2 ymin 1 ymax 2 */
void do_fill(int& ct, GLEGraphBlockInstance* graphBlock) {
+ if (nfd + 1 >= MAX_NB_FILL) {
+ g_throw_parser_error("too many fill commands in graph block");
+ }
fd[++nfd] = new fill_data();
GLEGraphDataSetOrder* order = graphBlock->getData()->getOrder();
GLEClassDefinition* classDef =
graphBlock->getGraphBlockBase()->getClassDefinitions()->getFill();
@@ -1986,6 +1992,9 @@
}
void createDataSet(int dn) {
+ if (dn < 0 || dn >= MAX_NB_DATA) {
+ g_throw_parser_error("too many data sets");
+ }
if (dn > ndata) ndata = dn;
if (dp[dn] == NULL) {
dp[dn] = new GLEDataSet(dn);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gle-graphics-4.2.4b/src/gle/graph.h
new/gle-graphics-4.2.4c/src/gle/graph.h
--- old/gle-graphics-4.2.4b/src/gle/graph.h 2012-01-01 23:05:56.000000000
+0100
+++ new/gle-graphics-4.2.4c/src/gle/graph.h 2012-03-08 23:55:01.000000000
+0100
@@ -511,7 +511,8 @@
#define GRAPHDEF
#endif
-#define MAX_NB_FILL 20
+#define MAX_NB_FILL 100
+#define MAX_NB_BAR 100
GRAPHDEF double graph_x1,graph_y1,graph_x2,graph_y2; /* in cm */
GRAPHDEF double graph_xmin,graph_ymin,graph_xmax,graph_ymax; /* graph units */
@@ -533,7 +534,7 @@
GRAPHDEF GLEDataSet *dp[MAX_NB_DATA];
-GRAPHDEF bar_struct *br[20];
+GRAPHDEF bar_struct *br[MAX_NB_BAR];
void vinit_axis(int i);
void vinit_title_axis();
void draw_bar(double x, double yf, double yt, double wd, bar_struct* barset,
int di, GLEDataSet* toDataSet) throw(ParserError);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gle-graphics-4.2.4b/src/gle/graph2.cpp
new/gle-graphics-4.2.4c/src/gle/graph2.cpp
--- old/gle-graphics-4.2.4b/src/gle/graph2.cpp 2011-10-26 23:10:54.000000000
+0200
+++ new/gle-graphics-4.2.4c/src/gle/graph2.cpp 2012-03-05 23:04:49.000000000
+0100
@@ -646,7 +646,7 @@
}
double *xt = data1->getX();
double *yt = data1->getY();
- double x2, y2;
+ double x2 = 0.0, y2 = 0.0;
double ymx = ff->ymax;
switch(ff->type) {
case 1: /* x1,d1 */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gle-graphics-4.2.4b/src/gle/run.cpp
new/gle-graphics-4.2.4c/src/gle/run.cpp
--- old/gle-graphics-4.2.4b/src/gle/run.cpp 2011-12-29 14:38:22.000000000
+0100
+++ new/gle-graphics-4.2.4c/src/gle/run.cpp 2012-02-19 22:07:34.000000000
+0100
@@ -88,17 +88,8 @@
// void begin_fitls(int *pln, int *pcode, int *cp) throw(ParserError);
class GLEBox {
-protected:
- const char* m_Name; // Should be replaced by string* later on
- bool m_HasStroke;
- bool m_HasReverse;
- double m_Add;
- bool m_IsRound;
- double m_Round;
- GLERC<GLEColor> m_Fill;
public:
GLEBox();
- GLEBox(const GLEBox& box);
void setFill(const GLERC<GLEColor>& fill);
void setRound(double round);
void draw(GLERun* run, double x1, double y1, double x2, double y2);
@@ -115,21 +106,19 @@
inline const char* getName() const { return m_Name; }
inline void setAdd(double add) { m_Add = add; }
inline double getAdd() const { return m_Add; }
+protected:
+ const char* m_Name; // Should be replaced by string* later on
+ bool m_HasStroke;
+ bool m_HasReverse;
+ double m_Add;
+ bool m_IsRound;
+ double m_Round;
+ GLERC<GLEColor> m_Fill;
};
class GLEStoredBox : public GLEBox {
public:
- GLERectangle m_SaveBounds;
- GLEPoint m_Orig;
-protected:
- string m_Name;
- bool m_HasName;
- bool m_SecondPass;
- GLEDevice* m_Device;
- GLERC<GLEObjectRepresention> m_Object;
-public:
GLEStoredBox();
- GLEStoredBox(const GLEStoredBox& box);
void setName(const char* name);
inline bool hasName() const { return m_HasName; }
inline const string& getName() const { return m_Name; }
@@ -143,6 +132,14 @@
inline GLERectangle* getSaveBounds() { return &m_SaveBounds; }
void setOrigin(double x0, double y0) { m_Orig.setXY(x0, y0); }
const GLEPoint& getOrigin() { return m_Orig; }
+private:
+ GLERectangle m_SaveBounds;
+ GLEPoint m_Orig;
+ string m_Name;
+ bool m_HasName;
+ bool m_SecondPass;
+ GLEDevice* m_Device;
+ GLERC<GLEObjectRepresention> m_Object;
};
class GLEBoxStack {
@@ -1692,21 +1689,11 @@
m_HasReverse(false),
m_Add(0.0),
m_IsRound(false),
+ m_Round(0.0),
m_Fill(g_get_fill_clear())
{
}
-GLEBox::GLEBox(const GLEBox& box):
- m_Name(box.getName()),
- m_HasStroke(box.hasStroke()),
- m_HasReverse(box.hasReverse()),
- m_Add(box.getAdd()),
- m_IsRound(box.isRound()),
- m_Round(box.getRound()),
- m_Fill(box.getFill())
-{
-}
-
void GLEBox::setFill(const GLERC<GLEColor>& fill) {
m_Fill = fill;
}
@@ -1773,14 +1760,11 @@
g_move(ox, oy);
}
-GLEStoredBox::GLEStoredBox() : GLEBox() {
- m_SecondPass = false; m_HasName = false;
- m_Device = NULL;
-}
-
-GLEStoredBox::GLEStoredBox(const GLEStoredBox& box) : GLEBox(box),
m_SaveBounds(box.m_SaveBounds), m_Object(box.getObjectRep()) {
- m_SecondPass = box.m_SecondPass; m_Device = box.m_Device;
- m_HasName = box.hasName(); m_Name = box.getName();
+GLEStoredBox::GLEStoredBox():
+ m_HasName(false),
+ m_SecondPass(false),
+ m_Device(0)
+{
}
void GLEStoredBox::setName(const char* name) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gle-graphics-4.2.4b/src/gle/texinterface.cpp
new/gle-graphics-4.2.4c/src/gle/texinterface.cpp
--- old/gle-graphics-4.2.4b/src/gle/texinterface.cpp 2011-12-27
14:54:37.000000000 +0100
+++ new/gle-graphics-4.2.4c/src/gle/texinterface.cpp 2012-02-19
22:07:34.000000000 +0100
@@ -439,7 +439,7 @@
TeXObject* obj = m_TeXObjects[i];
obj->output(out);
}
- out << "\\end{picture}" << endl;
+ out << "\\end{picture}%" << endl;
}
void TeXInterface::createInc(const string& prefix) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gle-graphics-4.2.4b/src/gle/tokens/RefCount.h
new/gle-graphics-4.2.4c/src/gle/tokens/RefCount.h
--- old/gle-graphics-4.2.4b/src/gle/tokens/RefCount.h 2010-06-14
17:34:39.000000000 +0200
+++ new/gle-graphics-4.2.4c/src/gle/tokens/RefCount.h 2012-02-19
22:07:34.000000000 +0100
@@ -125,7 +125,8 @@
template <class T> class MutableRefCountPtr : public RefCountPtr<T> {
public:
inline RefCountPtr<T>& operator =(RefCountPtr<T> src) {
- setPtr(src.get()); return *this;
+ this->setPtr(src.get());
+ return *this;
};
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gle-graphics-4.2.4b/src/gle/tokens/StringKeyHash.h
new/gle-graphics-4.2.4c/src/gle/tokens/StringKeyHash.h
--- old/gle-graphics-4.2.4b/src/gle/tokens/StringKeyHash.h 2010-06-14
17:34:39.000000000 +0200
+++ new/gle-graphics-4.2.4c/src/gle/tokens/StringKeyHash.h 2012-02-19
22:07:34.000000000 +0100
@@ -254,7 +254,7 @@
return i->second;
} else {
ElemType nelem(key);
- insert(StringKeyPair<ElemType>(key, nelem));
+ this->insert(StringKeyPair<ElemType>(key, nelem));
return nelem;
}
}
@@ -309,7 +309,7 @@
}
void add_item(int key, ElemType elem) {
- insert(IntKeyPair<ElemType>(key, elem));
+ this->insert(IntKeyPair<ElemType>(key, elem));
}
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gle-graphics-4.2.4b/src/gle/tokens/Tokenizer.cpp
new/gle-graphics-4.2.4c/src/gle/tokens/Tokenizer.cpp
--- old/gle-graphics-4.2.4b/src/gle/tokens/Tokenizer.cpp 2011-10-26
23:32:08.000000000 +0200
+++ new/gle-graphics-4.2.4c/src/gle/tokens/Tokenizer.cpp 2012-03-06
07:27:39.000000000 +0100
@@ -611,7 +611,6 @@
m_token_start.set(0, 0);
m_space_before = false;
m_space_after = false;
- m_space_kind = 0;
m_pushback_tokens.clear();
}
@@ -636,9 +635,13 @@
m_token_start.set(0, 0);
}
-
int Tokenizer::has_more_tokens() throw(ParserError) {
- if (m_token_at_end == 1) return 0;
+ if (m_token_has_pushback > 0) {
+ return 1;
+ }
+ if (m_token_at_end == 1) {
+ return 0;
+ }
char token_ch = token_read_sig_char();
if (m_token_at_end == 1) {
return 0;
@@ -919,12 +922,6 @@
return m_token;
}
-void Tokenizer::jump(TokenizerPos& pos) {
- goto_position(pos);
- m_pushback_tokens.clear();
- m_token_has_pushback = 0;
-}
-
void Tokenizer::on_trailing_space() {
}
@@ -1213,11 +1210,9 @@
if (ch == '\n') m_token_count.incRow();
if (m_language->isLineCommentToken(ch)) {
token_skip_to_end();
- m_space_kind = ch;
return SPACE_CHAR;
}
if (m_language->isSpaceToken(ch)) {
- m_space_kind = ch;
return SPACE_CHAR;
} else {
return ch;
@@ -1243,7 +1238,6 @@
else m_token_count.incCol();
if (ch == '\n') m_token_count.incRow();
if (m_language->isSpaceToken(ch)) {
- m_space_kind = ch;
return SPACE_CHAR;
} else {
return ch;
@@ -1408,38 +1402,6 @@
return m_is->get();
}
-StreamEOFTokenizer::StreamEOFTokenizer() : StreamTokenizer() {
- setFakeEOF(0);
-}
-
-StreamEOFTokenizer::StreamEOFTokenizer(TokenizerLanguage* lang) :
StreamTokenizer(lang) {
- setFakeEOF(0);
-}
-
-StreamEOFTokenizer::StreamEOFTokenizer(istream* _is) : StreamTokenizer(_is) {
- setFakeEOF(0);
-}
-
-StreamEOFTokenizer::StreamEOFTokenizer(istream* _is, TokenizerLanguage* lang)
: StreamTokenizer(_is, lang) {
- setFakeEOF(0);
-}
-
-StreamEOFTokenizer::~StreamEOFTokenizer() {
-}
-
-int StreamEOFTokenizer::stream_ok() {
- return m_fakeeof == 0 && m_is->good();
-}
-
-int StreamEOFTokenizer::stream_get() {
- int res = m_is->get();
- if (res == 0) {
- m_fakeeof = 1;
- return ' ';
- }
- return res;
-}
-
StringTokenizer::StringTokenizer(bool show_str_err) : Tokenizer() {
init_st();
m_token_count.set_line(0);
@@ -1541,100 +1503,6 @@
SpaceStringTokenizer::~SpaceStringTokenizer() {
}
-StreamEOFCopyTokenizer::StreamEOFCopyTokenizer() : StreamEOFTokenizer() {
- m_out_fb = NULL;
- m_os = NULL;
-}
-
-StreamEOFCopyTokenizer::StreamEOFCopyTokenizer(TokenizerLanguage* lang) :
StreamEOFTokenizer(lang) {
- m_out_fb = NULL;
- m_os = NULL;
-}
-
-StreamEOFCopyTokenizer::StreamEOFCopyTokenizer(istream* _is) :
StreamEOFTokenizer(_is) {
- m_out_fb = NULL;
- m_os = NULL;
-}
-
-StreamEOFCopyTokenizer::StreamEOFCopyTokenizer(istream* _is,
TokenizerLanguage* lang) : StreamEOFTokenizer(_is, lang) {
- m_out_fb = NULL;
- m_os = NULL;
-}
-
-StreamEOFCopyTokenizer::~StreamEOFCopyTokenizer() {
- close_output();
-}
-
-void StreamEOFCopyTokenizer::open_output(const char* fname) throw(ParserError)
{
- m_out_fb = new filebuf();
- if (m_out_fb->open(fname, ios::out) == NULL) {
- TokenizerPos pos;
- throw ParserError(string("can't open: ") + fname, pos, fname);
- }
- m_os = new ostream(m_out_fb);
-}
-
-void StreamEOFCopyTokenizer::output_term_space() {
- if (m_termspace != -1) *m_os << m_termspace;
-}
-
-void StreamEOFCopyTokenizer::output_term_space(char ch) {
- if (ch != -1) *m_os << ch;
-}
-
-void StreamEOFCopyTokenizer::close_output() {
- if (m_out_fb != NULL) {
- m_out_fb->close();
- delete m_out_fb;
- m_out_fb = NULL;
- delete m_os;
- m_os = NULL;
- }
-}
-
-string& StreamEOFCopyTokenizer::try_next_token_output() {
- string& token = try_next_token();
- out() << token;
- output_term_space();
- return token;
-}
-
-string& StreamEOFCopyTokenizer::next_token_output() {
- string& token = next_token();
- out() << token;
- output_term_space();
- return token;
-}
-
-void StreamEOFCopyTokenizer::output_token_and_space() {
- out() << m_token;
- output_term_space();
-}
-
-void StreamEOFCopyTokenizer::on_trailing_space() {
- m_termspace = m_space_kind;
-}
-
-char StreamEOFCopyTokenizer::token_read_sig_char() throw(ParserError) {
- m_intoken = 0;
- m_termspace = -1;
- char ch = StreamTokenizer::token_read_sig_char();
- m_intoken = 1;
- return ch;
-}
-
-int StreamEOFCopyTokenizer::stream_get() {
- int ch = m_is->get();
- if (ch == 0) {
- m_fakeeof = 1;
- return ' ';
- }
- if (m_intoken == 0 && m_language->isSpaceToken(ch)) {
- *m_os << (char)ch;
- }
- return ch;
-}
-
MyOutputFile::MyOutputFile() {
m_OS = NULL;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gle-graphics-4.2.4b/src/gle/tokens/Tokenizer.h
new/gle-graphics-4.2.4c/src/gle/tokens/Tokenizer.h
--- old/gle-graphics-4.2.4b/src/gle/tokens/Tokenizer.h 2011-03-08
22:30:56.000000000 +0100
+++ new/gle-graphics-4.2.4c/src/gle/tokens/Tokenizer.h 2012-03-06
07:32:02.000000000 +0100
@@ -289,7 +289,6 @@
int m_token_has_pushback_ch;
bool m_space_before;
bool m_space_after;
- char m_space_kind;
TokenizerPos m_token_start;
TokenizerPos m_token_count;
TokenizerLangHashPtr m_langhash;
@@ -300,10 +299,6 @@
Tokenizer();
Tokenizer(TokenizerLanguage* lang);
virtual ~Tokenizer();
- void init();
- void reset_position();
- void reset_nopos();
- void reset_all();
int has_more_tokens() throw(ParserError);
// end of stream not reached
@@ -311,7 +306,7 @@
string& next_token() throw(ParserError);
// returns next token. throws exception if no more tokens.
- string& next_continuous_string_excluding(const char* forbidden)
throw(ParserError);
+ string& next_continuous_string_excluding(const char* forbidden)
throw(ParserError);
string& try_next_token() throw(ParserError);
@@ -362,8 +357,6 @@
void inc_line();
- void jump(TokenizerPos& pos);
-
inline const TokenizerPos& token_pos() const { return m_token_start; };
inline int token_pos_col() const { return m_token_start.getColumn(); };
@@ -404,6 +397,7 @@
string& next_multilevel_token() throw(ParserError);
virtual char token_read_sig_char() throw(ParserError);
+
virtual void on_trailing_space();
char token_read_char();
@@ -428,13 +422,13 @@
m_token_pushback_ch[m_token_has_pushback_ch++] = ch;
}
- virtual ParserError throwError(const char* s1, const char* s2, const char*
s3);
+ virtual ParserError throwError(const char* s1, const char* s2, const
char* s3);
- virtual ParserError throwError(int pos, const string& error);
+ virtual ParserError throwError(int pos, const string& error);
- virtual ParserError throwError(const string& error);
+ virtual ParserError throwError(const string& error);
- virtual int getErrorPosition() const;
+ virtual int getErrorPosition() const;
ParserError error(const string& src) const;
@@ -449,20 +443,18 @@
virtual const char* parse_string_in_error() const;
protected:
- void undo_pushback_token();
-
+ void init();
+ void reset_position();
+ void reset_nopos();
+ void reset_all();
+ void undo_pushback_token();
void copy_string(char endch) throw(ParserError);
-
void multi_level_do_multi(char open) throw(ParserError);
-
void get_token() throw(ParserError);
// consumes one token (and forgets it?)
// raises exception when e.g. a string constant is not terminated.
-
void get_token_2() throw(ParserError);
-
void get_check_token() throw(ParserError);
-
TokenizerLangElem* findLangElem(const TokenizerLangHash* hash);
TokenizerLangElem* findLangElem2(const TokenizerLangHash* hash);
};
@@ -486,21 +478,6 @@
inline istream* getStream() { return m_is; };
};
-class StreamEOFTokenizer : public StreamTokenizer {
-protected:
- int m_fakeeof;
-public:
- StreamEOFTokenizer();
- StreamEOFTokenizer(TokenizerLanguage* lang);
- StreamEOFTokenizer(istream* _is);
- StreamEOFTokenizer(istream* _is, TokenizerLanguage* lang);
- virtual ~StreamEOFTokenizer();
- virtual int stream_ok();
- virtual int stream_get();
- inline int isFakeEOF() { return m_fakeeof; }
- inline void setFakeEOF(int eof) { m_fakeeof = eof; }
-};
-
class StringTokenizer : public Tokenizer {
protected:
const char* m_tokens;
@@ -531,35 +508,6 @@
virtual ~SpaceStringTokenizer();
};
-/*
- * Copy space tokens directly to output stream
- */
-class StreamEOFCopyTokenizer : public StreamEOFTokenizer {
-protected:
- filebuf* m_out_fb;
- ostream* m_os;
- int m_intoken;
- char m_termspace;
-public:
- StreamEOFCopyTokenizer();
- StreamEOFCopyTokenizer(TokenizerLanguage* lang);
- StreamEOFCopyTokenizer(istream* _is);
- StreamEOFCopyTokenizer(istream* _is, TokenizerLanguage* lang);
- virtual ~StreamEOFCopyTokenizer();
- void open_output(const char* fname) throw(ParserError);
- void close_output();
- void output_term_space();
- void output_term_space(char ch);
- string& try_next_token_output();
- string& next_token_output();
- void output_token_and_space();
- virtual int stream_get();
- virtual void on_trailing_space();
- virtual char token_read_sig_char() throw(ParserError);
- inline ostream& out() { return *m_os; };
- inline char get_term_space() { return m_termspace; };
-};
-
class MyOutputFile {
protected:
filebuf m_FB;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gle-graphics-4.2.4b/src/gui/mainwindow.cpp
new/gle-graphics-4.2.4c/src/gui/mainwindow.cpp
--- old/gle-graphics-4.2.4b/src/gui/mainwindow.cpp 2011-12-30
08:55:28.000000000 +0100
+++ new/gle-graphics-4.2.4c/src/gui/mainwindow.cpp 2012-02-26
14:57:48.000000000 +0100
@@ -697,9 +697,9 @@
QString title(APP_NAME);
if (has) {
title += tr(" - ") + currFile->primaryFile();
- // Always include "[*]", it is treated special by Qt and only
filled in when actually modified
- title += tr(" [*]");
}
+ // Always include "[*]", it is treated special by Qt and only filled in
when actually modified
+ title += tr(" [*]");
setWindowTitle(title);
}
@@ -2299,8 +2299,8 @@
{
gleScript =
gleInterface->newGLEFile(code.toLatin1().constData(),
tempFiles[NewGLE].toLatin1().constData());
// Since we've added a "size" line, the file has (arguably)
changed
- drawingArea->setDirty();
updateWindowTitle();
+ drawingArea->setDirty();
}
else
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gle-graphics-4.2.4b/src/gui/qgle.pro.in
new/gle-graphics-4.2.4c/src/gui/qgle.pro.in
--- old/gle-graphics-4.2.4b/src/gui/qgle.pro.in 2012-01-14 15:00:03.000000000
+0100
+++ new/gle-graphics-4.2.4c/src/gui/qgle.pro.in 2012-02-19 22:07:34.000000000
+0100
@@ -168,7 +168,7 @@
LIBS += -lgle-graphics-@GLE_VERSION@ -L../../build/lib/
}
win32 {
- LIBS += -lglu32
+ LIBS += -lglu32
LIBS += -lgle-graphics-@GLE_VERSION@ -L../../build/bin/
}
@@ -180,4 +180,8 @@
LIBS += @QT_RPATH@ @QT_LIBGLU_LIB@
}
+QMAKE_CXXFLAGS += @QT_CPPFLAGS@
+QMAKE_CFLAGS += @QT_CPPFLAGS@
+QMAKE_LDFLAGS += @QT_LDFLAGS@
+
# vim:et
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gle-graphics-4.2.4b/src/gui/qgslibloader.cpp
new/gle-graphics-4.2.4c/src/gui/qgslibloader.cpp
--- old/gle-graphics-4.2.4b/src/gui/qgslibloader.cpp 2011-11-09
22:58:40.000000000 +0100
+++ new/gle-graphics-4.2.4c/src/gui/qgslibloader.cpp 2012-02-19
22:07:34.000000000 +0100
@@ -260,11 +260,11 @@
/* Try to load the library */
if (location == "") {
#ifdef Q_WS_X11
- #ifdef __x86_64__
+ #if defined(__x86_64__) || defined(__ppc64__) || defined
(__s390x__) || defined (__sparc64__)
// try 64 bit libraries on 64 bit system
tryLocationLoop("/usr/lib64");
tryLocationLoop("/usr/local/lib64");
- #endif // __x86_64__
+ #endif // 64 bit
tryLocationLoop("/usr/lib");
tryLocationLoop("/usr/local/lib");
#endif // Q_WS_X11
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
