forked from pool/doxygen
Accepting request 561352 from openSUSE:Factory:Staging:O
- Update to 1.8.14: * Many fixes during the one year development cycle: http://www.stack.nl/~dimitri/doxygen/manual/changelog.html#log_1_8_14 - Switch to python3 instead of python2 - Remove upstream merged doxygen-guard-null-variable.patch - Refresh patch vhdlparser-no-return.patch - Kill doxygen-doc subpackages the latex deps keep growing while it is really easy to download the generated pdfs from upstream - Update to 1.8.14: * Many fixes during the one year development cycle: http://www.stack.nl/~dimitri/doxygen/manual/changelog.html#log_1_8_14 - Switch to python3 instead of python2 - Refresh patch vhdlparser-no-return.patch - Use qt5 doxywizard even on leaps OBS-URL: https://build.opensuse.org/request/show/561352 OBS-URL: https://build.opensuse.org/package/show/devel:tools/doxygen?expand=0&rev=125
This commit is contained in:
parent
b25d38a8e8
commit
dc3f3f7f3c
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:af667887bd7a87dc0dbf9ac8d86c96b552dfb8ca9c790ed1cbffaa6131573f6b
|
||||
size 4893912
|
3
doxygen-1.8.14.src.tar.gz
Normal file
3
doxygen-1.8.14.src.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d1757e02755ef6f56fd45f1f4398598b920381948d6fcfa58f5ca6aa56f59d4d
|
||||
size 4877980
|
@ -1,60 +0,0 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 10 13:21:16 UTC 2017 - mpluskal@suse.com
|
||||
|
||||
- Update licensing information
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 7 12:20:10 UTC 2017 - mpluskal@suse.com
|
||||
|
||||
- Explicitly require python2 for building
|
||||
- Use more cmake macros
|
||||
- Run spec-cleaner
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 14 08:09:53 UTC 2017 - foss@grueninger.de
|
||||
|
||||
- Update to 1.8.13
|
||||
See changelog at http://www.stack.nl/~dimitri/doxygen/manual/changelog.html#log_1_8_13
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 6 21:07:53 UTC 2016 - foss@grueninger.de
|
||||
|
||||
- Update to 1.8.12
|
||||
See changelog at http://www.stack.nl/~dimitri/doxygen/manual/changelog.html
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 25 07:29:18 UTC 2016 - pgajdos@suse.com
|
||||
|
||||
- fix build: added texlive-wasy2-ps to buildrequires
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 5 10:05:23 UTC 2016 - pgajdos@suse.com
|
||||
|
||||
- fix build after update
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 5 07:31:22 UTC 2016 - foss@grueninger.de
|
||||
|
||||
- Update to 1.8.11
|
||||
See changelog at http://www.stack.nl/~dimitri/doxygen/manual/changelog.html
|
||||
- Update patch vhdlparser-no-return.patch
|
||||
- Remove patch doxygen-no-shared-libs.patch which is included
|
||||
in upstream
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 21 10:01:07 UTC 2015 - tchvatal@suse.com
|
||||
|
||||
- Set proper minimal cmake version required
|
||||
- Use system stack for cmake params and obey cflags
|
||||
- Add patch to build required static libs:
|
||||
* doxygen-no-shared-libs.patch
|
||||
- Refresh patch:
|
||||
* doxygen-no-lowercase-man-names.patch
|
||||
- Add patch to avoid no-return-in-nonvoid function error:
|
||||
* vhdlparser-no-return.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 19 08:00:39 UTC 2015 - pgajdos@suse.com
|
||||
|
||||
- doxygen-doc package created
|
||||
|
108
doxygen-doc.spec
108
doxygen-doc.spec
@ -1,108 +0,0 @@
|
||||
#
|
||||
# spec file for package doxygen-doc
|
||||
#
|
||||
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
Name: doxygen-doc
|
||||
Version: 1.8.13
|
||||
Release: 0
|
||||
Summary: Automated C, C++, and Java Documentation Generator
|
||||
# qtools are used for building and they are GPL-3.0 licensed
|
||||
License: GPL-2.0+ AND GPL-3.0
|
||||
Group: Development/Tools/Doc Generators
|
||||
Url: http://www.stack.nl/~dimitri/doxygen/
|
||||
Source0: http://ftp.stack.nl/pub/users/dimitri/doxygen-%{version}.src.tar.gz
|
||||
# PATCH-FIX-UPSTREAM: add missing returns to non-void functions
|
||||
Patch3: vhdlparser-no-return.patch
|
||||
# suse specific, for ppc64le, workaround for bnc#921577
|
||||
Patch4: doxygen-dot-one-thread.patch
|
||||
BuildRequires: bison
|
||||
BuildRequires: cmake >= 2.8.12
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: flex
|
||||
BuildRequires: gcc-c++
|
||||
# see graphviz.spec:
|
||||
# "If you need output in png format you also need to install graphviz-gnome."
|
||||
BuildRequires: graphviz-gnome
|
||||
BuildRequires: poppler-tools
|
||||
BuildRequires: python2-base
|
||||
BuildRequires: python2-xml
|
||||
BuildRequires: texlive-appendix
|
||||
BuildRequires: texlive-colortbl
|
||||
BuildRequires: texlive-courier
|
||||
BuildRequires: texlive-dvips
|
||||
BuildRequires: texlive-epstopdf
|
||||
BuildRequires: texlive-fancyhdr
|
||||
BuildRequires: texlive-float
|
||||
BuildRequires: texlive-helvetic
|
||||
BuildRequires: texlive-import
|
||||
BuildRequires: texlive-latex
|
||||
BuildRequires: texlive-makeindex
|
||||
BuildRequires: texlive-metafont
|
||||
BuildRequires: texlive-multirow
|
||||
BuildRequires: texlive-natbib
|
||||
BuildRequires: texlive-psnfss
|
||||
BuildRequires: texlive-rsfs
|
||||
BuildRequires: texlive-sectsty
|
||||
BuildRequires: texlive-symbol
|
||||
BuildRequires: texlive-tabu
|
||||
BuildRequires: texlive-times
|
||||
BuildRequires: texlive-tocloft
|
||||
BuildRequires: texlive-wasy
|
||||
BuildRequires: texlive-wasy2-ps
|
||||
BuildRequires: texlive-wasysym
|
||||
BuildRequires: texlive-xtab
|
||||
|
||||
%description
|
||||
Doxygen is a documentation system for C, C++, Java, and IDL. It can
|
||||
generate an online class browser (in HTML) and an offline reference
|
||||
manual (in LaTeX) from a set of documented source files. The
|
||||
documentation is extracted directly from the sources. Doxygen is
|
||||
developed on a Linux platform, but it runs on most other UNIX flavors
|
||||
as well.
|
||||
|
||||
This package contains only documentation
|
||||
|
||||
%prep
|
||||
%setup -q -n doxygen-%{version}
|
||||
%patch3 -p1
|
||||
%ifarch ppc64le
|
||||
# see bnc#921577
|
||||
%patch4 -p1
|
||||
%endif
|
||||
|
||||
%build
|
||||
%cmake \
|
||||
-DDOC_INSTALL_DIR=share/doc/packages/%{name} \
|
||||
-Dbuild_doc=ON \
|
||||
-Dbuild_xmlparser=OFF \
|
||||
-Dbuild_search=OFF \
|
||||
-Dbuild_wizard=OFF \
|
||||
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" \
|
||||
-DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" \
|
||||
-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now"
|
||||
make docs %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
%cmake_install docs
|
||||
rm %{buildroot}%{_bindir}/doxygen
|
||||
rm -r %{buildroot}%{_mandir}/man1/
|
||||
%fdupes -s %{buildroot}%{_docdir}/%{name}-doc
|
||||
|
||||
%files
|
||||
%doc %{_docdir}/%{name}
|
||||
|
||||
%changelog
|
@ -1,25 +0,0 @@
|
||||
From 0f02761a158a5e9ddbd5801682482af8986dbc35 Mon Sep 17 00:00:00 2001
|
||||
From: albert-github <albert.tests@gmail.com>
|
||||
Date: Wed, 4 Jan 2017 12:24:55 +0100
|
||||
Subject: [PATCH] Bug 776791 - [1.8.13 Regression] Segfault building the
|
||||
breathe docs
|
||||
|
||||
Protected against NULL pointer of variable al
|
||||
---
|
||||
src/xmlgen.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp
|
||||
index fe95c7a..70e198a 100644
|
||||
--- a/src/xmlgen.cpp
|
||||
+++ b/src/xmlgen.cpp
|
||||
@@ -620,7 +620,7 @@ static void generateXMLForMember(MemberDef *md,FTextStream &ti,FTextStream &t,De
|
||||
if (md->isInline()) t << "yes"; else t << "no";
|
||||
t << "\"";
|
||||
|
||||
- if (al->refQualifier!=RefQualifierNone)
|
||||
+ if (al!=0 && al->refQualifier!=RefQualifierNone)
|
||||
{
|
||||
t << " refqual=\"";
|
||||
if (al->refQualifier==RefQualifierLValue) t << "lvalue"; else t << "rvalue";
|
||||
|
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 3 12:52:54 UTC 2018 - tchvatal@suse.com
|
||||
|
||||
- Update to 1.8.14:
|
||||
* Many fixes during the one year development cycle:
|
||||
http://www.stack.nl/~dimitri/doxygen/manual/changelog.html#log_1_8_14
|
||||
- Switch to python3 instead of python2
|
||||
- Remove upstream merged doxygen-guard-null-variable.patch
|
||||
- Refresh patch vhdlparser-no-return.patch
|
||||
- Kill doxygen-doc subpackages the latex deps keep growing while
|
||||
it is really easy to download the generated pdfs from upstream
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 10 13:21:04 UTC 2017 - mpluskal@suse.com
|
||||
|
||||
|
16
doxygen.spec
16
doxygen.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package doxygen
|
||||
#
|
||||
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2018 SUSE LINUX 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: doxygen
|
||||
Version: 1.8.13
|
||||
Version: 1.8.14
|
||||
Release: 0
|
||||
Summary: Automated C, C++, and Java Documentation Generator
|
||||
# qtools are used for building and they are GPL-3.0 licensed
|
||||
@ -35,14 +35,15 @@ Patch3: vhdlparser-no-return.patch
|
||||
Patch4: doxygen-dot-one-thread.patch
|
||||
# Submitted upstream, fix for https://bugzilla.gnome.org/show_bug.cgi?id=777672
|
||||
Patch6: res2cc_sort_resources.diff
|
||||
# PATCH-FIX-UPSTREAM doxygen-guard-null-variable.patch gh#doxygen/doxygen#555 dimstar@opensuse.org -- Protected against NULL pointer of variable al
|
||||
Patch7: doxygen-guard-null-variable.patch
|
||||
BuildRequires: bison
|
||||
BuildRequires: cmake >= 2.8.12
|
||||
BuildRequires: flex
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: python2-base
|
||||
BuildRequires: python2-xml
|
||||
BuildRequires: python3-base
|
||||
BuildRequires: python3-xml
|
||||
# Do not bother building documentation with latex since it is present on the
|
||||
# web trivialy for all versions of doxygen
|
||||
Obsoletes: doxygen-doc
|
||||
|
||||
%description
|
||||
Doxygen is a documentation system for C, C++, Java, and IDL. It can
|
||||
@ -61,7 +62,6 @@ as well.
|
||||
%patch4 -p1
|
||||
%endif
|
||||
%patch6
|
||||
%patch7 -p1
|
||||
|
||||
%build
|
||||
%cmake \
|
||||
@ -81,7 +81,7 @@ install -m 644 doc/doxygen.1 %{buildroot}%{_mandir}/man1/
|
||||
|
||||
%files
|
||||
%doc LICENSE
|
||||
%attr(444,root,root) %{_mandir}/man1/doxygen.1.gz
|
||||
%attr(644,root,root) %{_mandir}/man1/doxygen.1%{?ext_man}
|
||||
%attr(755,root,root) %{_bindir}/*
|
||||
|
||||
%changelog
|
||||
|
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 3 12:52:54 UTC 2018 - tchvatal@suse.com
|
||||
|
||||
- Update to 1.8.14:
|
||||
* Many fixes during the one year development cycle:
|
||||
http://www.stack.nl/~dimitri/doxygen/manual/changelog.html#log_1_8_14
|
||||
- Switch to python3 instead of python2
|
||||
- Refresh patch vhdlparser-no-return.patch
|
||||
- Use qt5 doxywizard even on leaps
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 10 13:21:26 UTC 2017 - mpluskal@suse.com
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package doxywizard
|
||||
#
|
||||
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2018 SUSE LINUX 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: doxywizard
|
||||
Version: 1.8.13
|
||||
Version: 1.8.14
|
||||
Release: 0
|
||||
Summary: Graphical User Interface for Doxygen
|
||||
# qtools are used for building and they are GPL-3.0 licensed
|
||||
@ -33,18 +33,14 @@ BuildRequires: cmake >= 2.8.12
|
||||
BuildRequires: flex
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: python2-base
|
||||
BuildRequires: python2-xml
|
||||
BuildRequires: python3-base
|
||||
BuildRequires: python3-xml
|
||||
BuildRequires: update-desktop-files
|
||||
Requires: doxygen = %{version}
|
||||
%if 0%{?suse_version} < 1320
|
||||
BuildRequires: libqt4-devel >= 4.3
|
||||
%else
|
||||
BuildRequires: pkgconfig(Qt5Core)
|
||||
BuildRequires: pkgconfig(Qt5Gui)
|
||||
BuildRequires: pkgconfig(Qt5Widgets)
|
||||
BuildRequires: pkgconfig(Qt5Xml)
|
||||
%endif
|
||||
%if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315
|
||||
# for make tests
|
||||
BuildRequires: libxml2-tools
|
||||
|
@ -1,474 +1,484 @@
|
||||
--- doxygen-1.8.11.orig/vhdlparser/VhdlParser.cc
|
||||
+++ doxygen-1.8.11/vhdlparser/VhdlParser.cc
|
||||
@@ -62,6 +62,7 @@
|
||||
Index: doxygen-1.8.14/vhdlparser/VhdlParser.cc
|
||||
===================================================================
|
||||
--- doxygen-1.8.14.orig/vhdlparser/VhdlParser.cc
|
||||
+++ doxygen-1.8.14/vhdlparser/VhdlParser.cc
|
||||
@@ -61,6 +61,7 @@ return tok->image.c_str();
|
||||
errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -118,6 +119,7 @@
|
||||
@@ -75,6 +76,7 @@ QCString VhdlParser::access_type_definit
|
||||
|
||||
str=tok->image.c_str(); return str+str1;
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
|
||||
|
||||
@@ -117,6 +119,7 @@ return str;
|
||||
}
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -187,6 +189,7 @@
|
||||
@@ -186,6 +189,7 @@ s+="(";s+=s1+")";return s;
|
||||
}
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -231,6 +234,7 @@
|
||||
@@ -230,6 +234,7 @@ return "&";
|
||||
errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -403,6 +407,7 @@
|
||||
@@ -402,6 +407,7 @@ return s;
|
||||
errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -634,6 +639,7 @@
|
||||
@@ -633,6 +639,7 @@ return s;
|
||||
}
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -847,6 +853,7 @@
|
||||
@@ -846,6 +853,7 @@ return tok->image.c_str();
|
||||
errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1718,6 +1725,7 @@
|
||||
@@ -1717,6 +1725,7 @@ return " others ";
|
||||
}
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -2009,6 +2017,7 @@
|
||||
@@ -2014,6 +2023,7 @@ return s+"#";
|
||||
errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -2621,6 +2630,7 @@
|
||||
@@ -2626,6 +2636,7 @@ return s;
|
||||
errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -2712,6 +2722,7 @@
|
||||
@@ -2717,6 +2728,7 @@ return s+" inertial ";
|
||||
errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -2813,6 +2824,7 @@
|
||||
@@ -2818,6 +2830,7 @@ return s;
|
||||
errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -2846,6 +2858,7 @@
|
||||
@@ -2851,6 +2864,7 @@ return tok->image.c_str();
|
||||
errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -2913,6 +2926,7 @@
|
||||
@@ -2918,6 +2932,7 @@ return s;
|
||||
errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -3043,6 +3057,7 @@
|
||||
@@ -3048,6 +3063,7 @@ return tok->image.c_str();
|
||||
errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -3241,6 +3256,7 @@
|
||||
@@ -3246,6 +3262,7 @@ return "file";
|
||||
errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -3728,6 +3744,7 @@
|
||||
@@ -3733,6 +3750,7 @@ return "all";
|
||||
errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -3844,6 +3861,7 @@
|
||||
@@ -3849,6 +3867,7 @@ return s;
|
||||
errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -3878,6 +3896,7 @@
|
||||
@@ -3883,6 +3902,7 @@ return s;
|
||||
errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -4116,6 +4135,7 @@
|
||||
@@ -4121,6 +4141,7 @@ return "or" ;
|
||||
errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -4212,6 +4232,7 @@
|
||||
@@ -4217,6 +4238,7 @@ s1="not ";return s1+s;
|
||||
errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -4363,6 +4384,7 @@
|
||||
@@ -4368,6 +4390,7 @@ return tok->image.c_str();
|
||||
errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -4683,6 +4705,7 @@
|
||||
@@ -4688,6 +4711,7 @@ return s;
|
||||
errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -4844,6 +4867,7 @@
|
||||
@@ -4849,6 +4873,7 @@ return tok->image.c_str();
|
||||
errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -5130,6 +5154,7 @@
|
||||
@@ -5135,6 +5160,7 @@ return s;
|
||||
}
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -5263,6 +5288,7 @@
|
||||
@@ -5268,6 +5294,7 @@ s1="configuration ";return s;
|
||||
errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -5308,6 +5334,7 @@
|
||||
@@ -5313,6 +5340,7 @@ return tok->image.c_str();
|
||||
errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -5416,6 +5443,7 @@
|
||||
@@ -5422,6 +5450,7 @@ if (parse_sec==GEN_SEC)
|
||||
}
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -5681,6 +5709,7 @@
|
||||
@@ -5687,6 +5716,7 @@ QCString q=lab+" for "+s;
|
||||
errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -5758,6 +5787,7 @@
|
||||
@@ -5764,6 +5794,7 @@ return s;
|
||||
}
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -5820,6 +5850,7 @@
|
||||
@@ -5826,6 +5857,7 @@ return "null";
|
||||
}
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -5965,6 +5996,7 @@
|
||||
@@ -5971,6 +6003,7 @@ return "not";
|
||||
errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -6031,6 +6063,7 @@
|
||||
@@ -6037,6 +6070,7 @@ return "linkage";
|
||||
errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -6086,6 +6119,7 @@
|
||||
@@ -6092,6 +6126,7 @@ return tok->image.c_str();
|
||||
errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -6526,6 +6560,7 @@
|
||||
@@ -6532,6 +6567,7 @@ return s;
|
||||
}
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -6607,6 +6642,7 @@
|
||||
@@ -6613,6 +6649,7 @@ return "type";
|
||||
errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -7417,6 +7453,7 @@
|
||||
@@ -7423,6 +7460,7 @@ return s;
|
||||
}
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -7689,6 +7726,7 @@
|
||||
@@ -7695,6 +7733,7 @@ return s;
|
||||
}
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -8048,6 +8086,7 @@
|
||||
@@ -8054,6 +8093,7 @@ return s;
|
||||
errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -8227,6 +8266,7 @@
|
||||
@@ -8233,6 +8273,7 @@ return "/=";
|
||||
errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -8399,6 +8439,7 @@
|
||||
@@ -8405,6 +8446,7 @@ return s+" "+s1+"%";
|
||||
errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -8760,6 +8801,7 @@
|
||||
@@ -8766,6 +8808,7 @@ FlowChart::addFlowChart(FlowChart::TEXT_
|
||||
}
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -8871,6 +8913,7 @@
|
||||
@@ -8877,6 +8920,7 @@ return "ror";
|
||||
errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -8904,6 +8947,7 @@
|
||||
@@ -8910,6 +8954,7 @@ return "-";
|
||||
errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -8998,6 +9042,7 @@
|
||||
@@ -9004,6 +9049,7 @@ return s+s1+"<="+s2+s3+";";
|
||||
}
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -9102,6 +9147,7 @@
|
||||
@@ -9108,6 +9154,7 @@ return "bus";
|
||||
errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -9172,6 +9218,7 @@
|
||||
@@ -9178,6 +9225,7 @@ return "all";
|
||||
errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -9645,6 +9692,7 @@
|
||||
@@ -9651,6 +9699,7 @@ return s;
|
||||
}
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -10060,6 +10108,7 @@
|
||||
@@ -10066,6 +10115,7 @@ return " all ";
|
||||
}
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -10096,6 +10145,7 @@
|
||||
@@ -10102,6 +10152,7 @@ return s;
|
||||
errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -10198,6 +10248,7 @@
|
||||
@@ -10204,6 +10255,7 @@ return s;
|
||||
}
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -10282,6 +10333,7 @@
|
||||
@@ -10288,6 +10340,7 @@ return "";
|
||||
}
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -10473,6 +10525,7 @@
|
||||
@@ -10479,6 +10532,7 @@ return "";
|
||||
errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -10707,6 +10760,7 @@
|
||||
@@ -10713,6 +10767,7 @@ return " unaffected ";
|
||||
errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -11191,6 +11245,7 @@
|
||||
@@ -11197,6 +11252,7 @@ return s;
|
||||
errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -11681,6 +11736,7 @@
|
||||
@@ -11687,6 +11743,7 @@ return t->image.data();
|
||||
errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -11725,6 +11781,7 @@
|
||||
@@ -11731,6 +11788,7 @@ return s;
|
||||
errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -11770,6 +11827,7 @@
|
||||
@@ -11776,6 +11834,7 @@ return "."+s;
|
||||
}
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -12572,6 +12630,7 @@
|
||||
@@ -12578,6 +12637,7 @@ return s;
|
||||
errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
|
||||
}
|
||||
assert(false);
|
||||
+return QCString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user