Commits December 2018

commits@lists.geany.org

1 participants
130 discussions

[geany/geany] baa88d: Fix broken line breaking on existing lines
by elextr 28 Dec '18

28 Dec '18

Branch: refs/heads/elextr-patch-4 Author: elextr <elextr(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Fri, 28 Dec 2018 06:02:49 UTC Commit: baa88de7078fbbd088bdc4a722a5873191a04750 https://github.com/geany/geany/commit/baa88de7078fbbd088bdc4a722a5873191a04… Log Message: ----------- Fix broken line breaking on existing lines sci_get_position_from_col() takes line number, not position of start of line. Modified Paths: -------------- src/editor.c Modified: src/editor.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -556,7 +556,7 @@ static void check_line_breaking(GeanyEditor *editor, gint pos) return; /* look for the last space before line_break_column */ - pos = sci_get_position_from_col(sci, lstart, get_project_pref(line_break_column)); + pos = sci_get_position_from_col(sci, line, get_project_pref(line_break_column)); while (pos > lstart) { -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] baa88d: Fix broken line breaking on existing lines
by elextr 28 Dec '18

28 Dec '18

Branch: refs/heads/master Author: elextr <elextr(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Fri, 28 Dec 2018 06:02:49 UTC Commit: baa88de7078fbbd088bdc4a722a5873191a04750 https://github.com/geany/geany/commit/baa88de7078fbbd088bdc4a722a5873191a04… Log Message: ----------- Fix broken line breaking on existing lines sci_get_position_from_col() takes line number, not position of start of line. Modified Paths: -------------- src/editor.c Modified: src/editor.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -556,7 +556,7 @@ static void check_line_breaking(GeanyEditor *editor, gint pos) return; /* look for the last space before line_break_column */ - pos = sci_get_position_from_col(sci, lstart, get_project_pref(line_break_column)); + pos = sci_get_position_from_col(sci, line, get_project_pref(line_break_column)); while (pos > lstart) { -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 73be5c: lregex: add new flag processing
by Jiří Techet 18 Dec '18

18 Dec '18

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Wed, 12 Oct 2016 20:39:24 UTC Commit: 73be5c644da79b66e8bc3bf2ab4e4aafb4db5174 https://github.com/geany/geany/commit/73be5c644da79b66e8bc3bf2ab4e4aafb4db5… Log Message: ----------- lregex: add new flag processing For 'b', 'e', 'i' keep the corresponding GRegex flags. Modified Paths: -------------- ctags/main/lregex.c Modified: ctags/main/lregex.c 120 lines changed, 104 insertions(+), 16 deletions(-) =================================================================== @@ -248,6 +248,55 @@ static bool parseTagRegex ( } +static void pre_ptrn_flag_exclusive_short (char c CTAGS_ATTR_UNUSED, void* data) +{ + bool *exclusive = data; + *exclusive = true; +} + +static void pre_ptrn_flag_exclusive_long (const char* const s CTAGS_ATTR_UNUSED, const char* const unused CTAGS_ATTR_UNUSED, void* data) +{ + pre_ptrn_flag_exclusive_short ('x', data); +} + +static flagDefinition prePtrnFlagDef[] = { + { 'x', "exclusive", pre_ptrn_flag_exclusive_short, pre_ptrn_flag_exclusive_long , + NULL, "skip testing the other patterns if a line is matched to this pattern"}, +}; + +static void scope_ptrn_flag_eval (const char* const f CTAGS_ATTR_UNUSED, + const char* const v, void* data) +{ + unsigned long *bfields = data; + + if (strcmp (v, "ref") == 0) + *bfields |= SCOPE_REF; + else if (strcmp (v, "push") == 0) + *bfields |= (SCOPE_PUSH | SCOPE_REF); + else if (strcmp (v, "pop") == 0) + *bfields |= SCOPE_POP; + else if (strcmp (v, "clear") == 0) + *bfields |= SCOPE_CLEAR; + else if (strcmp (v, "set") == 0) + *bfields |= (SCOPE_CLEAR | SCOPE_PUSH); + else + error (FATAL, "Unexpected value for scope flag in regex definition: scope=%s", v); +} + +static void placeholder_ptrn_flag_eval (const char* const f CTAGS_ATTR_UNUSED, + const char* const v CTAGS_ATTR_UNUSED, void* data) +{ + unsigned long *bfields = data; + *bfields |= SCOPE_PLACEHOLDER; +} + +static flagDefinition scopePtrnFlagDef[] = { + { '\0', "scope", NULL, scope_ptrn_flag_eval, + "ACTION", "use scope stack: ACTION = ref|push|pop|clear|set"}, + { '\0', "placeholder", NULL, placeholder_ptrn_flag_eval, + NULL, "don't put this tag to tags file."}, +}; + static kindOption *kindNew () { kindOption *kind = xCalloc (1, kindOption); @@ -338,6 +387,8 @@ static regexPattern *addCompiledTagPattern (const langType language, GRegex* con bool exclusive = false; unsigned long scopeActions = 0UL; + flagsEval (flags, prePtrnFlagDef, ARRAY_SIZE(prePtrnFlagDef), &exclusive); + flagsEval (flags, scopePtrnFlagDef, ARRAY_SIZE(scopePtrnFlagDef), &scopeActions); if (*name == '\0' && exclusive && kind == KIND_REGEX_DEFAULT) { kind = KIND_GHOST; @@ -376,6 +427,7 @@ static void addCompiledCallbackPattern (const langType language, GRegex* const p { regexPattern * ptrn; bool exclusive = false; + flagsEval (flags, prePtrnFlagDef, ARRAY_SIZE(prePtrnFlagDef), &exclusive); ptrn = addCompiledTagCommon(language, pattern, '\0'); ptrn->type = PTRN_CALLBACK; ptrn->u.callback.function = callback; @@ -384,27 +436,63 @@ static void addCompiledCallbackPattern (const langType language, GRegex* const p ptrn->disabled = disabled; } + +static void regex_flag_basic_short (char c CTAGS_ATTR_UNUSED, void* data) +{ + g_warning("CTags 'b' flag not supported by Geany!"); +} + +static void regex_flag_basic_long (const char* const s CTAGS_ATTR_UNUSED, const char* const unused CTAGS_ATTR_UNUSED, void* data) +{ + regex_flag_basic_short ('b', data); +} + +static void regex_flag_extend_short (char c CTAGS_ATTR_UNUSED, void* data) +{ +} + +static void regex_flag_extend_long (const char* const c CTAGS_ATTR_UNUSED, const char* const unused CTAGS_ATTR_UNUSED, void* data) +{ + regex_flag_extend_short('e', data); +} + +static void regex_flag_icase_short (char c CTAGS_ATTR_UNUSED, void* data) +{ + int* cflags = data; + *cflags |= G_REGEX_CASELESS; +} + +static void regex_flag_icase_long (const char* s CTAGS_ATTR_UNUSED, const char* const unused CTAGS_ATTR_UNUSED, void* data) +{ + regex_flag_icase_short ('i', data); +} + + +static flagDefinition regexFlagDefs[] = { + { 'b', "basic", regex_flag_basic_short, regex_flag_basic_long, + NULL, "interpreted as a Posix basic regular expression."}, + { 'e', "extend", regex_flag_extend_short, regex_flag_extend_long, + NULL, "interpreted as a Posix extended regular expression (default)"}, + { 'i', "icase", regex_flag_icase_short, regex_flag_icase_long, + NULL, "applied in a case-insensitive manner"}, +}; + static GRegex* compileRegex (const char* const regexp, const char* const flags) { int cflags = G_REGEX_MULTILINE; GRegex *result = NULL; - GError *error = NULL; - int i; - for (i = 0 ; flags != NULL && flags [i] != '\0' ; ++i) - { - switch ((int) flags [i]) - { - case 'b': g_warning("CTags 'b' flag not supported by Geany!"); break; - case 'e': break; - case 'i': cflags |= G_REGEX_CASELESS; break; - default: printf ("regex: unknown regex flag: '%c'\n", *flags); break; - } - } - result = g_regex_new(regexp, cflags, 0, &error); - if (error) + GError *err = NULL; + + flagsEval (flags, + regexFlagDefs, + ARRAY_SIZE(regexFlagDefs), + &cflags); + + result = g_regex_new(regexp, cflags, 0, &err); + if (err) { - printf ("regex: regcomp %s: %s\n", regexp, error->message); - g_error_free(error); + error (WARNING, "regcomp %s: %s", regexp, err->message); + g_error_free(err); } return result; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] fb432c: lregex: sync the remaining parts of the existing code
by Jiří Techet 18 Dec '18

18 Dec '18

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Wed, 12 Oct 2016 20:47:07 UTC Commit: fb432c8ccfcc0fcaaa76d160d4083ebe422e6348 https://github.com/geany/geany/commit/fb432c8ccfcc0fcaaa76d160d4083ebe422e6… Log Message: ----------- lregex: sync the remaining parts of the existing code Modified Paths: -------------- ctags/main/lregex.c Modified: ctags/main/lregex.c 52 lines changed, 44 insertions(+), 8 deletions(-) =================================================================== @@ -139,14 +139,16 @@ static void clearPatternSet (const langType language) */ static int makeRegexTag ( - const vString* const name, const kindOption* const kind) + const vString* const name, const kindOption* const kind, int scopeIndex, int placeholder) { Assert (kind != NULL); if (kind->enabled) { tagEntryInfo e; - Assert (name != NULL && vStringLength (name) > 0); + Assert (name != NULL && ((vStringLength (name) > 0) || placeholder)); initTagEntry (&e, vStringValue (name), kind); + e.extensionFields.scopeIndex = scopeIndex; + e.placeholder = !!placeholder; return makeTagEntry (&e); } else @@ -601,14 +603,44 @@ static void matchTagPattern (const vString* const line, { vString *const name = substitute (vStringValue (line), patbuf->u.tag.name_pattern, BACK_REFERENCE_COUNT, minfo); + bool placeholder = !!((patbuf->scopeActions & SCOPE_PLACEHOLDER) == SCOPE_PLACEHOLDER); + unsigned long scope = CORK_NIL; + int n; + vStringStripLeading (name); vStringStripTrailing (name); - if (vStringLength (name) > 0) - makeRegexTag (name, patbuf->u.tag.kind); + + if (patbuf->scopeActions & SCOPE_REF) + { + tagEntryInfo *entry; + + scope = currentScope; + while ((entry = getEntryInCorkQueue (scope)) && entry->placeholder) + /* Look at parent */ + scope = entry->extensionFields.scopeIndex; + } + if (patbuf->scopeActions & SCOPE_CLEAR) + currentScope = CORK_NIL; + if (patbuf->scopeActions & SCOPE_POP) + { + tagEntryInfo *entry = getEntryInCorkQueue (currentScope); + currentScope = entry? entry->extensionFields.scopeIndex: CORK_NIL; + } + + if (vStringLength (name) == 0 && (placeholder == false)) + { + if (patbuf->accept_empty_name == false) + error (WARNING, "%s:%ld: null expansion of name pattern \"%s\"", + getInputFileName (), getInputLineNumber (), + patbuf->u.tag.name_pattern); + n = CORK_NIL; + } else - error (WARNING, "%s:%ld: null expansion of name pattern \"%s\"", - getInputFileName (), getInputLineNumber (), - patbuf->u.tag.name_pattern); + n = makeRegexTag (name, patbuf->u.tag.kind, scope, placeholder); + + if (patbuf->scopeActions & SCOPE_PUSH) + currentScope = n; + vStringDelete (name); } @@ -643,7 +675,11 @@ static bool matchRegexPattern (const vString* const line, { bool result = false; GMatchInfo *minfo; - if (g_regex_match(patbuf->pattern, vStringValue(line), 0, &minfo)) + + if (patbuf->disabled && *(patbuf->disabled)) + return false; + + if (g_regex_match(patbuf->pattern, vStringValue (line), 0, &minfo)) { result = true; if (patbuf->type == PTRN_TAG) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 112f13: lregex: introduce findRegexTagsMainloop()
by Jiří Techet 18 Dec '18

18 Dec '18

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Wed, 12 Oct 2016 15:38:48 UTC Commit: 112f136a0aba0a4ad2a4de76f10f0b7d0fdf8446 https://github.com/geany/geany/commit/112f136a0aba0a4ad2a4de76f10f0b7d0fdf8… Log Message: ----------- lregex: introduce findRegexTagsMainloop() Does the same thing like the previous code. Modified Paths: -------------- ctags/main/lregex.c ctags/main/parse.h Modified: ctags/main/lregex.c 16 lines changed, 14 insertions(+), 2 deletions(-) =================================================================== @@ -36,6 +36,7 @@ #include "routines.h" static bool regexAvailable = true; +static unsigned long currentScope = CORK_NIL; /* * MACROS @@ -583,13 +584,24 @@ extern bool matchRegex (const vString* const line, const langType language) return result; } -extern void findRegexTags (void) +extern void findRegexTagsMainloop (int (* driver)(void)) { + currentScope = CORK_NIL; /* merely read all lines of the file */ - while (readLineFromInputFile () != NULL) + while (driver () != EOF) ; } +static int fileReadLineDriver(void) +{ + return (readLineFromInputFile () == NULL)? EOF: 1; +} + +extern void findRegexTags (void) +{ + findRegexTagsMainloop (fileReadLineDriver); +} + static regexPattern *addTagRegexInternal (const langType language, const char* const regex, const char* const name, Modified: ctags/main/parse.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -141,6 +141,7 @@ extern bool processKindOption (const char *const option, const char *const param /* Regex interface */ extern void findRegexTags (void); +extern void findRegexTagsMainloop (int (* driver)(void)); extern bool matchRegex (const vString* const line, const langType language); extern bool processRegexOption (const char *const option, const char *const parameter); extern void addLanguageRegex (const langType language, const char* const regex); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 56936a: lregex: some harmless syncs
by Jiří Techet 18 Dec '18

18 Dec '18

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Wed, 12 Oct 2016 15:55:59 UTC Commit: 56936a8614c90d7c3cc60ef8ab9e2e0ee8bfe38d https://github.com/geany/geany/commit/56936a8614c90d7c3cc60ef8ab9e2e0ee8bfe… Log Message: ----------- lregex: some harmless syncs Modified Paths: -------------- ctags/main/lregex.c ctags/main/parse.c ctags/main/parse.h Modified: ctags/main/lregex.c 33 lines changed, 31 insertions(+), 2 deletions(-) =================================================================== @@ -320,9 +320,12 @@ static regexPattern* addCompiledTagCommon (const langType language, ptrn = &set->patterns [set->count]; memset (ptrn, 0, sizeof (*ptrn)); ptrn->pattern = pattern; + ptrn->exclusive = false; + ptrn->accept_empty_name = false; if (kind_letter) ptrn->u.tag.kind = kind; set->count += 1; + useRegexMethod(language); return ptrn; } @@ -343,6 +346,9 @@ static regexPattern *addCompiledTagPattern (const langType language, GRegex* con ptrn = addCompiledTagCommon(language, pattern, kind); ptrn->type = PTRN_TAG; ptrn->u.tag.name_pattern = eStrdup (name); + ptrn->exclusive = exclusive; + ptrn->scopeActions = scopeActions; + ptrn->disabled = disabled; if (ptrn->u.tag.kind->letter == '\0') { /* This is a newly registered kind. */ @@ -373,6 +379,9 @@ static void addCompiledCallbackPattern (const langType language, GRegex* const p ptrn = addCompiledTagCommon(language, pattern, '\0'); ptrn->type = PTRN_CALLBACK; ptrn->u.callback.function = callback; + ptrn->u.callback.userData = userData; + ptrn->exclusive = exclusive; + ptrn->disabled = disabled; } static GRegex* compileRegex (const char* const regexp, const char* const flags) @@ -531,7 +540,7 @@ static void matchCallbackPattern ( matches [i].start = so; matches [i].length = eo - so; /* a valid match may have both offsets == -1, - * e.g. (foo)*(bar) matching "bar" - see CTags bug 2970274. + * e.g. (foo)*(bar) matching "bar" - see CTags bug 271. * As POSIX regex doesn't seem to have a way to count matches, * we return the count up to the last non-empty match. */ if (so != -1) @@ -578,8 +587,15 @@ extern bool matchRegex (const vString* const line, const langType language) const patternSet* const set = Sets + language; unsigned int i; for (i = 0 ; i < set->count ; ++i) - if (matchRegexPattern (line, set->patterns + i)) + { + regexPattern* ptrn = set->patterns + i; + if (matchRegexPattern (line, ptrn)) + { result = true; + if (ptrn->exclusive) + break; + } + } } return result; } @@ -602,6 +618,19 @@ extern void findRegexTags (void) findRegexTagsMainloop (fileReadLineDriver); } +extern bool hasScopeActionInRegex (const langType language) +{ + bool r = false; + unsigned int i; + + if (language <= SetUpper && Sets [language].count > 0) + for (i = 0; i < Sets [language].count; i++) + if (Sets[language].patterns[i].scopeActions) + r= true; + + return r; +} + static regexPattern *addTagRegexInternal (const langType language, const char* const regex, const char* const name, Modified: ctags/main/parse.c 9 lines changed, 9 insertions(+), 0 deletions(-) =================================================================== @@ -421,6 +421,15 @@ extern bool processAliasOption ( return false; } +extern void useRegexMethod (const langType language) +{ + parserDefinition* lang; + + Assert (0 <= language && language < (int) LanguageCount); + lang = LanguageTable [language]; + lang->method |= METHOD_REGEX; +} + static void installTagRegexTable (const langType language) { parserDefinition* lang; Modified: ctags/main/parse.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -152,5 +152,6 @@ extern void addCallbackRegex (const langType language, const char *const regexo, const regexCallback callback, bool *disabled, void *userData); extern void freeRegexResources (void); extern bool checkRegex (void); +extern void useRegexMethod (const langType language); #endif /* CTAGS_MAIN_PARSE_H */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] ca19e6: lregex: sync some function prototypes
by Jiří Techet 18 Dec '18

18 Dec '18

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Wed, 12 Oct 2016 15:32:01 UTC Commit: ca19e6e3b3a6c65e5ab00c488ad9bf94343029c7 https://github.com/geany/geany/commit/ca19e6e3b3a6c65e5ab00c488ad9bf9434302… Log Message: ----------- lregex: sync some function prototypes Modified Paths: -------------- ctags/main/lregex.c ctags/main/parse.c ctags/main/parse.h Modified: ctags/main/lregex.c 43 lines changed, 30 insertions(+), 13 deletions(-) =================================================================== @@ -137,7 +137,7 @@ static void clearPatternSet (const langType language) * Regex pseudo-parser */ -static void makeRegexTag ( +static int makeRegexTag ( const vString* const name, const kindOption* const kind) { Assert (kind != NULL); @@ -146,8 +146,10 @@ static void makeRegexTag ( tagEntryInfo e; Assert (name != NULL && vStringLength (name) > 0); initTagEntry (&e, vStringValue (name), kind); - makeTagEntry (&e); + return makeTagEntry (&e); } + else + return CORK_NIL; } /* @@ -325,7 +327,8 @@ static regexPattern* addCompiledTagCommon (const langType language, static regexPattern *addCompiledTagPattern (const langType language, GRegex* const pattern, const char* const name, char kind, const char* kindName, - char *const description) + char *const description, const char* flags, + bool *disabled) { regexPattern * ptrn; bool exclusive = false; @@ -360,7 +363,9 @@ static regexPattern *addCompiledTagPattern (const langType language, GRegex* con } static void addCompiledCallbackPattern (const langType language, GRegex* const pattern, - const regexCallback callback) + const regexCallback callback, const char* flags, + bool *disabled, + void *userData) { regexPattern * ptrn; bool exclusive = false; @@ -531,7 +536,8 @@ static void matchCallbackPattern ( if (so != -1) count = i + 1; } - patbuf->u.callback.function (vStringValue (line), matches, count); + patbuf->u.callback.function (vStringValue (line), matches, count, + patbuf->u.callback.userData); } static bool matchRegexPattern (const vString* const line, @@ -588,7 +594,8 @@ static regexPattern *addTagRegexInternal (const langType language, const char* const regex, const char* const name, const char* const kinds, - const char* const flags) + const char* const flags, + bool *disabled) { regexPattern *rptr = NULL; Assert (regex != NULL); @@ -601,6 +608,7 @@ static regexPattern *addTagRegexInternal (const langType language, char kind; char* kindName; char* description; + parseKinds (kinds, &kind, &kindName, &description); if (kind == getLanguageFileKind (language)->letter) error (FATAL, @@ -610,7 +618,8 @@ static regexPattern *addTagRegexInternal (const langType language, getLanguageName (language)); rptr = addCompiledTagPattern (language, cp, name, - kind, kindName, description); + kind, kindName, description, flags, + disabled); if (kindName) eFree (kindName); if (description) @@ -620,7 +629,10 @@ static regexPattern *addTagRegexInternal (const langType language, if (*name == '\0') { - error (WARNING, "%s: regexp missing name pattern", regex); + if (rptr->exclusive || rptr->scopeActions & SCOPE_PLACEHOLDER) + rptr->accept_empty_name = true; + else + error (WARNING, "%s: regexp missing name pattern", regex); } return rptr; @@ -630,22 +642,26 @@ extern void addTagRegex (const langType language CTAGS_ATTR_UNUSED, const char* const regex CTAGS_ATTR_UNUSED, const char* const name CTAGS_ATTR_UNUSED, const char* const kinds CTAGS_ATTR_UNUSED, - const char* const flags CTAGS_ATTR_UNUSED) + const char* const flags CTAGS_ATTR_UNUSED, + bool *disabled) { - addTagRegexInternal (language, regex, name, kinds, flags); + addTagRegexInternal (language, regex, name, kinds, flags, disabled); } extern void addCallbackRegex (const langType language CTAGS_ATTR_UNUSED, const char* const regex CTAGS_ATTR_UNUSED, const char* const flags CTAGS_ATTR_UNUSED, - const regexCallback callback CTAGS_ATTR_UNUSED) + const regexCallback callback CTAGS_ATTR_UNUSED, + bool *disabled, + void * userData) { Assert (regex != NULL); if (regexAvailable) { GRegex* const cp = compileRegex (regex, flags); if (cp != NULL) - addCompiledCallbackPattern (language, cp, callback); + addCompiledCallbackPattern (language, cp, callback, flags, + disabled, userData); } } @@ -658,7 +674,8 @@ extern void addLanguageRegex ( char *name, *kinds, *flags; if (parseTagRegex (regex_pat, &name, &kinds, &flags)) { - addTagRegexInternal (language, regex_pat, name, kinds, flags); + addTagRegexInternal (language, regex_pat, name, kinds, flags, + NULL); eFree (regex_pat); } } Modified: ctags/main/parse.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -437,7 +437,8 @@ static void installTagRegexTable (const langType language) lang->tagRegexTable [i].regex, lang->tagRegexTable [i].name, lang->tagRegexTable [i].kinds, - lang->tagRegexTable [i].flags); + lang->tagRegexTable [i].flags, + (lang->tagRegexTable [i].disabled)); } } Modified: ctags/main/parse.h 10 lines changed, 7 insertions(+), 3 deletions(-) =================================================================== @@ -92,7 +92,8 @@ typedef struct { size_t length; /* length of match */ } regexMatch; -typedef void (*regexCallback) (const char *line, const regexMatch *matches, unsigned int count); +typedef void (*regexCallback) (const char *line, const regexMatch *matches, unsigned int count, + void *userData); typedef enum { LMAP_PATTERN = 1 << 0, @@ -143,8 +144,11 @@ extern void findRegexTags (void); extern bool matchRegex (const vString* const line, const langType language); extern bool processRegexOption (const char *const option, const char *const parameter); extern void addLanguageRegex (const langType language, const char* const regex); -extern void addTagRegex (const langType language, const char* const regex, const char* const name, const char* const kinds, const char* const flags); -extern void addCallbackRegex (const langType language, const char* const regex, const char* flags, const regexCallback callback); +extern void addTagRegex (const langType language, const char* const regex, + const char* const name, const char* const kinds, const char* const flags, + bool *disabled); +extern void addCallbackRegex (const langType language, const char *const regexo, const char *const flags, + const regexCallback callback, bool *disabled, void *userData); extern void freeRegexResources (void); extern bool checkRegex (void); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 017e1b: lregex: Add missing fields to regexPattern
by Jiří Techet 18 Dec '18

18 Dec '18

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Wed, 12 Oct 2016 15:13:32 UTC Commit: 017e1be502d01fbc6ec046f6413148f77609e231 https://github.com/geany/geany/commit/017e1be502d01fbc6ec046f6413148f77609e… Log Message: ----------- lregex: Add missing fields to regexPattern Modified Paths: -------------- ctags/main/lregex.c Modified: ctags/main/lregex.c 13 lines changed, 13 insertions(+), 0 deletions(-) =================================================================== @@ -58,18 +58,31 @@ union cptr { enum pType { PTRN_TAG, PTRN_CALLBACK }; +enum scopeAction { + SCOPE_REF = 1UL << 0, + SCOPE_POP = 1UL << 1, + SCOPE_PUSH = 1UL << 2, + SCOPE_CLEAR = 1UL << 3, + SCOPE_PLACEHOLDER = 1UL << 4, +}; + typedef struct { GRegex *pattern; enum pType type; + bool exclusive; + bool accept_empty_name; union { struct { char *name_pattern; kindOption *kind; } tag; struct { regexCallback function; + void *userData; } callback; } u; + unsigned int scopeActions; + bool *disabled; } regexPattern; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 501ebe: lregex: Initialize lregex structures the universal-ctags way
by Jiří Techet 18 Dec '18

18 Dec '18

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Wed, 12 Oct 2016 15:09:19 UTC Commit: 501ebe94d59ea21a590d501019a24541e900fb6b https://github.com/geany/geany/commit/501ebe94d59ea21a590d501019a24541e900f… Log Message: ----------- lregex: Initialize lregex structures the universal-ctags way I didn't check in detail what the changes are but since no GRegex code is involved and since everything seems to work after the patch, I think it's OK. Modified Paths: -------------- ctags/main/lregex.c Modified: ctags/main/lregex.c 196 lines changed, 145 insertions(+), 51 deletions(-) =================================================================== @@ -51,6 +51,11 @@ static bool regexAvailable = true; * DATA DECLARATIONS */ +union cptr { + char c; + void *p; +}; + enum pType { PTRN_TAG, PTRN_CALLBACK }; typedef struct { @@ -59,7 +64,7 @@ typedef struct { union { struct { char *name_pattern; - kindOption kind; + kindOption *kind; } tag; struct { regexCallback function; @@ -71,6 +76,7 @@ typedef struct { typedef struct { regexPattern *patterns; unsigned int count; + hashTable *kinds; } patternSet; /* @@ -102,24 +108,20 @@ static void clearPatternSet (const langType language) { eFree (p->u.tag.name_pattern); p->u.tag.name_pattern = NULL; - eFree ((char *)p->u.tag.kind.name); - p->u.tag.kind.name = NULL; - if (p->u.tag.kind.description != NULL) - { - eFree ((char *)p->u.tag.kind.description); - p->u.tag.kind.description = NULL; - } + p->u.tag.kind = NULL; } } if (set->patterns != NULL) eFree (set->patterns); set->patterns = NULL; set->count = 0; + hashTableDelete (set->kinds); + set->kinds = NULL; } } /* -* Regex psuedo-parser +* Regex pseudo-parser */ static void makeRegexTag ( @@ -229,44 +231,45 @@ static bool parseTagRegex ( return result; } -static void addCompiledTagPattern ( - const langType language, GRegex* const pattern, - char* const name, const char kind, char* const kindName, - char *const description) + +static kindOption *kindNew () { - patternSet* set; - regexPattern *ptrn; - if (language > SetUpper) + kindOption *kind = xCalloc (1, kindOption); + kind->letter = '\0'; + kind->name = NULL; + kind->description = NULL; + kind->enabled = false; + kind->referenceOnly = false; + kind->nRoles = 0; + kind->roles = NULL; + return kind; +} + +static void kindFree (void *data) +{ + kindOption *kind = data; + kind->letter = '\0'; + if (kind->name) { - int i; - Sets = xRealloc (Sets, (language + 1), patternSet); - for (i = SetUpper + 1 ; i <= language ; ++i) - { - Sets [i].patterns = NULL; - Sets [i].count = 0; - } - SetUpper = language; + eFree ((void *)kind->name); + kind->name = NULL; } - set = Sets + language; - set->patterns = xRealloc (set->patterns, (set->count + 1), regexPattern); - ptrn = &set->patterns [set->count]; - set->count += 1; - - ptrn->pattern = pattern; - ptrn->type = PTRN_TAG; - ptrn->u.tag.name_pattern = name; - ptrn->u.tag.kind.enabled = true; - ptrn->u.tag.kind.letter = kind; - ptrn->u.tag.kind.name = kindName; - ptrn->u.tag.kind.description = description; + if (kind->description) + { + eFree ((void *)kind->description); + kind->description = NULL; + } + eFree (kind); } -static void addCompiledCallbackPattern ( - const langType language, GRegex* const pattern, - const regexCallback callback) +static regexPattern* addCompiledTagCommon (const langType language, + GRegex* const pattern, + char kind_letter) { patternSet* set; regexPattern *ptrn; + kindOption *kind = NULL; + if (language > SetUpper) { int i; @@ -275,20 +278,84 @@ static void addCompiledCallbackPattern ( { Sets [i].patterns = NULL; Sets [i].count = 0; + Sets [i].kinds = hashTableNew (11, + hashPtrhash, + hashPtreq, + NULL, + kindFree); } SetUpper = language; } set = Sets + language; set->patterns = xRealloc (set->patterns, (set->count + 1), regexPattern); + + if (kind_letter) + { + union cptr c = { .p = NULL }; + + c.c = kind_letter; + kind = hashTableGetItem (set->kinds, c.p); + if (!kind) + { + kind = kindNew (); + hashTablePutItem (set->kinds, c.p, (void *)kind); + } + } ptrn = &set->patterns [set->count]; + memset (ptrn, 0, sizeof (*ptrn)); + ptrn->pattern = pattern; + if (kind_letter) + ptrn->u.tag.kind = kind; set->count += 1; + return ptrn; +} - ptrn->pattern = pattern; +static regexPattern *addCompiledTagPattern (const langType language, GRegex* const pattern, + const char* const name, char kind, const char* kindName, + char *const description) +{ + regexPattern * ptrn; + bool exclusive = false; + unsigned long scopeActions = 0UL; + + if (*name == '\0' && exclusive && kind == KIND_REGEX_DEFAULT) + { + kind = KIND_GHOST; + kindName = KIND_GHOST_LONG; + } + ptrn = addCompiledTagCommon(language, pattern, kind); + ptrn->type = PTRN_TAG; + ptrn->u.tag.name_pattern = eStrdup (name); + if (ptrn->u.tag.kind->letter == '\0') + { + /* This is a newly registered kind. */ + ptrn->u.tag.kind->letter = kind; + ptrn->u.tag.kind->enabled = true; + ptrn->u.tag.kind->name = kindName? eStrdup (kindName): NULL; + ptrn->u.tag.kind->description = description? eStrdup (description): NULL; + } + else if (ptrn->u.tag.kind->name && kindName && strcmp(ptrn->u.tag.kind->name, kindName)) + { + /* When using a same kind letter for multiple regex patterns, the name of kind + should be the same. */ + error (WARNING, "Don't reuse the kind letter `%c' in a language %s (old: \"%s\", new: \"%s\")", + ptrn->u.tag.kind->letter, getLanguageName (language), + ptrn->u.tag.kind->name, kindName); + } + + return ptrn; +} + +static void addCompiledCallbackPattern (const langType language, GRegex* const pattern, + const regexCallback callback) +{ + regexPattern * ptrn; + bool exclusive = false; + ptrn = addCompiledTagCommon(language, pattern, '\0'); ptrn->type = PTRN_CALLBACK; ptrn->u.callback.function = callback; } - static GRegex* compileRegex (const char* const regexp, const char* const flags) { int cflags = G_REGEX_MULTILINE; @@ -421,7 +488,7 @@ static void matchTagPattern (const vString* const line, vStringStripLeading (name); vStringStripTrailing (name); if (vStringLength (name) > 0) - makeRegexTag (name, &patbuf->u.tag.kind); + makeRegexTag (name, patbuf->u.tag.kind); else error (WARNING, "%s:%ld: null expansion of name pattern \"%s\"", getInputFileName (), getInputLineNumber (), @@ -504,13 +571,13 @@ extern void findRegexTags (void) ; } -extern void addTagRegex ( - const langType language CTAGS_ATTR_UNUSED, - const char* const regex CTAGS_ATTR_UNUSED, - const char* const name CTAGS_ATTR_UNUSED, - const char* const kinds CTAGS_ATTR_UNUSED, - const char* const flags CTAGS_ATTR_UNUSED) +static regexPattern *addTagRegexInternal (const langType language, + const char* const regex, + const char* const name, + const char* const kinds, + const char* const flags) { + regexPattern *rptr = NULL; Assert (regex != NULL); Assert (name != NULL); if (regexAvailable) @@ -522,10 +589,37 @@ extern void addTagRegex ( char* kindName; char* description; parseKinds (kinds, &kind, &kindName, &description); - addCompiledTagPattern (language, cp, eStrdup (name), - kind, kindName, description); + if (kind == getLanguageFileKind (language)->letter) + error (FATAL, + "Kind letter \'%c\' used in regex definition \"%s\" of %s language is reserved in ctags main", + kind, + regex, + getLanguageName (language)); + + rptr = addCompiledTagPattern (language, cp, name, + kind, kindName, description); + if (kindName) + eFree (kindName); + if (description) + eFree (description); } } + + if (*name == '\0') + { + error (WARNING, "%s: regexp missing name pattern", regex); + } + + return rptr; +} + +extern void addTagRegex (const langType language CTAGS_ATTR_UNUSED, + const char* const regex CTAGS_ATTR_UNUSED, + const char* const name CTAGS_ATTR_UNUSED, + const char* const kinds CTAGS_ATTR_UNUSED, + const char* const flags CTAGS_ATTR_UNUSED) +{ + addTagRegexInternal (language, regex, name, kinds, flags); } extern void addCallbackRegex (const langType language CTAGS_ATTR_UNUSED, @@ -551,7 +645,7 @@ extern void addLanguageRegex ( char *name, *kinds, *flags; if (parseTagRegex (regex_pat, &name, &kinds, &flags)) { - addTagRegex (language, regex_pat, name, kinds, flags); + addTagRegexInternal (language, regex_pat, name, kinds, flags); eFree (regex_pat); } } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] ca1622: lregex: replace regexBroken with regexAvailable
by Jiří Techet 18 Dec '18

18 Dec '18

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Wed, 12 Oct 2016 11:26:39 UTC Commit: ca1622412fc87819b8c47609e4ef7f71d564a46e https://github.com/geany/geany/commit/ca1622412fc87819b8c47609e4ef7f71d564a… Log Message: ----------- lregex: replace regexBroken with regexAvailable Modified Paths: -------------- ctags/main/lregex.c Modified: ctags/main/lregex.c 10 lines changed, 5 insertions(+), 5 deletions(-) =================================================================== @@ -35,6 +35,8 @@ #include "read.h" #include "routines.h" +static bool regexAvailable = true; + /* * MACROS */ @@ -75,8 +77,6 @@ typedef struct { * DATA DEFINITIONS */ -static bool regexBroken = false; - /* Array of pattern sets, indexed by language */ static patternSet* Sets = NULL; static int SetUpper = -1; /* upper language index in list */ @@ -526,7 +526,7 @@ extern void addTagRegex ( { Assert (regex != NULL); Assert (name != NULL); - if (! regexBroken) + if (regexAvailable) { GRegex* const cp = compileRegex (regex, flags); if (cp != NULL) @@ -548,7 +548,7 @@ extern void addCallbackRegex ( const regexCallback callback CTAGS_ATTR_UNUSED) { Assert (regex != NULL); - if (! regexBroken) + if (regexAvailable) { GRegex* const cp = compileRegex (regex, flags); if (cp != NULL) @@ -559,7 +559,7 @@ extern void addCallbackRegex ( extern void addLanguageRegex ( const langType language CTAGS_ATTR_UNUSED, const char* const regex CTAGS_ATTR_UNUSED) { - if (! regexBroken) + if (regexAvailable) { char *const regex_pat = eStrdup (regex); char *name, *kinds, *flags; -------------- 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 December 2018