Commits September 2016

commits@lists.geany.org

1 participants
80 discussions

[geany/geany] bf0702: Use uctags implementation of keyword.c/h
by Jiří Techet 10 Sep '16

10 Sep '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Fri, 29 Jul 2016 14:55:07 UTC Commit: bf0702e2ec63009c731a6a65d40c89f5ac6695d2 https://github.com/geany/geany/commit/bf0702e2ec63009c731a6a65d40c89f5ac669… Log Message: ----------- Use uctags implementation of keyword.c/h Basically just the stuff I added to uctags to improve hashing of keywords. This patch drops some extra stuff from uctags we don't need at the moment and which would require changes in other files. Modified Paths: -------------- ctags/main/keyword.c ctags/main/keyword.h Modified: ctags/main/keyword.c 284 lines changed, 131 insertions(+), 153 deletions(-) =================================================================== @@ -1,43 +1,39 @@ /* -* -* Copyright (c) 1998-2001, Darren Hiebert +* Copyright (c) 1998-2002, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * Manages a keyword hash. */ /* * INCLUDE FILES */ -#include "general.h" /* must always come first */ +#include "general.h" /* must always come first */ #include <string.h> +#include "debug.h" #include "keyword.h" -#include "main.h" #include "options.h" - -/* -* MACROS -*/ -#define HASH_EXPONENT 7 /* must be less than 17 */ +#include "routines.h" +#include "main.h" /* * DATA DECLARATIONS */ typedef struct sHashEntry { - struct sHashEntry *next; - const char *string; - langType language; - int value; + struct sHashEntry *next; + const char *string; + langType language; + int value; } hashEntry; /* * DATA DEFINITIONS */ -static const unsigned int TableSize = 1 << HASH_EXPONENT; +static const unsigned int TableSize = 2039; /* prime */ static hashEntry **HashTable = NULL; /* @@ -46,71 +42,61 @@ static hashEntry **HashTable = NULL; static hashEntry **getHashTable (void) { - static boolean allocated = FALSE; + static boolean allocated = FALSE; - if (! allocated) - { - unsigned int i; + if (! allocated) + { + unsigned int i; - HashTable = xMalloc (TableSize, hashEntry*); + HashTable = xMalloc (TableSize, hashEntry*); - for (i = 0 ; i < TableSize ; ++i) - HashTable [i] = NULL; + for (i = 0 ; i < TableSize ; ++i) + HashTable [i] = NULL; - allocated = TRUE; - } - return HashTable; + allocated = TRUE; + } + return HashTable; } static hashEntry *getHashTableEntry (unsigned long hashedValue) { - hashEntry **const table = getHashTable (); - hashEntry *entry; + hashEntry **const table = getHashTable (); + hashEntry *entry; - Assert (hashedValue < TableSize); - entry = table [hashedValue]; + Assert (hashedValue < TableSize); + entry = table [hashedValue]; - return entry; + return entry; } -static unsigned long hashValue (const char *const string) +static unsigned int hashValue (const char *const string, langType language) { - unsigned long value = 0; - const unsigned char *p; - - Assert (string != NULL); - - /* We combine the various words of the multiword key using the method - * described on page 512 of Vol. 3 of "The Art of Computer Programming". - */ - for (p = (const unsigned char *) string ; *p != '\0' ; ++p) - { - value <<= 1; - if (value & 0x00000100L) - value = (value & 0x000000ffL) + 1L; - value ^= *p; - } - /* Algorithm from page 509 of Vol. 3 of "The Art of Computer Programming" - * Treats "value" as a 16-bit integer plus 16-bit fraction. - */ - value *= 40503L; /* = 2^16 * 0.6180339887 ("golden ratio") */ - value &= 0x0000ffffL; /* keep fractional part */ - value >>= 16 - HASH_EXPONENT; /* scale up by hash size and move down */ - - return value; + const signed char *p; + unsigned int h = 5381; + + Assert (string != NULL); + + /* "djb" hash as used in g_str_hash() in glib */ + for (p = (const signed char *)string; *p != '\0'; p++) + h = (h << 5) + h + *p; + + /* consider language as an extra "character" and add it to the hash */ + h = (h << 5) + h + language; + + return h; } -static hashEntry *newEntry (const char *const string, - langType language, int value) +static hashEntry *newEntry ( + const char *const string, langType language, int value) { - hashEntry *const entry = xMalloc (1, hashEntry); + hashEntry *const entry = xMalloc (1, hashEntry); - entry->next = NULL; - entry->string = string; - entry->language = language; - entry->value = value; + entry->next = NULL; + entry->string = string; + entry->language = language; + entry->value = value; - return entry; + return entry; } /* Note that it is assumed that a "value" of zero means an undefined keyword @@ -120,135 +106,127 @@ static hashEntry *newEntry (const char *const string, */ extern void addKeyword (const char *const string, langType language, int value) { - const unsigned long hashedValue = hashValue (string); - hashEntry *tableEntry = getHashTableEntry (hashedValue); - hashEntry *entry = tableEntry; - -#ifdef TM_DEBUG - fprintf(stderr, "Adding keyword %s to language %d\n", string, language); -#endif - if (entry == NULL) - { - hashEntry **const table = getHashTable (); - hashEntry *new = newEntry (string, language, value); + const unsigned int index = hashValue (string, language) % TableSize; + hashEntry *entry = getHashTableEntry (index); - table [hashedValue] = new; - } - else - { - hashEntry *prev = NULL; - - while (entry != NULL) + if (entry == NULL) { - if (language == entry->language && - strcmp (string, entry->string) == 0) - { - Assert (("Already in table" == NULL)); - } - prev = entry; - entry = entry->next; + hashEntry **const table = getHashTable (); + table [index] = newEntry (string, language, value); } - if (entry == NULL) + else { - hashEntry *new = newEntry (string, language, value); - - Assert (prev != NULL); - prev->next = new; + hashEntry *prev = NULL; + + while (entry != NULL) + { + if (language == entry->language && + strcmp (string, entry->string) == 0) + { + Assert (("Already in table" == NULL)); + } + prev = entry; + entry = entry->next; + } + if (entry == NULL) + { + Assert (prev != NULL); + prev->next = newEntry (string, language, value); + } } - } } extern int lookupKeyword (const char *const string, langType language) { - const unsigned long hashedValue = hashValue (string); - hashEntry *entry = getHashTableEntry (hashedValue); - int value = -1; + const unsigned int index = hashValue (string, language) % TableSize; + hashEntry *entry = getHashTableEntry (index); + int result = -1; - while (entry != NULL) - { - if (language == entry->language && strcmp (string, entry->string) == 0) + while (entry != NULL) { - value = entry->value; - break; + if (language == entry->language && strcmp (string, entry->string) == 0) + { + result = entry->value; + break; + } + entry = entry->next; } - entry = entry->next; - } - return value; + return result; } extern void freeKeywordTable (void) { - if (HashTable != NULL) - { - unsigned int i; - - for (i = 0 ; i < TableSize ; ++i) + if (HashTable != NULL) { - hashEntry *entry = HashTable [i]; - - while (entry != NULL) - { - hashEntry *next = entry->next; - eFree (entry); - entry = next; - } + unsigned int i; + + for (i = 0 ; i < TableSize ; ++i) + { + hashEntry *entry = HashTable [i]; + + while (entry != NULL) + { + hashEntry *next = entry->next; + eFree (entry); + entry = next; + } + } + eFree (HashTable); } - eFree (HashTable); - } } #ifdef TM_DEBUG static void printEntry (const hashEntry *const entry) { - printf (" %-15s %-7s\n", entry->string, getLanguageName (entry->language)); + printf (" %-15s %-7s\n", entry->string, getLanguageName (entry->language)); } static unsigned int printBucket (const unsigned int i) { - hashEntry **const table = getHashTable (); - hashEntry *entry = table [i]; - unsigned int measure = 1; - boolean first = TRUE; - - printf ("%2d:", i); - if (entry == NULL) - printf ("\n"); - else while (entry != NULL) - { - if (! first) - printf (" "); - else + hashEntry **const table = getHashTable (); + hashEntry *entry = table [i]; + unsigned int measure = 1; + boolean first = TRUE; + + printf ("%2d:", i); + if (entry == NULL) + printf ("\n"); + else while (entry != NULL) { - printf (" "); - first = FALSE; + if (! first) + printf (" "); + else + { + printf (" "); + first = FALSE; + } + printEntry (entry); + entry = entry->next; + measure = 2 * measure; } - printEntry (entry); - entry = entry->next; - measure = 2 * measure; - } - return measure - 1; + return measure - 1; } extern void printKeywordTable (void) { - unsigned long emptyBucketCount = 0; - unsigned long measure = 0; - unsigned int i; + unsigned long emptyBucketCount = 0; + unsigned long measure = 0; + unsigned int i; - for (i = 0 ; i < TableSize ; ++i) - { - const unsigned int pass = printBucket (i); + for (i = 0 ; i < TableSize ; ++i) + { + const unsigned int pass = printBucket (i); - measure += pass; - if (pass == 0) - ++emptyBucketCount; - } + measure += pass; + if (pass == 0) + ++emptyBucketCount; + } - printf ("spread measure = %ld\n", measure); - printf ("%ld empty buckets\n", emptyBucketCount); + printf ("spread measure = %ld\n", measure); + printf ("%ld empty buckets\n", emptyBucketCount); } #endif -/* vi:set tabstop=8 shiftwidth=4: */ +/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/main/keyword.h 15 lines changed, 7 insertions(+), 8 deletions(-) =================================================================== @@ -1,19 +1,18 @@ /* -* -* Copyright (c) 1998-2001, Darren Hiebert +* Copyright (c) 1998-2002, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * External interface to keyword.c */ -#ifndef _KEYWORD_H -#define _KEYWORD_H +#ifndef CTAGS_MAIN_KEYWORD_H +#define CTAGS_MAIN_KEYWORD_H /* * INCLUDE FILES */ -#include "general.h" /* must always come first */ +#include "general.h" /* must always come first */ #include "parse.h" @@ -27,6 +26,6 @@ extern void freeKeywordTable (void); extern void printKeywordTable (void); #endif -#endif /* _KEYWORD_H */ +#endif /* CTAGS_MAIN_KEYWORD_H */ -/* vi:set tabstop=8 shiftwidth=4: */ +/* vi:set tabstop=4 shiftwidth=4: */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 7b9d0d: Make parser includes closer to uctags and sync parser license header
by Jiří Techet 10 Sep '16

10 Sep '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 28 Jul 2016 21:55:56 UTC Commit: 7b9d0dd83ce0874593758a620a9b9a2d256503c1 https://github.com/geany/geany/commit/7b9d0dd83ce0874593758a620a9b9a2d25650… Log Message: ----------- Make parser includes closer to uctags and sync parser license header Adds (currently empty) debug.h, routines.h and xtag.h and uses them at the same places like uctags. Modified Paths: -------------- ctags/Makefile.am ctags/main/debug.h ctags/main/routines.h ctags/main/xtag.h ctags/parsers/asm.c ctags/parsers/basic.c ctags/parsers/c.c ctags/parsers/cobol.c ctags/parsers/css.c ctags/parsers/diff.c ctags/parsers/erlang.c ctags/parsers/fortran.c ctags/parsers/go.c ctags/parsers/html.c ctags/parsers/jscript.c ctags/parsers/json.c ctags/parsers/lua.c ctags/parsers/make.c ctags/parsers/objc.c ctags/parsers/pascal.c ctags/parsers/perl.c ctags/parsers/php.c ctags/parsers/python.c ctags/parsers/r.c ctags/parsers/ruby.c ctags/parsers/rust.c ctags/parsers/sh.c ctags/parsers/sql.c ctags/parsers/tcl.c ctags/parsers/verilog.c ctags/parsers/vhdl.c Modified: ctags/Makefile.am 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -57,6 +57,7 @@ libctags_la_SOURCES = \ main/args.h \ main/ctags.c \ main/ctags.h \ + main/debug.h \ main/entry.c \ main/entry.h \ main/general.h \ @@ -77,10 +78,12 @@ libctags_la_SOURCES = \ main/parsers.h \ main/read.c \ main/read.h \ + main/routines.h \ main/sort.c \ main/sort.h \ main/strlist.c \ main/strlist.h \ main/vstring.c \ main/vstring.h \ + main/xtag.h \ $(parsers) Modified: ctags/main/debug.h 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: ctags/main/routines.h 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: ctags/main/xtag.h 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: ctags/parsers/asm.c 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -2,7 +2,7 @@ * Copyright (c) 2000-2003, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * This module contains functions for generating tags for assembly language * files. @@ -15,9 +15,11 @@ #include <string.h> +#include "debug.h" #include "keyword.h" #include "parse.h" #include "read.h" +#include "routines.h" #include "main.h" #include "vstring.h" Modified: ctags/parsers/basic.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -2,7 +2,7 @@ * Copyright (c) 2000-2006, Darren Hiebert, Elias Pschernig * * This source code is released for free distribution under the terms of the - * GNU General Public License. + * GNU General Public License version 2 or (at your option) any later version. * * This module contains functions for generating tags for BlitzBasic * (BlitzMax), PureBasic and FreeBasic language files. For now, this is kept @@ -19,6 +19,7 @@ #include "parse.h" #include "read.h" +#include "routines.h" #include "vstring.h" /* Modified: ctags/parsers/c.c 10 lines changed, 6 insertions(+), 4 deletions(-) =================================================================== @@ -1,11 +1,10 @@ /* -* -* Copyright (c) 1996-2001, Darren Hiebert +* Copyright (c) 1996-2003, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * -* This module contains functions for parsing and scanning C, C++, D and Java +* This module contains functions for parsing and scanning C, C++, C#, D and Java * source files. */ @@ -17,6 +16,7 @@ #include <string.h> #include <setjmp.h> +#include "debug.h" #include "mio.h" #include "entry.h" #include "get.h" @@ -25,6 +25,8 @@ #include "options.h" #include "parse.h" #include "read.h" +#include "routines.h" +#include "xtag.h" /* * MACROS Modified: ctags/parsers/cobol.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -2,7 +2,7 @@ * Copyright (c) 2000-2003, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * This module contains functions for generating tags for COBOL language * files. @@ -13,6 +13,7 @@ */ #include "general.h" /* must always come first */ #include "parse.h" +#include "routines.h" /* * FUNCTION DEFINITIONS Modified: ctags/parsers/css.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -2,6 +2,7 @@ * css.c * Token-based parser for CSS definitions * Author - Colomban Wendling <colomban(a)geany.org> + * License GPL-2 **************************************************************************/ #include "general.h" @@ -11,7 +12,7 @@ #include "entry.h" #include "parse.h" #include "read.h" - +#include "routines.h" typedef enum eCssKinds { K_CLASS, K_SELECTOR, K_ID Modified: ctags/parsers/diff.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -3,7 +3,7 @@ * Copyright (c) 2000-2001, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * This module contains functions for generating tags for diff files (based on Sh parser). */ @@ -17,6 +17,7 @@ #include <string.h> #include "parse.h" +#include "routines.h" #include "read.h" #include "vstring.h" Modified: ctags/parsers/erlang.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -2,7 +2,7 @@ * Copyright (c) 2003, Brent Fulgham <bfulgham(a)debian.org> * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * This module contains functions for generating tags for Erlang language * files. Some of the parsing constructs are based on the Emacs 'etags' @@ -18,7 +18,7 @@ #include "entry.h" #include "options.h" #include "read.h" -// #include "routines.h" +#include "routines.h" #include "vstring.h" /* Modified: ctags/parsers/fortran.c 9 lines changed, 6 insertions(+), 3 deletions(-) =================================================================== @@ -2,7 +2,7 @@ * Copyright (c) 1998-2003, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * This module contains functions for generating tags for Fortran language * files. @@ -11,21 +11,24 @@ /* * INCLUDE FILES */ -#include "general.h" /* must always come first */ +#include "general.h" /* must always come first */ #include <string.h> #include <limits.h> -#include <ctype.h> /* to define tolower () */ +#include <ctype.h> /* to define tolower () */ #include <setjmp.h> +#include "debug.h" #include "mio.h" #include "entry.h" #include "keyword.h" #include "main.h" #include "options.h" #include "parse.h" #include "read.h" +#include "routines.h" #include "vstring.h" +#include "xtag.h" /* * MACROS Modified: ctags/parsers/go.c 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -1,14 +1,20 @@ /* +* This source code is released for free distribution under the terms of the +* GNU General Public License version 2 or (at your option) any later version. +* * INCLUDE FILES */ #include "general.h" /* must always come first */ +#include "debug.h" #include "entry.h" #include "keyword.h" #include "read.h" #include "main.h" +#include "routines.h" #include "vstring.h" #include "options.h" +#include "xtag.h" /* * MACROS Modified: ctags/parsers/html.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -2,7 +2,7 @@ * Copyright (c) 2003, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * This module contains functions for generating tags for HTML language * files. @@ -13,6 +13,7 @@ */ #include "general.h" /* must always come first */ #include "parse.h" +#include "routines.h" /* * FUNCTION DEFINITIONS Modified: ctags/parsers/jscript.c 6 lines changed, 5 insertions(+), 1 deletions(-) =================================================================== @@ -2,11 +2,13 @@ * Copyright (c) 2003, Darren Hiebert * * This source code is released for free distribution under the terms of the - * GNU General Public License. + * GNU General Public License version 2 or (at your option) any later version. * * This module contains functions for generating tags for JavaScript language * files. * + * Reference: http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-262.pdf + * * This is a good reference for different forms of the function statement: * http://www.permadi.com/tutorial/jsFunc/ * Another good reference: @@ -23,11 +25,13 @@ #include <stdio.h> #endif +#include "debug.h" #include "mio.h" #include "keyword.h" #include "parse.h" #include "read.h" #include "main.h" +#include "routines.h" #include "vstring.h" /* Modified: ctags/parsers/json.c 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -2,7 +2,7 @@ * Copyright (c) 2014, Colomban Wendling <colomban(a)geany.org> * * This source code is released for free distribution under the terms of the - * GNU General Public License. + * GNU General Public License version 2 or (at your option) any later version. */ /* * This module contains functions for generating tags for JSON files. @@ -17,11 +17,13 @@ #include "general.h" #include <string.h> +#include "debug.h" #include "main.h" #include "entry.h" #include "keyword.h" #include "parse.h" #include "read.h" +#include "routines.h" #include "vstring.h" typedef enum { Modified: ctags/parsers/lua.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -2,7 +2,7 @@ * Copyright (c) 2000-2001, Max Ischenko <mfi(a)ukr.net>. * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * This module contains functions for generating tags for Lua language. */ @@ -16,6 +16,7 @@ #include "parse.h" #include "read.h" +#include "routines.h" #include "vstring.h" /* Modified: ctags/parsers/make.c 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -2,7 +2,7 @@ * Copyright (c) 2000-2005, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * This module contains functions for generating tags for makefiles. */ @@ -19,7 +19,9 @@ #include "options.h" #include "parse.h" #include "read.h" +#include "routines.h" #include "vstring.h" +#include "xtag.h" /* * DATA DEFINITIONS Modified: ctags/parsers/objc.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -3,7 +3,7 @@ * Copyright (c) 2010, Vincent Berthoux * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * This module contains functions for generating tags for Objective C * language files. @@ -19,6 +19,7 @@ #include "entry.h" #include "options.h" #include "read.h" +#include "routines.h" #include "vstring.h" /* To get rid of unused parameter warning in Modified: ctags/parsers/pascal.c 5 lines changed, 3 insertions(+), 2 deletions(-) =================================================================== @@ -2,7 +2,7 @@ * Copyright (c) 2001-2002, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * This module contains functions for generating tags for the Pascal language, * including some extensions for Object Pascal. @@ -11,14 +11,15 @@ /* * INCLUDE FILES */ -#include "general.h" /* must always come first */ +#include "general.h" /* must always come first */ #include <string.h> #include "entry.h" #include "parse.h" #include "read.h" #include "main.h" +#include "routines.h" #include "vstring.h" /* Modified: ctags/parsers/perl.c 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -2,7 +2,7 @@ * Copyright (c) 2000-2003, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * This module contains functions for generating tags for PERL language * files. @@ -12,14 +12,17 @@ * INCLUDE FILES */ #include "general.h" /* must always come first */ +#include "debug.h" #include <string.h> #include "entry.h" #include "options.h" #include "read.h" #include "main.h" +#include "routines.h" #include "vstring.h" +#include "xtag.h" #define TRACE_PERL_C 0 #define TRACE if (TRACE_PERL_C) printf("perl.c:%d: ", __LINE__), printf Modified: ctags/parsers/php.c 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -2,7 +2,7 @@ * Copyright (c) 2013, Colomban Wendling <ban(a)herbesfolles.org> * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * This module contains code for generating tags for the PHP scripting * language. @@ -18,6 +18,8 @@ #include "vstring.h" #include "keyword.h" #include "entry.h" +#include "routines.h" +#include "debug.h" #define SCOPE_SEPARATOR "::" Modified: ctags/parsers/python.c 7 lines changed, 5 insertions(+), 2 deletions(-) =================================================================== @@ -2,7 +2,7 @@ * Copyright (c) 2000-2003, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * This module contains functions for generating tags for Python language * files. @@ -15,11 +15,14 @@ #include <string.h> #include "entry.h" +#include "nestlevel.h" #include "options.h" #include "read.h" #include "main.h" #include "vstring.h" -#include "nestlevel.h" +#include "routines.h" +#include "debug.h" +#include "xtag.h" /* * DATA DEFINITIONS Modified: ctags/parsers/r.c 7 lines changed, 4 insertions(+), 3 deletions(-) =================================================================== @@ -2,7 +2,7 @@ * Copyright (c) 2003-2004, Ascher Stefan <stievie(a)utanet.at> * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * This module contains functions for generating tags for R language files. * R is a programming language for statistical computing. @@ -12,11 +12,12 @@ /* * INCLUDE FILES */ -#include "general.h" /* must always come first */ +#include "general.h" /* must always come first */ #include <string.h> -#include <ctype.h> /* to define isalpha(), isalnum(), isspace() */ +#include <ctype.h> /* to define isalpha(), isalnum(), isspace() */ +#include "debug.h" #include "entry.h" #include "read.h" #include "vstring.h" Modified: ctags/parsers/ruby.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -17,10 +17,12 @@ #include <string.h> +#include "debug.h" #include "entry.h" #include "parse.h" #include "nestlevel.h" #include "read.h" +#include "routines.h" #include "vstring.h" /* Modified: ctags/parsers/rust.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,7 @@ /* * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * This module contains functions for generating tags for Rust files. */ @@ -19,6 +19,7 @@ #include "entry.h" #include "options.h" #include "read.h" +#include "routines.h" #include "vstring.h" /* Modified: ctags/parsers/sh.c 6 lines changed, 4 insertions(+), 2 deletions(-) =================================================================== @@ -2,7 +2,7 @@ * Copyright (c) 2000-2002, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * This module contains functions for generating tags for scripts for the * Bourne shell (and its derivatives, the Korn and Z shells). @@ -11,14 +11,16 @@ /* * INCLUDE FILES */ -#include "general.h" /* must always come first */ +#include "general.h" /* must always come first */ #include <string.h> #include "parse.h" #include "read.h" #include "main.h" +#include "routines.h" #include "vstring.h" +#include "xtag.h" /* * DATA DEFINITIONS Modified: ctags/parsers/sql.c 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -1,10 +1,8 @@ /* - * $Id$ - * * Copyright (c) 2002-2003, Darren Hiebert * * This source code is released for free distribution under the terms of the - * GNU General Public License. + * GNU General Public License version 2 or (at your option) any later version. * * This module contains functions for generating tags for PL/SQL language * files. @@ -21,11 +19,13 @@ #include <stdio.h> #endif +#include "debug.h" #include "entry.h" #include "keyword.h" #include "parse.h" #include "main.h" #include "read.h" +#include "routines.h" #include "vstring.h" /* Modified: ctags/parsers/tcl.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -2,7 +2,7 @@ * Copyright (c) 2000-2003, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * This module contains functions for generating tags for TCL scripts. */ @@ -16,6 +16,7 @@ #include "parse.h" #include "read.h" +#include "routines.h" #include "vstring.h" /* Modified: ctags/parsers/verilog.c 11 lines changed, 7 insertions(+), 4 deletions(-) =================================================================== @@ -1,12 +1,12 @@ /* * Copyright (c) 2003, Darren Hiebert -* +* * This source code is released for free distribution under the terms of the -* GNU General Public License. -* +* GNU General Public License version 2 or (at your option) any later version. +* * This module contains functions for generating tags for the Verilog HDL * (Hardware Description Language). -* +* * Language definition documents: * http://www.eg.bucknell.edu/~cs320/verilog/verilog-manual.html * http://www.sutherland-hdl.com/on-line_ref_guide/vlog_ref_top.html @@ -22,11 +22,14 @@ #include <string.h> #include <setjmp.h> +#include "debug.h" #include "keyword.h" #include "parse.h" #include "read.h" #include "vstring.h" #include "get.h" +#include "routines.h" +#include "xtag.h" /* * DATA DECLARATIONS Modified: ctags/parsers/vhdl.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -19,9 +19,11 @@ #include <string.h> #include <setjmp.h> +#include "debug.h" #include "keyword.h" #include "parse.h" #include "read.h" +#include "routines.h" #include "vstring.h" /* -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 001c7f: Move keywordTable definition to parse.h and use it for all parsers
by Jiří Techet 10 Sep '16

10 Sep '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 28 Jul 2016 21:56:05 UTC Commit: 001c7f65e485a223530e23146604d84fa867a9aa https://github.com/geany/geany/commit/001c7f65e485a223530e23146604d84fa867a… Log Message: ----------- Move keywordTable definition to parse.h and use it for all parsers Modified Paths: -------------- ctags/main/parse.h ctags/parsers/asm.c ctags/parsers/fortran.c ctags/parsers/go.c ctags/parsers/jscript.c ctags/parsers/objc.c ctags/parsers/php.c ctags/parsers/sql.c ctags/parsers/verilog.c ctags/parsers/vhdl.c Modified: ctags/main/parse.h 5 lines changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -46,6 +46,11 @@ typedef struct sKindOption { } kindOption; typedef struct { + const char *name; + const int id; +} keywordTable; + +typedef struct { /* defined by parser */ char* name; /* name of language */ kindOption* kinds; /* tag kinds handled by parser */ Modified: ctags/parsers/asm.c 11 lines changed, 3 insertions(+), 8 deletions(-) =================================================================== @@ -52,11 +52,6 @@ typedef enum { } opKeyword; typedef struct { - const char *operator; - opKeyword keyword; -} asmKeyword; - -typedef struct { opKeyword keyword; AsmKind kind; } opKind; @@ -73,7 +68,7 @@ static kindOption AsmKinds [] = { { TRUE, 't', "type", "types (structs and records)" } }; -static const asmKeyword AsmKeywords [] = { +static const keywordTable AsmKeywords [] = { { "align", OP_ALIGN }, { "endmacro", OP_ENDMACRO }, { "endm", OP_ENDM }, @@ -121,8 +116,8 @@ static void buildAsmKeywordHash (void) size_t i; for (i = 0 ; i < count ; ++i) { - const asmKeyword* const p = AsmKeywords + i; - addKeyword (p->operator, Lang_asm, (int) p->keyword); + const keywordTable* const p = AsmKeywords + i; + addKeyword (p->name, Lang_asm, (int) p->id); } } Modified: ctags/parsers/fortran.c 12 lines changed, 2 insertions(+), 10 deletions(-) =================================================================== @@ -144,14 +144,6 @@ typedef enum eKeywordId { KEYWORD_while } keywordId; -/* Used to determine whether keyword is valid for the token language and - * what its ID is. - */ -typedef struct sKeywordDesc { - const char *name; - keywordId id; -} keywordDesc; - typedef enum eTokenType { TOKEN_UNDEFINED, TOKEN_COMMA, @@ -244,7 +236,7 @@ static kindOption FortranKinds [TAG_COUNT] = { * http://h18009.www1.hp.com/fortran/docs/lrm/dflrm.htm */ -static const keywordDesc FortranKeywordTable [] = { +static const keywordTable FortranKeywordTable [] = { /* keyword keyword ID */ { "allocatable", KEYWORD_allocatable }, { "assignment", KEYWORD_assignment }, @@ -431,7 +423,7 @@ static void buildFortranKeywordHash (const langType language) size_t i; for (i = 0 ; i < count ; ++i) { - const keywordDesc* const p = &FortranKeywordTable [i]; + const keywordTable* const p = &FortranKeywordTable [i]; addKeyword (p->name, language, (int) p->id); } } Modified: ctags/parsers/go.c 12 lines changed, 2 insertions(+), 10 deletions(-) =================================================================== @@ -41,14 +41,6 @@ typedef enum eKeywordId { KEYWORD_chan } keywordId; -/* Used to determine whether keyword is valid for the current language and - * what its ID is. - */ -typedef struct sKeywordDesc { - const char *name; - keywordId id; -} keywordDesc; - typedef enum eTokenType { TOKEN_NONE = -1, // Token not important for top-level Go parsing @@ -109,7 +101,7 @@ static kindOption GoKinds[] = { {TRUE, 'm', "member", "struct members"} }; -static keywordDesc GoKeywordTable[] = { +static const keywordTable GoKeywordTable[] = { {"package", KEYWORD_package}, {"import", KEYWORD_import}, {"const", KEYWORD_const}, @@ -147,7 +139,7 @@ static void initialize (const langType language) Lang_go = language; for (i = 0; i < count; ++i) { - const keywordDesc *const p = &GoKeywordTable[i]; + const keywordTable *const p = &GoKeywordTable[i]; addKeyword (p->name, language, (int) p->id); } } Modified: ctags/parsers/jscript.c 12 lines changed, 2 insertions(+), 10 deletions(-) =================================================================== @@ -76,14 +76,6 @@ typedef enum eKeywordId { KEYWORD_return } keywordId; -/* Used to determine whether keyword is valid for the token language and - * what its ID is. - */ -typedef struct sKeywordDesc { - const char *name; - keywordId id; -} keywordDesc; - typedef enum eTokenType { TOKEN_UNDEFINED, TOKEN_EOF, @@ -147,7 +139,7 @@ static kindOption JsKinds [] = { { TRUE, 'v', "variable", "global variables" } }; -static const keywordDesc JsKeywordTable [] = { +static const keywordTable JsKeywordTable [] = { /* keyword keyword ID */ { "function", KEYWORD_function }, { "Function", KEYWORD_capital_function }, @@ -195,7 +187,7 @@ static void buildJsKeywordHash (void) size_t i; for (i = 0 ; i < count ; ++i) { - const keywordDesc* const p = &JsKeywordTable [i]; + const keywordTable* const p = &JsKeywordTable [i]; addKeyword (p->name, Lang_js, (int) p->id); } } Modified: ctags/parsers/objc.c 10 lines changed, 2 insertions(+), 8 deletions(-) =================================================================== @@ -111,13 +111,7 @@ typedef enum { typedef objcKeyword objcToken; -typedef struct sOBjcKeywordDesc { - const char *name; - objcKeyword id; -} objcKeywordDesc; - - -static const objcKeywordDesc objcKeywordTable[] = { +static const keywordTable objcKeywordTable[] = { {"typedef", ObjcTYPEDEF}, {"struct", ObjcSTRUCT}, {"enum", ObjcENUM}, @@ -152,7 +146,7 @@ typedef struct _lexingState { static void initKeywordHash (void) { - const size_t count = sizeof (objcKeywordTable) / sizeof (objcKeywordDesc); + const size_t count = sizeof (objcKeywordTable) / sizeof (keywordTable); size_t i; for (i = 0; i < count; ++i) Modified: ctags/parsers/php.c 9 lines changed, 2 insertions(+), 7 deletions(-) =================================================================== @@ -125,12 +125,7 @@ static kindOption PhpKinds[COUNT_KIND] = { { TRUE, 'v', "variable", "variables" } }; -typedef struct { - const char *name; - keywordId id; -} keywordDesc; - -static const keywordDesc PhpKeywordTable[] = { +static const keywordTable PhpKeywordTable[] = { /* keyword keyword ID */ { "abstract", KEYWORD_abstract }, { "and", KEYWORD_and }, @@ -249,7 +244,7 @@ static void buildPhpKeywordHash (const langType language) size_t i; for (i = 0; i < count ; i++) { - const keywordDesc* const p = &PhpKeywordTable[i]; + const keywordTable* const p = &PhpKeywordTable[i]; addKeyword (p->name, language, (int) p->id); } } Modified: ctags/parsers/sql.c 13 lines changed, 2 insertions(+), 11 deletions(-) =================================================================== @@ -130,15 +130,6 @@ typedef enum eKeywordId { KEYWORD_go } keywordId; -/* - * Used to determine whether keyword is valid for the token language and - * what its ID is. - */ -typedef struct sKeywordDesc { - const char *name; - keywordId id; -} keywordDesc; - typedef enum eTokenType { TOKEN_UNDEFINED, TOKEN_BLOCK_LABEL_BEGIN, @@ -236,7 +227,7 @@ static kindOption SqlKinds [] = { { TRUE, 'z', "mlprop", "MobiLink Properties " } }; -static const keywordDesc SqlKeywordTable [] = { +static const keywordTable SqlKeywordTable [] = { /* keyword keyword ID */ { "as", KEYWORD_is }, { "is", KEYWORD_is }, @@ -412,7 +403,7 @@ static void buildSqlKeywordHash (void) size_t i; for (i = 0 ; i < count ; ++i) { - const keywordDesc* const p = &SqlKeywordTable [i]; + const keywordTable* const p = &SqlKeywordTable [i]; addKeyword (p->name, Lang_sql, (int) p->id); } } Modified: ctags/parsers/verilog.c 11 lines changed, 3 insertions(+), 8 deletions(-) =================================================================== @@ -48,11 +48,6 @@ typedef enum { K_TASK } verilogKind; -typedef struct { - const char *keyword; - verilogKind kind; -} keywordAssoc; - /* * DATA DEFINITIONS */ @@ -71,7 +66,7 @@ static kindOption VerilogKinds [] = { { TRUE, 't', "task", "tasks" } }; -static keywordAssoc VerilogKeywordTable [] = { +static keywordTable VerilogKeywordTable [] = { { "`define", K_CONSTANT }, { "event", K_EVENT }, { "function", K_FUNCTION }, @@ -112,8 +107,8 @@ static void initialize (const langType language) Lang_verilog = language; for (i = 0 ; i < count ; ++i) { - const keywordAssoc* const p = &VerilogKeywordTable [i]; - addKeyword (p->keyword, language, (int) p->kind); + const keywordTable* const p = &VerilogKeywordTable [i]; + addKeyword (p->name, language, (int) p->id); } } Modified: ctags/parsers/vhdl.c 11 lines changed, 3 insertions(+), 8 deletions(-) =================================================================== @@ -50,11 +50,6 @@ typedef enum { K_ALIAS } vhdlKind; -typedef struct { - const char *keyword; - vhdlKind kind; -} keywordAssoc; - /* * DATA DEFINITIONS */ @@ -84,7 +79,7 @@ static kindOption VhdlKinds [] = { { TRUE, 'A', "typedef", "alias" } }; -static keywordAssoc VhdlKeywordTable [] = { +static keywordTable VhdlKeywordTable [] = { { "constant", K_CONSTANT }, { "variable", K_VARIABLE }, { "type", K_TYPE }, @@ -117,8 +112,8 @@ static void initialize (const langType language) Lang_vhdl = language; for (i = 0 ; i < count ; ++i) { - const keywordAssoc* const p = &VhdlKeywordTable [i]; - addKeyword (p->keyword, language, (int) p->kind); + const keywordTable* const p = &VhdlKeywordTable [i]; + addKeyword (p->name, language, (int) p->id); } } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] f791e9: ctags: Rename Geany-specific tagEntryInfo::arglist to upstream's ::signature
by Jiří Techet 10 Sep '16

10 Sep '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 28 Jul 2016 19:06:59 UTC Commit: f791e91e1884a76754d88b7cd92fff4df3383947 https://github.com/geany/geany/commit/f791e91e1884a76754d88b7cd92fff4df3383… Log Message: ----------- ctags: Rename Geany-specific tagEntryInfo::arglist to upstream's ::signature Based on patch from Colomban Wendling. Modified Paths: -------------- ctags/main/entry.h ctags/main/get.c ctags/parsers/c.c ctags/parsers/go.c ctags/parsers/jscript.c ctags/parsers/pascal.c ctags/parsers/php.c ctags/parsers/powershell.c ctags/parsers/python.c ctags/parsers/rust.c src/tagmanager/tm_source_file.c Modified: ctags/main/entry.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -69,7 +69,7 @@ typedef struct sTagEntryInfo { const char* implementation; const char* inheritance; const char* scope [2]; /* value and key */ - const char *arglist; /* Argument list for functions and macros with arguments */ + const char *signature; /* Argument list for functions and macros with arguments */ const char *varType; } extensionFields; /* list of extension fields*/ } tagEntryInfo; Modified: ctags/main/get.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -317,12 +317,12 @@ static void makeDefineTag (const char *const name, boolean parameterized) e.kind = 'd'; if (parameterized) { - e.extensionFields.arglist = getArglistFromFilePos(getInputFilePosition() + e.extensionFields.signature = getArglistFromFilePos(getInputFilePosition() , e.name); } makeTagEntry (&e); if (parameterized) - free((char *) e.extensionFields.arglist); + free((char *) e.extensionFields.signature); } } Modified: ctags/parsers/c.c 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -1241,7 +1241,7 @@ static void addOtherFields (tagEntryInfo* const tag, const tagType type, if ((TRUE == st->gotArgs) && (TRUE == Option.extensionFields.argList) && ((TAG_FUNCTION == type) || (TAG_METHOD == type) || (TAG_PROTOTYPE == type))) { - tag->extensionFields.arglist = getArglistFromFilePos( + tag->extensionFields.signature = getArglistFromFilePos( tag->filePosition, tag->name); } break; @@ -1486,8 +1486,8 @@ static void makeTag (const tokenInfo *const token, if (NULL != TagEntryFunction) makeExtraTagEntry (type, &e, scope); vStringDelete (scope); - if (NULL != e.extensionFields.arglist) - free((char *) e.extensionFields.arglist); + if (NULL != e.extensionFields.signature) + free((char *) e.extensionFields.signature); } } Modified: ctags/parsers/go.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -543,7 +543,7 @@ static void makeTag (tokenInfo *const token, const goKind kind, e.kindName = GoKinds [kind].name; e.kind = GoKinds [kind].letter; if (argList) - e.extensionFields.arglist = argList; + e.extensionFields.signature = argList; if (varType) e.extensionFields.varType = varType; Modified: ctags/parsers/jscript.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -274,7 +274,7 @@ static void makeJsTag (tokenInfo *const token, const jsKind kind, vString *const if (c < 0x20 /* below space */ || c == 0x7F /* DEL */) signature->buffer[i] = ' '; } - e.extensionFields.arglist = vStringValue(signature); + e.extensionFields.signature = vStringValue(signature); } makeTagEntry (&e); Modified: ctags/parsers/pascal.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -47,7 +47,7 @@ static void createPascalTag (tagEntryInfo* const tag, tag->kindName = PascalKinds [kind].name; tag->kind = PascalKinds [kind].letter; - tag->extensionFields.arglist = arglist; + tag->extensionFields.signature = arglist; tag->extensionFields.varType = vartype; } else Modified: ctags/parsers/php.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -381,7 +381,7 @@ static void makeFunctionTag (const tokenInfo *const token, if (impl != IMPL_UNDEFINED) e.extensionFields.implementation = implToString (impl); if (arglist) - e.extensionFields.arglist = vStringValue (arglist); + e.extensionFields.signature = vStringValue (arglist); makeTagEntry (&e); } Modified: ctags/parsers/powershell.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -139,7 +139,7 @@ static void makeFunctionTag (const tokenInfo *const token, const vString *const initPowerShellEntry (&e, token, K_FUNCTION, access); if (arglist) - e.extensionFields.arglist = vStringValue (arglist); + e.extensionFields.signature = vStringValue (arglist); makeTagEntry (&e); } Modified: ctags/parsers/python.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -114,7 +114,7 @@ static void makeFunctionTag (vString *const function, tag.kindName = PythonKinds[K_FUNCTION].name; tag.kind = PythonKinds[K_FUNCTION].letter; - tag.extensionFields.arglist = arglist; + tag.extensionFields.signature = arglist; if (vStringLength (parent) > 0) { Modified: ctags/parsers/rust.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -447,7 +447,7 @@ static void addTag (vString* ident, const char* type, const char* arg_list, int tag.kindName = rustKinds[kind].name; tag.kind = rustKinds[kind].letter; - tag.extensionFields.arglist = arg_list; + tag.extensionFields.signature = arg_list; tag.extensionFields.varType = type; if (parent_kind != K_NONE) { Modified: src/tagmanager/tm_source_file.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -188,8 +188,8 @@ static gboolean init_tag(TMTag *tag, TMSourceFile *file, const tagEntryInfo *tag tag->local = tag_entry->isFileScope; tag->pointerOrder = 0; /* backward compatibility (use var_type instead) */ tag->line = tag_entry->lineNumber; - if (NULL != tag_entry->extensionFields.arglist) - tag->arglist = g_strdup(tag_entry->extensionFields.arglist); + if (NULL != tag_entry->extensionFields.signature) + tag->arglist = g_strdup(tag_entry->extensionFields.signature); if ((NULL != tag_entry->extensionFields.scope[1]) && (0 != tag_entry->extensionFields.scope[1][0])) tag->scope = g_strdup(tag_entry->extensionFields.scope[1]); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] ffa09b: ctags: Remove unused Geany-specific tagEntryInfo fields
by Jiří Techet 10 Sep '16

10 Sep '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 28 Jul 2016 18:57:03 UTC Commit: ffa09b0ae2d2486b80ac32da49584dacacb77e08 https://github.com/geany/geany/commit/ffa09b0ae2d2486b80ac32da49584dacacb77… Log Message: ----------- ctags: Remove unused Geany-specific tagEntryInfo fields Original patch from Colomban Wendling, only converted to apply to the new ctags location in the source tree. Modified Paths: -------------- ctags/main/entry.h Modified: ctags/main/entry.h 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -55,7 +55,6 @@ typedef struct sTagEntryInfo { boolean lineNumberEntry;/* pattern or line number entry */ unsigned long lineNumber; /* line number of tag */ MIOPos filePosition; /* file position of line containing tag */ - int bufferPosition; /* buffer position of line containing tag */ const char* language; /* language of source file */ boolean isFileScope; /* is tag visible only within source file? */ boolean isFileEntry; /* is this just an entry for a file name? */ @@ -74,7 +73,6 @@ typedef struct sTagEntryInfo { const char *varType; } extensionFields; /* list of extension fields*/ int type; - unsigned long seekPosition; } tagEntryInfo; /* -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 7068e7: ctags: Remove useless Geany-specific tagEntryInfo::type field
by Jiří Techet 10 Sep '16

10 Sep '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 28 Jul 2016 19:02:40 UTC Commit: 7068e7c89219c333632ba9ce700f2ac992e55ad8 https://github.com/geany/geany/commit/7068e7c89219c333632ba9ce700f2ac992e55… Log Message: ----------- ctags: Remove useless Geany-specific tagEntryInfo::type field Original patch from Colomban Wendling, only converted to apply to the new ctags location in the source tree. Modified Paths: -------------- ctags/main/entry.h ctags/parsers/c.c Modified: ctags/main/entry.h 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -72,7 +72,6 @@ typedef struct sTagEntryInfo { const char *arglist; /* Argument list for functions and macros with arguments */ const char *varType; } extensionFields; /* list of extension fields*/ - int type; } tagEntryInfo; /* Modified: ctags/parsers/c.c 9 lines changed, 4 insertions(+), 5 deletions(-) =================================================================== @@ -1248,10 +1248,10 @@ static void addOtherFields (tagEntryInfo* const tag, const tagType type, } } - if ((TAG_FIELD == tag->type) || (TAG_MEMBER == tag->type) || - (TAG_EXTERN_VAR == tag->type) || (TAG_TYPEDEF == tag->type) || - (TAG_VARIABLE == tag->type) || (TAG_METHOD == tag->type) || - (TAG_PROTOTYPE == tag->type) || (TAG_FUNCTION == tag->type)) + if ((TAG_FIELD == type) || (TAG_MEMBER == type) || + (TAG_EXTERN_VAR == type) || (TAG_TYPEDEF == type) || + (TAG_VARIABLE == type) || (TAG_METHOD == type) || + (TAG_PROTOTYPE == type) || (TAG_FUNCTION == type)) { if (((TOKEN_NAME == st->firstToken->type) || isDataTypeKeyword(st->firstToken)) && (0 != strcmp(vStringValue(st->firstToken->name), tag->name))) @@ -1475,7 +1475,6 @@ static void makeTag (const tokenInfo *const token, e.isFileScope = isFileScope; e.kindName = tagName (type); e.kind = tagLetter (type); - e.type = type; findScopeHierarchy (scope, st); addOtherFields (&e, type, token, st, scope); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 13ef73: Recognize .exp (Expect) files as Tcl
by Simon Marchi 10 Sep '16

10 Sep '16

Branch: refs/heads/master Author: Simon Marchi <simon.marchi(a)polymtl.ca> Committer: Matthew Brush <matt(a)geany.org> Date: Sat, 10 Sep 2016 03:52:01 UTC Commit: 13ef73d109ad6fba3189b2f69c3c88b3f30e9772 https://github.com/geany/geany/commit/13ef73d109ad6fba3189b2f69c3c88b3f30e9… Log Message: ----------- Recognize .exp (Expect) files as Tcl Expect [1] scripts filenames generally end in .exp, although the code itself is actually in Tcl. I find my self manually selecting Tcl quite often, so I think it would be nice if Geany would recognize it direcly as Tcl. [1] http://expect.sourceforge.net/ Signed-off-by: Simon Marchi <simon.marchi(a)polymtl.ca> Modified Paths: -------------- data/filetype_extensions.conf Modified: data/filetype_extensions.conf 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -61,7 +61,7 @@ Ruby=*.rb;*.rhtml;*.ruby;*.gemspec;Gemfile;rakefile;Rakefile; Scala=*.scala;*.scl; Sh=*.sh;configure;configure.in;configure.in.in;configure.ac;*.ksh;*.mksh;*.zsh;*.ash;*.bash;.bashrc;bash.bashrc;.bash_*;bash_*;*.m4;PKGBUILD;*profile; SQL=*.sql; -Tcl=*.tcl;*.tk;*.wish; +Tcl=*.tcl;*.tk;*.wish;*.exp; Txt2tags=*.t2t; Vala=*.vala;*.vapi; Verilog=*.v; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] a5a888: Merge pull request #1217 from b4n/filetypes/c-lexer-properties
by Colomban Wendling 07 Sep '16

07 Sep '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 07 Sep 2016 09:09:52 UTC Commit: a5a888c5e3c4be965907e1fa6671e3510815658d https://github.com/geany/geany/commit/a5a888c5e3c4be965907e1fa6671e35108156… Log Message: ----------- Merge pull request #1217 from b4n/filetypes/c-lexer-properties Inherit C lexer_properties in all filetypes inheriting C styles Modified Paths: -------------- data/filedefs/filetypes.CUDA.conf data/filedefs/filetypes.Genie.conf data/filedefs/filetypes.Graphviz.conf data/filedefs/filetypes.JSON.conf data/filedefs/filetypes.Scala.conf data/filedefs/filetypes.actionscript data/filedefs/filetypes.cpp data/filedefs/filetypes.cs data/filedefs/filetypes.ferite data/filedefs/filetypes.glsl data/filedefs/filetypes.go data/filedefs/filetypes.haxe data/filedefs/filetypes.java data/filedefs/filetypes.javascript data/filedefs/filetypes.vala Modified: data/filedefs/filetypes.CUDA.conf 4 lines changed, 1 insertions(+), 3 deletions(-) =================================================================== @@ -11,9 +11,7 @@ secondary=__device__ __global__ __shared__ __host__ __constant__ gridDim blockId # these are the Doxygen keywords docComment=a addindex addtogroup anchor arg attention author authors b brief bug c callergraph callgraph category cite class code cond copybrief copydetails copydoc copyright date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endinternal endlatexonly endlink endmanonly endmsc endrtfonly endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc mscfile n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref related relatedalso relates relatesalso remark remarks result return returns retval rtfonly sa section see short showinitializer since skip skipline snippet struct subpage subsection subsubsection tableofcontents test throw throws todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem -[lexer_properties] -styling.within.preprocessor=1 -lexer.cpp.track.preprocessor=0 +[lexer_properties=C] [settings] lexer_filetype=C Modified: data/filedefs/filetypes.Genie.conf 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -8,7 +8,7 @@ primary=abstract and array as assert async bool break byte case cast char class # these are the Doxygen and Valadoc keywords docComment=a addindex addtogroup anchor arg attention author authors b brief bug c callergraph callgraph category cite class code cond copybrief copydetails copydoc copyright date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endinternal endlatexonly endlink endmanonly endmsc endrtfonly endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup inheritDoc interface internal invariant latexonly li line link mainpage manonly memberof msc mscfile n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref related relatedalso relates relatesalso remark remarks result return returns retval rtfonly sa section see short showinitializer since skip skipline snippet struct subpage subsection subsubsection tableofcontents test throw throws todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem -[lexer_properties] +[lexer_properties=C] lexer.cpp.triplequoted.strings=1 [settings] Modified: data/filedefs/filetypes.Graphviz.conf 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -8,9 +8,9 @@ secondary=Damping K URL area arrowhead arrowsize arrowtail aspect bb bgcolor col # these are the Doxygen keywords docComment= -[lexer_properties] + +[lexer_properties=C] styling.within.preprocessor=0 -lexer.cpp.track.preprocessor=0 [settings] lexer_filetype=C Modified: data/filedefs/filetypes.JSON.conf 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -1,5 +1,7 @@ [styling=C] +[lexer_properties=C] + [keywords] primary=true false null Modified: data/filedefs/filetypes.Scala.conf 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -9,7 +9,7 @@ secondary=null super this AllRef Any AnyRef Array Attribute Elem Iterable List O # these are some doxygen keywords (incomplete) docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return see since struct throw todo typedef var version warning union -[lexer_properties] +[lexer_properties=C] lexer.cpp.triplequoted.strings=1 [settings] Modified: data/filedefs/filetypes.actionscript 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -7,6 +7,8 @@ primary=arguments break case catch class const continue default do dynamic each secondary=decodeURI decodeURIcomponent encodeURI encodeURIcomponent escape isFinite isNaN isXMLName parseFloat parseInt trace unescape classes=ArgumentError Array Boolean Class Date DefinitionError Error EvalError Function int Math NameSpace Null Number Object QName RangeError ReferenceError RegExp SecurityError String SyntaxError TypeError uint URIError Vector VerifyError void XML XMLList +[lexer_properties=C] + [settings] # default extension used when saving files extension=as Modified: data/filedefs/filetypes.cpp 4 lines changed, 1 insertions(+), 3 deletions(-) =================================================================== @@ -8,9 +8,7 @@ secondary= # these are the Doxygen keywords docComment=a addindex addtogroup anchor arg attention author authors b brief bug c callergraph callgraph category cite class code cond copybrief copydetails copydoc copyright date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endinternal endlatexonly endlink endmanonly endmsc endrtfonly endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc mscfile n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref related relatedalso relates relatesalso remark remarks result return returns retval rtfonly sa section see short showinitializer since skip skipline snippet struct subpage subsection subsubsection tableofcontents test throw throws todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem -[lexer_properties] -styling.within.preprocessor=1 -lexer.cpp.track.preprocessor=0 +[lexer_properties=C] [settings] lexer_filetype=C Modified: data/filedefs/filetypes.cs 4 lines changed, 1 insertions(+), 3 deletions(-) =================================================================== @@ -8,9 +8,7 @@ # these are some doxygen keywords (incomplete) docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return see since struct throw todo typedef var version warning union -[lexer_properties] -styling.within.preprocessor=1 -lexer.cpp.track.preprocessor=0 +[lexer_properties=C] [settings] lexer_filetype=C Modified: data/filedefs/filetypes.ferite 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -7,6 +7,8 @@ primary=false null self super true abstract alias and arguments attribute_missin types=boolean string number array object void XML Unix Sys String Stream Serialize RMI Posix Number Network Math FileSystem Console Array Regexp XSLT docComment=brief class declaration description end example extends function group implements modifies module namespace param protocol return return static type variable warning +[lexer_properties=C] + [settings] # default extension used when saving files extension=fe Modified: data/filedefs/filetypes.glsl 4 lines changed, 1 insertions(+), 3 deletions(-) =================================================================== @@ -8,9 +8,7 @@ secondary= # these are some doxygen keywords (incomplete) docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return returns see since struct throw todo typedef var version warning union -[lexer_properties] -styling.within.preprocessor=1 -lexer.cpp.track.preprocessor=0 +[lexer_properties=C] [settings] lexer_filetype=C Modified: data/filedefs/filetypes.go 3 lines changed, 1 insertions(+), 2 deletions(-) =================================================================== @@ -10,9 +10,8 @@ secondary=bool byte complex64 complex128 error float32 float64 int int8 int16 in # these are the Doxygen keywords docComment=a addindex addtogroup anchor arg attention author authors b brief bug c callergraph callgraph category cite class code cond copybrief copydetails copydoc copyright date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endinternal endlatexonly endlink endmanonly endmsc endrtfonly endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc mscfile n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref related relatedalso relates relatesalso remark remarks result return returns retval rtfonly sa section see short showinitializer since skip skipline snippet struct subpage subsection subsubsection tableofcontents test throw throws todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem -[lexer_properties] +[lexer_properties=C] lexer.cpp.backquoted.strings=1 -styling.within.preprocessor=1 lexer.cpp.allow.dollars=0 fold.preprocessor=0 Modified: data/filedefs/filetypes.haxe 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -7,7 +7,7 @@ primary=abstract break case catch class const continue trace do else enum extend secondary=Bool Dynamic Float Int null Void Enum String classes=Array ArrayAccess Class Date DateTools EReg Hash IntHash IntIter Iterable Iterator Lambda List Math Null Protected Reflect Std StringBuf StringTools Type UInt ValueType Xml XmlType -[lexer_properties] +[lexer_properties=C] # Haxe preprocessor has different directive than C, which the C lexer doesn't understand, so # we explicitly need not track the preprocessor at all. lexer.cpp.track.preprocessor=0 Modified: data/filedefs/filetypes.java 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -8,6 +8,7 @@ doccomment=author deprecated exception param return see serial serialData serialField since throws todo version typedefs= +[lexer_properties=C] [settings] # default extension used when saving files Modified: data/filedefs/filetypes.javascript 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -6,6 +6,8 @@ primary=break case catch class const continue default delete do each else extends false finally for function get if in Infinity instanceof let NaN new null return set static super switch this throw true try typeof undefined var void while with yield prototype secondary=Array Boolean Date Function Math Number Object String RegExp EvalError Error RangeError ReferenceError SyntaxError TypeError URIError constructor prototype decodeURI decodeURIComponent encodeURI encodeURIComponent eval isFinite isNaN parseFloat parseInt +[lexer_properties=C] + [settings] # default extension used when saving files extension=js Modified: data/filedefs/filetypes.vala 4 lines changed, 1 insertions(+), 3 deletions(-) =================================================================== @@ -8,9 +8,7 @@ primary=abstract as async base bool break callback case catch char class const c # these are the Doxygen and Valadoc keywords docComment=a addindex addtogroup anchor arg attention author authors b brief bug c callergraph callgraph category cite class code cond copybrief copydetails copydoc copyright date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endinternal endlatexonly endlink endmanonly endmsc endrtfonly endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup inheritDoc interface internal invariant latexonly li line link mainpage manonly memberof msc mscfile n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref related relatedalso relates relatesalso remark remarks result return returns retval rtfonly sa section see short showinitializer since skip skipline snippet struct subpage subsection subsubsection tableofcontents test throw throws todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem -[lexer_properties] -styling.within.preprocessor=1 -lexer.cpp.track.preprocessor=0 +[lexer_properties=C] lexer.cpp.triplequoted.strings=1 [settings] -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] db6f67: GTK: Fix autoc font size on GTK >= 3.21.0
by Colomban Wendling 07 Sep '16

07 Sep '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 07 Sep 2016 09:05:17 UTC Commit: db6f671135511bd107d18d512270503047eb19ac https://github.com/geany/geany/commit/db6f671135511bd107d18d512270503047eb1… Log Message: ----------- GTK: Fix autoc font size on GTK >= 3.21.0 GTK 3.21.0 fixed font size handling, leading to properly interpreting pixels and points in CSS declarations. However, as older versions incorrectly handled those, the code has to handle both behaviours. >From CSS, GTK < 3.21.0 actually applied the conversion to points, but incorrectly: 10px was used as 10pt, but 10pt was scaled up twice. So, assuming 96 DPI, it leads to: font-size | 3.20.0 | 3.21.0 | ----------|---------|---------| 10px | 13.33px | 10px | 10pt | 17.77px | 13.33px | So, we need to fix the code to accommodate for both (either scaling ourselves, or adapting the unit: I chose the second, simpler, option). See https://git.gnome.org/browse/gtk+/commit/?id=df08fc91bdc1d2e4c866122304fabe… X-Scintilla-Bug-URL: https://sourceforge.net/p/scintilla/bugs/1859/ X-Scintilla-Commit-ID: a4b5da8b3a0a05a1e67ba7eb08474106d421b088 Modified Paths: -------------- scintilla/gtk/PlatGTK.cxx Modified: scintilla/gtk/PlatGTK.cxx 10 lines changed, 9 insertions(+), 1 deletions(-) =================================================================== @@ -1494,7 +1494,15 @@ void ListBoxX::SetFont(Font &scint_font) { ssFontSetting << "font-family: " << pango_font_description_get_family(pfd) << "; "; ssFontSetting << "font-size:"; ssFontSetting << static_cast<double>(pango_font_description_get_size(pfd)) / PANGO_SCALE; - ssFontSetting << "px; "; + // On GTK < 3.21.0 the units are incorrectly parsed, so a font size in points + // need to use the "px" unit. Normally we only get fonts in points here, so + // don't bother to handle the case the font is actually in pixels on < 3.21.0. + if (gtk_check_version(3, 21, 0) != NULL || // on < 3.21.0 + pango_font_description_get_size_is_absolute(pfd)) { + ssFontSetting << "px; "; + } else { + ssFontSetting << "pt; "; + } ssFontSetting << "font-weight:"<< pango_font_description_get_weight(pfd) << "; "; ssFontSetting << "}"; gtk_css_provider_load_from_data(GTK_CSS_PROVIDER(cssProvider), -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 3f1408: Improve template command error message
by Enrico Tröger 07 Sep '16

07 Sep '16

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Wed, 07 Sep 2016 07:34:42 UTC Commit: 3f140861061ad0367f004a06caf391f1b9f94507 https://github.com/geany/geany/commit/3f140861061ad0367f004a06caf391f1b9f94… Log Message: ----------- Improve template command error message The previous string was a bit confusing what the placeholders could mean. There was an error in the German translation where the second placeholder was interpreted as template name instead of the error message. This change should make it more clear and also put the error message to the end of the string. Modified Paths: -------------- src/templates.c Modified: src/templates.c 5 lines changed, 3 insertions(+), 2 deletions(-) =================================================================== @@ -615,8 +615,9 @@ static gchar *run_command(const gchar *command, const gchar *file_name, } else { - g_warning(_("Cannot execute command \"%s\" from the template: %s. " - "Check the path in the template."), command, error->message); + g_warning(_("Cannot execute template command \"%s\". " + "Hint: incorrect paths in the command are a common cause of errors. " + "Error: %s."), command, error->message); g_error_free(error); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2016