diff --git a/ctags-5.6.tar.gz b/ctags-5.6.tar.gz deleted file mode 100644 index 6c7607f..0000000 --- a/ctags-5.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:55c0693845644735f76242fa717efd92d9cb99543f7a7fa65d63bdd083c4eb95 -size 267019 diff --git a/ctags-5.6.diff b/ctags-5.7.diff similarity index 100% rename from ctags-5.6.diff rename to ctags-5.7.diff diff --git a/ctags-5.7.tar.bz2 b/ctags-5.7.tar.bz2 new file mode 100644 index 0000000..75dd8a0 --- /dev/null +++ b/ctags-5.7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:556d96596297777d9223f71146514be7c912c577906674a5e9a0b2747f331a9f +size 228950 diff --git a/ctags-ycp-parser.diff b/ctags-ycp-parser.diff index 69bd427..989d43c 100644 --- a/ctags-ycp-parser.diff +++ b/ctags-ycp-parser.diff @@ -1,6 +1,11 @@ ---- c.c -+++ c.c -@@ -61,35 +61,39 @@ +--- + c.c | 327 +++++++++++++++++++++++++++++++++++++++----------------------- + parsers.h | 3 + 2 files changed, 210 insertions(+), 120 deletions(-) + +--- a/c.c ++++ b/c.c +@@ -59,35 +59,39 @@ typedef enum eException { */ typedef enum eKeywordId { KEYWORD_NONE = -1, @@ -52,7 +57,7 @@ KEYWORD_USING, KEYWORD_VIRTUAL, KEYWORD_VOID, KEYWORD_VOLATILE, KEYWORD_WCHAR_T, KEYWORD_WHILE -@@ -101,7 +105,7 @@ +@@ -99,7 +103,7 @@ typedef enum eKeywordId { typedef struct sKeywordDesc { const char *name; keywordId id; @@ -61,7 +66,7 @@ } keywordDesc; /* Used for reporting the type of object parsed by nextToken (). -@@ -137,6 +141,7 @@ +@@ -135,6 +139,7 @@ typedef enum eTagScope { typedef enum eDeclaration { DECL_NONE, DECL_BASE, /* base type (default) */ @@ -69,7 +74,7 @@ DECL_CLASS, DECL_ENUM, DECL_EVENT, -@@ -258,6 +263,7 @@ +@@ -256,6 +261,7 @@ static langType Lang_cpp; static langType Lang_csharp; static langType Lang_java; static langType Lang_vera; @@ -77,7 +82,7 @@ static vString *Signature; static boolean CollectingSignature; -@@ -354,110 +360,138 @@ +@@ -354,110 +360,138 @@ static kindOption VeraKinds [] = { { FALSE, 'x', "externvar", "external variable declarations"} }; @@ -124,7 +129,7 @@ - { "delete", KEYWORD_DELETE, { 0, 1, 0, 0, 0 } }, - { "double", KEYWORD_DOUBLE, { 1, 1, 1, 1, 0 } }, - { "else", KEYWORD_ELSE, { 1, 1, 0, 1, 0 } }, -- { "enum", KEYWORD_ENUM, { 1, 1, 1, 0, 1 } }, +- { "enum", KEYWORD_ENUM, { 1, 1, 1, 1, 1 } }, - { "event", KEYWORD_EVENT, { 0, 0, 1, 0, 1 } }, - { "explicit", KEYWORD_EXPLICIT, { 0, 1, 1, 0, 0 } }, - { "extends", KEYWORD_EXTENDS, { 0, 0, 0, 1, 1 } }, @@ -206,8 +211,8 @@ + /* keyword keyword ID | | | | | | */ + { "__attribute__", KEYWORD_ATTRIBUTE, { 1, 1, 1, 0, 0, 0 } }, + { "abstract", KEYWORD_ABSTRACT, { 0, 0, 1, 1, 0, 0 } }, -+ { "any", KEYWORD_ANY, { 0, 0, 0, 0, 0, 1 } }, + { "bad_state", KEYWORD_BAD_STATE, { 0, 0, 0, 0, 1, 0 } }, ++ { "any", KEYWORD_ANY, { 0, 0, 0, 0, 0, 1 } }, + { "bad_trans", KEYWORD_BAD_TRANS, { 0, 0, 0, 0, 1, 0 } }, + { "bind", KEYWORD_BIND, { 0, 0, 0, 0, 1, 0 } }, + { "bind_var", KEYWORD_BIND_VAR, { 0, 0, 0, 0, 1, 0 } }, @@ -231,7 +236,7 @@ + { "delete", KEYWORD_DELETE, { 0, 1, 0, 0, 0, 0 } }, + { "double", KEYWORD_DOUBLE, { 1, 1, 1, 1, 0, 0 } }, + { "else", KEYWORD_ELSE, { 1, 1, 0, 1, 0, 1 } }, -+ { "enum", KEYWORD_ENUM, { 1, 1, 1, 0, 1, 1 } }, ++ { "enum", KEYWORD_ENUM, { 1, 1, 1, 1, 1, 1 } }, + { "event", KEYWORD_EVENT, { 0, 0, 1, 0, 1, 0 } }, + { "explicit", KEYWORD_EXPLICIT, { 0, 1, 1, 0, 0, 0 } }, + { "expression", KEYWORD_EXPRESSION, { 0, 0, 0, 0, 0, 1 } }, @@ -319,7 +324,7 @@ }; /* -@@ -877,6 +911,21 @@ +@@ -881,6 +915,21 @@ static veraKind veraTagKind (const tagTy return result; } @@ -341,7 +346,7 @@ static const char *tagName (const tagType type) { const char* result; -@@ -886,6 +935,8 @@ +@@ -890,6 +939,8 @@ static const char *tagName (const tagTyp result = JavaKinds [javaTagKind (type)].name; else if (isLanguage (Lang_vera)) result = VeraKinds [veraTagKind (type)].name; @@ -350,7 +355,7 @@ else result = CKinds [cTagKind (type)].name; return result; -@@ -900,6 +951,8 @@ +@@ -904,6 +955,8 @@ static int tagLetter (const tagType type result = JavaKinds [javaTagKind (type)].letter; else if (isLanguage (Lang_vera)) result = VeraKinds [veraTagKind (type)].letter; @@ -359,7 +364,7 @@ else result = CKinds [cTagKind (type)].letter; return result; -@@ -955,7 +1008,8 @@ +@@ -959,7 +1012,8 @@ static const char* accessField (const st static void addContextSeparator (vString *const scope) { @@ -369,7 +374,7 @@ vStringCatS (scope, "::"); else if (isLanguage (Lang_java) || isLanguage (Lang_csharp)) vStringCatS (scope, "."); -@@ -1690,9 +1744,11 @@ +@@ -1717,9 +1771,11 @@ static void processToken (tokenInfo *con case KEYWORD_NONE: processName (st); break; case KEYWORD_ABSTRACT: st->implementation = IMP_ABSTRACT; break; @@ -381,23 +386,21 @@ case KEYWORD_CATCH: skipParens (); skipBraces (); break; case KEYWORD_CHAR: st->declaration = DECL_BASE; break; case KEYWORD_CLASS: st->declaration = DECL_CLASS; break; -@@ -1711,11 +1767,15 @@ +@@ -1738,9 +1794,13 @@ static void processToken (tokenInfo *con case KEYWORD_INT: st->declaration = DECL_BASE; break; case KEYWORD_INTEGER: st->declaration = DECL_BASE; break; - case KEYWORD_INTERFACE: st->declaration = DECL_INTERFACE; break; + case KEYWORD_INTERFACE: processInterface (st); break; + case KEYWORD_LIST: st->declaration = DECL_BASE; break; case KEYWORD_LOCAL: setAccess (st, ACCESS_LOCAL); break; + case KEYWORD_LOCALE: st->declaration = DECL_BASE; break; case KEYWORD_LONG: st->declaration = DECL_BASE; break; + case KEYWORD_MAP: st->declaration = DECL_BASE; break; - case KEYWORD_NAMESPACE: st->declaration = DECL_NAMESPACE; break; case KEYWORD_OPERATOR: readOperator (st); break; - case KEYWORD_PACKAGE: readPackage (st); break; + case KEYWORD_PATH: st->declaration = DECL_BASE; break; case KEYWORD_PRIVATE: setAccess (st, ACCESS_PRIVATE); break; case KEYWORD_PROGRAM: st->declaration = DECL_PROGRAM; break; case KEYWORD_PROTECTED: setAccess (st, ACCESS_PROTECTED); break; -@@ -1725,7 +1785,9 @@ +@@ -1750,7 +1810,9 @@ static void processToken (tokenInfo *con case KEYWORD_SIGNED: st->declaration = DECL_BASE; break; case KEYWORD_STRING: st->declaration = DECL_BASE; break; case KEYWORD_STRUCT: st->declaration = DECL_STRUCT; break; @@ -407,7 +410,7 @@ case KEYWORD_THROWS: discardTypeList (token); break; case KEYWORD_UNION: st->declaration = DECL_UNION; break; case KEYWORD_UNSIGNED: st->declaration = DECL_BASE; break; -@@ -1764,7 +1826,9 @@ +@@ -1793,7 +1855,9 @@ static void processToken (tokenInfo *con case KEYWORD_FOR: case KEYWORD_IF: @@ -417,7 +420,7 @@ case KEYWORD_WHILE: { int c = skipToNonWhite (); -@@ -2253,7 +2317,8 @@ +@@ -2302,7 +2366,8 @@ static void addContext (statementInfo *c { if (vStringLength (st->context->name) > 0) { @@ -427,7 +430,7 @@ vStringCatS (st->context->name, "::"); else if (isLanguage (Lang_java) || isLanguage (Lang_csharp)) vStringCatS (st->context->name, "."); -@@ -2569,7 +2634,12 @@ +@@ -2637,7 +2702,12 @@ static void nest (statementInfo *const s st->inFunction = TRUE; /* fall through */ default: @@ -441,7 +444,7 @@ createTags (nestLevel, st); else skipToMatch ("{}"); -@@ -2610,6 +2680,7 @@ +@@ -2678,6 +2748,7 @@ static void tagCheck (statementInfo *con } } else if (isContextualStatement (st) || @@ -449,7 +452,7 @@ st->declaration == DECL_NAMESPACE || st->declaration == DECL_PROGRAM) { -@@ -2769,6 +2840,12 @@ +@@ -2844,6 +2915,12 @@ static void initializeVeraParser (const buildKeywordHash (language, 4); } @@ -462,7 +465,7 @@ extern parserDefinition* CParser (void) { static const char *const extensions [] = { "c", NULL }; -@@ -2835,4 +2912,16 @@ +@@ -2910,4 +2987,16 @@ extern parserDefinition* VeraParser (voi return def; } @@ -479,9 +482,9 @@ +} + /* vi:set tabstop=4 shiftwidth=4 noexpandtab: */ ---- parsers.h -+++ parsers.h -@@ -48,7 +48,8 @@ +--- a/parsers.h ++++ b/parsers.h +@@ -49,7 +49,8 @@ VeraParser, \ VerilogParser, \ VimParser, \ diff --git a/ctags.changes b/ctags.changes index ff2b592..60f8b5e 100644 --- a/ctags.changes +++ b/ctags.changes @@ -1,3 +1,61 @@ +------------------------------------------------------------------- +Mon Nov 12 21:43:02 CET 2007 - bwalle@suse.de + +- update to ctags 5.7 + * Added support for DIM AS [Freebasic] + * Added support for arbitrary nesting depth [Python] + * Added support for verbatim string literals [C#] + * Added support for .ctags as well as ctags.cnf on Windows + * Added support for non-extern, non-static functions returning + wchar_t, contributed by Aaron Peromsik [C++] + * Added support for numerous revision control systems including + Bazaar and Mercurial + * Added support for enums [Java] + * Added support for multiple-level namespace declarations [C#] + * Added .svn to list of directories ignored during recursion + (--recurse). + * Added support for BlitzBasic, PureBasic and FreeBasic + * Added support for interfaces and static/public/protected/ + private functions [PHP]. + * Added support for 'package' keyword [Perl]. + * Added support for multi-line subroutine, package, and constant + definitions [Perl]. + * Added support for optional subroutine declarations [Perl]. + * Added support for formats [Perl]. + * Added support for new convert keyword [Eiffel]. + * Added optional tags for forward variable declarations [C, C++]. + * Changed parsing of option input file (-L) to strip trailing + white space. + * Ignore comments mixed into definitions and declarations [Perl]. + * Fixed detecting labels with whitespace after label name [Perl] + * Fixed parsing of generic classes/interfaces [Java] + * Fixed misidentification of fully qualified function calls as + labels [Perl]. + * Fixed parsing of inner classes [Python] + * Fixed line continuation [Python] + * Fixed parsing of annotations [Java] + * Fixed block-comment parsing [Verilog] + * Fixed typo in man page + * Fixed missing chunk of text in man page and over-use of hyphens + in UTF-8 locales + * Fixed parsing of ` as a method name [Ruby]. + * Fixed parsing of keywords in string literals [Ruby] + * Fixed potential segmentation violation + * Fixed parsing of destructors with whitespace after the '~' [C++] + * Fixed default access of unions to be public [C++] + * Fixed various memory leaks, mostly contributed by Dmitry Antipov. + * Fixed parsing of `define [Verilog] + * Fixed crashes involving '/' [Verilog] + * Fixed compilation problem on MinGW + * Fixed generation of HTML-formatted man page + * Fixed recognition of Python scripts having '#!/usr/bin/python' + as first line + * Fixed parsing of Fortran comment-to-end-of-line with no newline + before EOF [Debian] + * Fixed parsing of << [C/C++] + * Fixed parsing of fully-qualified type names [Java] + * Fixed handling of lone carriage-return characters in file + ------------------------------------------------------------------- Tue Feb 6 13:27:01 CET 2007 - schwab@suse.de diff --git a/ctags.spec b/ctags.spec index 146b5fd..1b5c86c 100644 --- a/ctags.spec +++ b/ctags.spec @@ -1,5 +1,5 @@ # -# spec file for package ctags (Version 2007.2.6) +# spec file for package ctags (Version 2007.11.12) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,17 +11,17 @@ # norootforbuild Name: ctags -License: GNU General Public License (GPL) +License: GPL v2 or later Group: Development/Tools/Navigators -Autoreqprov: on -%define exuberant_ver 5.6 +AutoReqProv: on +%define exuberant_ver 5.7 %define emacs_ver 17.26 -Version: 2007.2.6 +Version: 2007.11.12 Release: 1 Summary: A Program to Generate Tag Files for Use with vi and Other Editors -URL: http://ctags.sourceforge.net/ -Source0: ftp://ftp.sourceforge.net/pub/sourceforge/c/ct/ctags/ctags-%{exuberant_ver}.tar.gz -Source1: etags-%{emacs_ver}.tar.gz +Url: http://ctags.sourceforge.net/ +Source0: ftp://ftp.sourceforge.net/pub/sourceforge/c/ct/ctags/ctags-%{exuberant_ver}.tar.bz2 +Source1: etags-%{emacs_ver}.tar.bz2 Source2: README.SuSE Patch0: ctags-%{exuberant_ver}.diff Patch1: ctags-ycp-parser.diff @@ -48,7 +48,7 @@ Authors: %prep %setup -n ctags-%{exuberant_ver} -b 1 %patch -%patch1 +%patch1 -p1 cd ../etags-%{emacs_ver} %patch2 @@ -86,8 +86,62 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/gnuctags.1.gz %{_mandir}/man1/etags.1.gz %{_docdir}/ctags - -%changelog -n ctags +%changelog +* Mon Nov 12 2007 - bwalle@suse.de +- update to ctags 5.7 + * Added support for DIM AS [Freebasic] + * Added support for arbitrary nesting depth [Python] + * Added support for verbatim string literals [C#] + * Added support for .ctags as well as ctags.cnf on Windows + * Added support for non-extern, non-static functions returning + wchar_t, contributed by Aaron Peromsik [C++] + * Added support for numerous revision control systems including + Bazaar and Mercurial + * Added support for enums [Java] + * Added support for multiple-level namespace declarations [C#] + * Added .svn to list of directories ignored during recursion + (--recurse). + * Added support for BlitzBasic, PureBasic and FreeBasic + * Added support for interfaces and static/public/protected/ + private functions [PHP]. + * Added support for 'package' keyword [Perl]. + * Added support for multi-line subroutine, package, and constant + definitions [Perl]. + * Added support for optional subroutine declarations [Perl]. + * Added support for formats [Perl]. + * Added support for new convert keyword [Eiffel]. + * Added optional tags for forward variable declarations [C, C++]. + * Changed parsing of option input file (-L) to strip trailing + white space. + * Ignore comments mixed into definitions and declarations [Perl]. + * Fixed detecting labels with whitespace after label name [Perl] + * Fixed parsing of generic classes/interfaces [Java] + * Fixed misidentification of fully qualified function calls as + labels [Perl]. + * Fixed parsing of inner classes [Python] + * Fixed line continuation [Python] + * Fixed parsing of annotations [Java] + * Fixed block-comment parsing [Verilog] + * Fixed typo in man page + * Fixed missing chunk of text in man page and over-use of hyphens + in UTF-8 locales + * Fixed parsing of ` as a method name [Ruby]. + * Fixed parsing of keywords in string literals [Ruby] + * Fixed potential segmentation violation + * Fixed parsing of destructors with whitespace after the '~' [C++] + * Fixed default access of unions to be public [C++] + * Fixed various memory leaks, mostly contributed by Dmitry Antipov. + * Fixed parsing of `define [Verilog] + * Fixed crashes involving '/' [Verilog] + * Fixed compilation problem on MinGW + * Fixed generation of HTML-formatted man page + * Fixed recognition of Python scripts having '#!/usr/bin/python' + as first line + * Fixed parsing of Fortran comment-to-end-of-line with no newline + before EOF [Debian] + * Fixed parsing of << [C/C++] + * Fixed parsing of fully-qualified type names [Java] + * Fixed handling of lone carriage-return characters in file * Tue Feb 06 2007 - schwab@suse.de - Update etags from CVS. * Tue Jan 09 2007 - schwab@suse.de diff --git a/etags-17.26.tar.bz2 b/etags-17.26.tar.bz2 new file mode 100644 index 0000000..e96b5d8 --- /dev/null +++ b/etags-17.26.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:091f9b2004d9cdc2775517cf6c173b7a997026157e3d66ce560eb42b389c4b82 +size 48171 diff --git a/etags-17.26.tar.gz b/etags-17.26.tar.gz deleted file mode 100644 index 3b818b4..0000000 --- a/etags-17.26.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1c4d3c8408283e8ffe72f6a5c63625cc3489415754c8e76f433df08e4bc4d986 -size 55562