Commits November 2014

commits@lists.geany.org

1 participants
90 discussions

[geany/geany] c40263: Merge branch 'css-update'
by Colomban Wendling 11 Nov '14

11 Nov '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 11 Nov 2014 17:38:42 UTC Commit: c40263709f2143494dad939d510407ddd1fe26f6 https://github.com/geany/geany/commit/c40263709f2143494dad939d510407ddd1fe2… Log Message: ----------- Merge branch 'css-update' Modified Paths: -------------- tagmanager/ctags/css.c tests/ctags/Makefile.am tests/ctags/css-at-rules.css tests/ctags/css-at-rules.css.tags tests/ctags/css-at-supports.css tests/ctags/css-at-supports.css.tags tests/ctags/css-attribute-selectors.css tests/ctags/css-attribute-selectors.css.tags tests/ctags/css-comma-no-space.css tests/ctags/css-comma-no-space.css.tags tests/ctags/css-namespace-selectors.css tests/ctags/css-namespace-selectors.css.tags tests/ctags/css-pseudo-classes.css tests/ctags/css-pseudo-classes.css.tags tests/ctags/css-simple.css tests/ctags/css-simple.css.tags tests/ctags/css-singlequote-in-comment-issue2.css tests/ctags/css-singlequote-in-comment-issue2.css.tags tests/ctags/css-tag-types.css tests/ctags/css-tag-types.css.tags tests/ctags/css-trivial.css tests/ctags/css-trivial.css.tags Modified: tagmanager/ctags/css.c 388 lines changed, 212 insertions(+), 176 deletions(-) =================================================================== @@ -1,224 +1,259 @@ /*************************************************************************** * css.c - * Character-based parser for Css definitions - * Author - Iago Rubio <iagorubio(at)users.sourceforge.net> - * - Bronisław Białek <after89(at)gmail.com> + * Token-based parser for CSS definitions + * Author - Colomban Wendling <colomban(a)geany.org> **************************************************************************/ #include "general.h" -#include <string.h> -#include <ctype.h> +#include <string.h> +#include <ctype.h> -#include "parse.h" -#include "read.h" +#include "entry.h" +#include "parse.h" +#include "read.h" typedef enum eCssKinds { - K_NONE = -1, K_SELECTOR, K_ID, K_CLASS + K_CLASS, K_SELECTOR, K_ID } cssKind; static kindOption CssKinds [] = { - { TRUE, 's', "struct", "selectors" }, - { TRUE, 'v', "variable", "identities" }, - { TRUE, 'c', "class", "classes" } + { TRUE, 'c', "class", "classes" }, + { TRUE, 's', "struct", "selectors" }, + { TRUE, 'v', "variable", "identities" } }; -typedef enum _CssParserState { /* state of parsing */ - P_STATE_NONE, /* default state */ - P_STATE_IN_COMMENT, /* into a comment, only multi line in CSS */ - P_STATE_IN_SINGLE_STRING, /* into a single quoted string */ - P_STATE_IN_DOUBLE_STRING, /* into a double quoted string */ - P_STATE_IN_DEFINITION, /* on the body of the style definition, nothing for us */ - P_STATE_IN_MEDIA, /* on a @media declaration, can be multi-line */ - P_STATE_IN_IMPORT, /* on a @import declaration, can be multi-line */ - P_STATE_IN_NAMESPACE, /* on a @namespace declaration */ - P_STATE_IN_PAGE, /* on a @page declaration */ - P_STATE_IN_FONTFACE, /* on a @font-face declaration */ - P_STATE_AT_END /* end of parsing */ -} CssParserState; - -static void makeCssSimpleTag( vString *name, cssKind kind, boolean delete ) +typedef enum { + /* any ASCII */ + TOKEN_EOF = 257, + TOKEN_SELECTOR, + TOKEN_STRING +} tokenType; + +typedef struct { + tokenType type; + vString *string; +} tokenInfo; + + +static boolean isSelectorChar (const int c) { - vStringTerminate (name); - makeSimpleTag (name, CssKinds, kind); - vStringClear (name); - if( delete ) - vStringDelete (name); + /* attribute selectors are handled separately */ + return (isalnum (c) || + c == '_' || // allowed char + c == '-' || // allowed char + c == '+' || // allow all sibling in a single tag + c == '>' || // allow all child in a single tag + c == '|' || // allow namespace separator + c == '(' || // allow pseudo-class arguments + c == ')' || + c == '.' || // allow classes and selectors + c == ':' || // allow pseudo classes + c == '*' || // allow globs as P + * + c == '#'); // allow ids } -static boolean isCssDeclarationAllowedChar( const unsigned char *cp ) +static void parseSelector (vString *const string, const int firstChar) { - return isalnum ((int) *cp) || - isspace ((int) *cp) || - *cp == '_' || /* allowed char */ - *cp == '-' || /* allowed char */ - *cp == '+' || /* allow all sibling in a single tag */ - *cp == '>' || /* allow all child in a single tag */ - *cp == '{' || /* allow the start of the declaration */ - *cp == '.' || /* allow classes and selectors */ - *cp == ',' || /* allow multiple declarations */ - *cp == ':' || /* allow pseudo classes */ - *cp == '*' || /* allow globs as P + * */ - *cp == '#'; /* allow ids */ + int c = firstChar; + do + { + vStringPut (string, (char) c); + c = fileGetc (); + } while (isSelectorChar (c)); + fileUngetc (c); + vStringTerminate (string); } -static CssParserState parseCssDeclaration( const unsigned char **position, cssKind kind, const char *aname) +static void readToken (tokenInfo *const token) { - const unsigned char *cp = *position; - vString *name = vStringNew (); - vStringCopyS(name, aname); - - /* pick to the end of line including children and sibling - * if declaration is multiline go for the next line */ - while ( isCssDeclarationAllowedChar(cp) || - *cp == '\0' ) /* track the end of line into the loop */ + int c; + + vStringClear (token->string); + +getNextChar: + + c = fileGetc (); + while (isspace (c)) + c = fileGetc (); + + token->type = c; + switch (c) { - if( *cp == ',' ) + case EOF: token->type = TOKEN_EOF; break; + + case '\'': + case '"': { - makeCssSimpleTag(name, kind, TRUE); - *position = cp; - return P_STATE_NONE; + const int delimiter = c; + do + { + vStringPut (token->string, c); + c = fileGetc (); + if (c == '\\') + c = fileGetc (); + } + while (c != EOF && c != delimiter); + if (c != EOF) + vStringPut (token->string, c); + token->type = TOKEN_STRING; + break; } - else if( *cp == '{' || *cp == '\0' ) - { /* assume that line end is the same as a starting definition (i.e. the { is on the next line */ - makeCssSimpleTag(name, kind, TRUE); - *position = cp; - return P_STATE_IN_DEFINITION; + + case '/': /* maybe comment start */ + { + int d = fileGetc (); + if (d != '*') + { + fileUngetc (d); + vStringPut (token->string, c); + token->type = c; + } + else + { + d = fileGetc (); + do + { + c = d; + d = fileGetc (); + } + while (d != EOF && ! (c == '*' && d == '/')); + goto getNextChar; + } + break; } - vStringPut (name, (int) *cp); - ++cp; + default: + if (! isSelectorChar (c)) + { + vStringPut (token->string, c); + token->type = c; + } + else + { + parseSelector (token->string, c); + token->type = TOKEN_SELECTOR; + } + break; } +} - makeCssSimpleTag(name, kind, TRUE); - *position = cp; +/* sets selector kind in @p kind if found, otherwise don't touches @p kind */ +static cssKind classifySelector (const vString *const selector) +{ + size_t i; - return P_STATE_NONE; + for (i = vStringLength (selector); i > 0; --i) + { + char c = vStringItem (selector, i - 1); + if (c == '.') + return K_CLASS; + else if (c == '#') + return K_ID; + } + return K_SELECTOR; } -static CssParserState parseCssLine( const unsigned char *line, CssParserState state ) +static void findCssTags (void) { - vString *aux; - vString *stack = vStringNew (); + boolean readNextToken = TRUE; + tokenInfo token; - while( *line != '\0' ) /* fileReadLine returns NULL terminated strings */ + token.string = vStringNew (); + + do { - vStringClear (stack); - while (state == P_STATE_NONE && - (isspace ((int) *line) || isalnum ((int) *line) || ( *line == '*' && *(line-1) != '/' ))) - { - if ((stack->length > 0 && isspace((int) *line)) || isalnum ((int) *line) || *line == '*') { - vStringPut(stack, (int) *line); - } + if (readNextToken) + readToken (&token); - ++line; + readNextToken = TRUE; + + if (token.type == '@') + { /* At-rules, from the "@" to the next block or semicolon */ + boolean useContents; + readToken (&token); + useContents = (strcmp (vStringValue (token.string), "media") == 0 || + strcmp (vStringValue (token.string), "supports") == 0); + while (token.type != TOKEN_EOF && + token.type != ';' && token.type != '{') + { + readToken (&token); + } + /* HACK: we *eat* the opening '{' for medias and the like so that + * the content is parsed as if it was at the root */ + readNextToken = useContents && token.type == '{'; } - vStringTerminate (stack); + else if (token.type == TOKEN_SELECTOR) + { /* collect selectors and make a tag */ + cssKind kind = K_SELECTOR; + MIOPos filePosition; + unsigned long lineNumber; + vString *selector = vStringNew (); + do + { + if (vStringLength (selector) > 0) + vStringPut (selector, ' '); + vStringCat (selector, token.string); - switch( state ) - { - case P_STATE_NONE: - if( *line == '.' ) /* a class */ - state = parseCssDeclaration( &line, K_CLASS, vStringValue(stack) ); - else if( *line == '#' ) /* an id */ - state = parseCssDeclaration( &line, K_ID, vStringValue(stack) ); - else if( *line == '@' ) /* at-rules, we'll ignore them */ + kind = classifySelector (token.string); + lineNumber = getSourceLineNumber (); + filePosition = getInputFilePosition (); + + readToken (&token); + + /* handle attribute selectors */ + if (token.type == '[') { - ++line; - aux = vStringNew(); - while( !isspace((int) *line) ) + int depth = 1; + while (depth > 0 && token.type != TOKEN_EOF) { - vStringPut (aux, (int) *line); - ++line; + vStringCat (selector, token.string); + readToken (&token); + if (token.type == '[') + depth++; + else if (token.type == ']') + depth--; } - vStringTerminate (aux); - if( strcmp( aux->buffer, "media" ) == 0 ) - state = P_STATE_IN_MEDIA; - else if ( strcmp( aux->buffer, "import" ) == 0 ) - state = P_STATE_IN_IMPORT; - else if ( strcmp( aux->buffer, "namespace" ) == 0 ) - state = P_STATE_IN_NAMESPACE; - else if ( strcmp( aux->buffer, "page" ) == 0 ) - state = P_STATE_IN_PAGE; - else if ( strcmp( aux->buffer, "font-face" ) == 0 ) - state = P_STATE_IN_FONTFACE; - vStringDelete (aux); + if (token.type != TOKEN_EOF) + vStringCat (selector, token.string); + readToken (&token); } - else if( *line == '*' && *(line-1) == '/' ) /* multi-line comment */ - state = P_STATE_IN_COMMENT; - else if ( stack->length > 0 ) - state = parseCssDeclaration( &line, K_SELECTOR, vStringValue(stack) ); + } + while (token.type == TOKEN_SELECTOR); + /* we already consumed the next token, don't read it twice */ + readNextToken = FALSE; - break; - case P_STATE_IN_COMMENT: - if( *line == '/' && *(line-1) == '*') - state = P_STATE_NONE; - break; - case P_STATE_IN_SINGLE_STRING: - if( *line == '\'' && *(line-1) != '\\' ) - state = P_STATE_IN_DEFINITION; /* PAGE, FONTFACE and DEFINITION are treated the same way */ - break; - case P_STATE_IN_DOUBLE_STRING: - if( *line=='"' && *(line-1) != '\\' ) - state = P_STATE_IN_DEFINITION; /* PAGE, FONTFACE and DEFINITION are treated the same way */ - break; - case P_STATE_IN_MEDIA: - /* skip to start of media body or line end */ - while( *line != '{' ) - { - if( *line == '\0' ) - break; - ++line; - } - if( *line == '{' ) - state = P_STATE_NONE; - break; - case P_STATE_IN_IMPORT: - case P_STATE_IN_NAMESPACE: - /* skip to end of declaration or line end */ - while( *line != ';' ) - { - if( *line == '\0' ) - break; - ++line; - } - if( *line == ';' ) - state = P_STATE_NONE; - break; - case P_STATE_IN_PAGE: - case P_STATE_IN_FONTFACE: - case P_STATE_IN_DEFINITION: - if( *line == '\0' ) - line = fileReadLine (); - if( *line == '}' ) - state = P_STATE_NONE; - else if( *line == '\'' ) - state = P_STATE_IN_SINGLE_STRING; - else if( *line == '"' ) - state = P_STATE_IN_DOUBLE_STRING; - break; - case P_STATE_AT_END: - return state; - break; + vStringTerminate (selector); + if (CssKinds[kind].enabled) + { + tagEntryInfo e; + initTagEntry (&e, vStringValue (selector)); + + e.lineNumber = lineNumber; + e.filePosition = filePosition; + e.kindName = CssKinds[kind].name; + e.kind = (char) CssKinds[kind].letter; + + makeTagEntry (&e); + } + vStringDelete (selector); + } + else if (token.type == '{') + { /* skip over { ... } */ + int depth = 1; + while (depth > 0 && token.type != TOKEN_EOF) + { + readToken (&token); + if (token.type == '{') + depth++; + else if (token.type == '}') + depth--; + } } - if (line == NULL) return P_STATE_AT_END; - line++; } - vStringDelete (stack); + while (token.type != TOKEN_EOF); - return state; -} - -static void findCssTags (void) -{ - const unsigned char *line; - CssParserState state = P_STATE_NONE; - - while ( (line = fileReadLine ()) != NULL ) - { - state = parseCssLine( line, state ); - if( state==P_STATE_AT_END ) return; - } + vStringDelete (token.string); } /* parser definition */ @@ -232,3 +267,4 @@ extern parserDefinition* CssParser (void) def->parser = findCssTags; return def; } + Modified: tests/ctags/Makefile.am 10 lines changed, 10 insertions(+), 0 deletions(-) =================================================================== @@ -116,6 +116,16 @@ test_sources = \ continuation.f90 \ countall.sql \ cpp_destructor.cpp \ + css-at-rules.css \ + css-at-supports.css \ + css-attribute-selectors.css \ + css-comma-no-space.css \ + css-namespace-selectors.css \ + css-pseudo-classes.css \ + css-simple.css \ + css-singlequote-in-comment-issue2.css \ + css-tag-types.css \ + css-trivial.css \ cython_sample.pyx \ cython_sample2.pyx \ cxx11enum.cpp \ Modified: tests/ctags/css-at-rules.css 27 lines changed, 27 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,27 @@ + +@import "foo.css"; + +@namespace url(http://www.w3.org/1999/xhtml); +@namespace svg url(http://www.w3.org/2000/svg); + +@media screen { + body { font-size: 10pt; } +} +@media print { + body { font-size: 12px; } +} +@media screen, print { + body { line-height: 1.2 } +} + +@page :first { + margin: 2in; +} + +@font-face { + font-family: Sample; + src: local("Sample"), + url(Sample.ttf); +} + +html { color: blue; } Modified: tests/ctags/css-at-rules.css.tags 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,3 @@ +# format=tagmanager +body�2048�0 +html�2048�0 Modified: tests/ctags/css-at-supports.css 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,6 @@ + +@supports ((test-property: 42) or (test-property2: 42)) { + html { test-property: 42; } +} + +html { color: blue; } Modified: tests/ctags/css-at-supports.css.tags 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,2 @@ +# format=tagmanager +html�2048�0 Modified: tests/ctags/css-attribute-selectors.css 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,6 @@ + +body { color: black; } +a[href^="http://"] { color: red; } +a[href^="https://"] { color: green; } +a[lang~=en] { background-color: light-green; } +p { color: gray } Modified: tests/ctags/css-attribute-selectors.css.tags 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,6 @@ +# format=tagmanager +a[href^="http://"]�2048�0 +a[href^="https://"]�2048�0 +a[lang~=en]�2048�0 +body�2048�0 +p�2048�0 Modified: tests/ctags/css-comma-no-space.css 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1 @@ +input,textarea{border: 1px solid red;} Modified: tests/ctags/css-comma-no-space.css.tags 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,3 @@ +# format=tagmanager +input�2048�0 +textarea�2048�0 Modified: tests/ctags/css-namespace-selectors.css 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,4 @@ + +|a { color: red; } +svg|a { color: green; } +*|div { color: blue; } Modified: tests/ctags/css-namespace-selectors.css.tags 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,4 @@ +# format=tagmanager +*|div�2048�0 +svg|a�2048�0 +|a�2048�0 Modified: tests/ctags/css-pseudo-classes.css 15 lines changed, 15 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,15 @@ + +tr:nth-child(2n+1) { background-color: light-gray } +tr:nth-child(odd) { background-color: light-gray } +tr:nth-child(2n) { background-color: light-gray } +tr:nth-child(even) { background-color: light-gray } +tr:nth-child(10n+0) { background-color: gray } + +span:nth-child(0n+1) { color: lime; } +span:nth-child(1) { color: lime; } +span:nth-child(-n+3) { color: lime; } + +span:not(:first-child) { color: red; } +body :not(span) { color: green; } + +a:lang(en):after { content: "[en]" } Modified: tests/ctags/css-pseudo-classes.css.tags 12 lines changed, 12 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,12 @@ +# format=tagmanager +a:lang(en):after�2048�0 +body :not(span)�2048�0 +span:not(:first-child)�2048�0 +span:nth-child(-n+3)�2048�0 +span:nth-child(0n+1)�2048�0 +span:nth-child(1)�2048�0 +tr:nth-child(10n+0)�2048�0 +tr:nth-child(2n)�2048�0 +tr:nth-child(2n+1)�2048�0 +tr:nth-child(even)�2048�0 +tr:nth-child(odd)�2048�0 Modified: tests/ctags/css-simple.css 27 lines changed, 27 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,27 @@ + +* { padding:0; } + +html +{ + margin: 0 +} + +.header { font-size: 200%; } + +#footer { font-size: 80%; } + +div.magic + +{ +/* haha */ +text-decoration: blink; +} + +.red { color: red } + +ul li { padding-left: 1em; } +.foo a, .foo b { color: blue; } + +ul > li > a { + font: monospace; +} Modified: tests/ctags/css-simple.css.tags 11 lines changed, 11 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,11 @@ +# format=tagmanager +#footer�16384�0 +*�2048�0 +.foo a�2048�0 +.foo b�2048�0 +.header�1�0 +.red�1�0 +div.magic�1�0 +html�2048�0 +ul > li > a�2048�0 +ul li�2048�0 Modified: tests/ctags/css-singlequote-in-comment-issue2.css 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,2 @@ +a{x:0;/*'*/} +b{y:0;} Modified: tests/ctags/css-singlequote-in-comment-issue2.css.tags 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,3 @@ +# format=tagmanager +a�2048�0 +b�2048�0 Modified: tests/ctags/css-tag-types.css 38 lines changed, 38 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,38 @@ +a foo{ color: red } +a #foo{ color: red } +a .foo{ color: red } +a foo bar{ color: red } +a foo #bar{ color: red } +a foo .bar{ color: red } +a #foo bar{ color: red } +a #foo #bar{ color: red } +a #foo .bar{ color: red } +a .foo bar{ color: red } +a .foo #bar{ color: red } +a .foo .bar{ color: red } + +#a foo{ color: red } +#a #foo{ color: red } +#a .foo{ color: red } +#a foo bar{ color: red } +#a foo #bar{ color: red } +#a foo .bar{ color: red } +#a #foo bar{ color: red } +#a #foo #bar{ color: red } +#a #foo .bar{ color: red } +#a .foo bar{ color: red } +#a .foo #bar{ color: red } +#a .foo .bar{ color: red } + +.a foo{ color: red } +.a #foo{ color: red } +.a .foo{ color: red } +.a foo bar{ color: red } +.a foo #bar{ color: red } +.a foo .bar{ color: red } +.a #foo bar{ color: red } +.a #foo #bar{ color: red } +.a #foo .bar{ color: red } +.a .foo bar{ color: red } +.a .foo #bar{ color: red } +.a .foo .bar{ color: red } Modified: tests/ctags/css-tag-types.css.tags 37 lines changed, 37 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,37 @@ +# format=tagmanager +#a #foo�16384�0 +#a #foo #bar�16384�0 +#a #foo .bar�1�0 +#a #foo bar�2048�0 +#a .foo�1�0 +#a .foo #bar�16384�0 +#a .foo .bar�1�0 +#a .foo bar�2048�0 +#a foo�2048�0 +#a foo #bar�16384�0 +#a foo .bar�1�0 +#a foo bar�2048�0 +.a #foo�16384�0 +.a #foo #bar�16384�0 +.a #foo .bar�1�0 +.a #foo bar�2048�0 +.a .foo�1�0 +.a .foo #bar�16384�0 +.a .foo .bar�1�0 +.a .foo bar�2048�0 +.a foo�2048�0 +.a foo #bar�16384�0 +.a foo .bar�1�0 +.a foo bar�2048�0 +a #foo�16384�0 +a #foo #bar�16384�0 +a #foo .bar�1�0 +a #foo bar�2048�0 +a .foo�1�0 +a .foo #bar�16384�0 +a .foo .bar�1�0 +a .foo bar�2048�0 +a foo�2048�0 +a foo #bar�16384�0 +a foo .bar�1�0 +a foo bar�2048�0 Modified: tests/ctags/css-trivial.css 5 lines changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,5 @@ + +html{ font: sans-serif; } +a{ color: red; } +p{ text-align: justify; } +input, textarea{ border: 1px solid green; } Modified: tests/ctags/css-trivial.css.tags 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,6 @@ +# format=tagmanager +a�2048�0 +html�2048�0 +input�2048�0 +p�2048�0 +textarea�2048�0 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] f76546: Import new CSS parser from fishman-ctags
by Colomban Wendling 11 Nov '14

11 Nov '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 11 Nov 2014 01:01:41 UTC Commit: f765463af0aa8dad6d39399da2c138e8b5041bc4 https://github.com/geany/geany/commit/f765463af0aa8dad6d39399da2c138e8b5041… Log Message: ----------- Import new CSS parser from fishman-ctags Some highlights: * Fixes handling of comments * Adds support for attribute and namespace selectors * Adds support for @supports blocks * Fixes tag type for many selectors * Adds support for pseudo-classes with arguments Modified Paths: -------------- tagmanager/ctags/css.c tests/ctags/css-at-rules.css.tags tests/ctags/css-at-supports.css.tags tests/ctags/css-attribute-selectors.css.tags tests/ctags/css-namespace-selectors.css.tags tests/ctags/css-pseudo-classes.css.tags tests/ctags/css-simple.css.tags tests/ctags/css-singlequote-in-comment-issue2.css.tags tests/ctags/css-tag-types.css.tags Modified: tagmanager/ctags/css.c 388 lines changed, 212 insertions(+), 176 deletions(-) =================================================================== @@ -1,224 +1,259 @@ /*************************************************************************** * css.c - * Character-based parser for Css definitions - * Author - Iago Rubio <iagorubio(at)users.sourceforge.net> - * - Bronisław Białek <after89(at)gmail.com> + * Token-based parser for CSS definitions + * Author - Colomban Wendling <colomban(a)geany.org> **************************************************************************/ #include "general.h" -#include <string.h> -#include <ctype.h> +#include <string.h> +#include <ctype.h> -#include "parse.h" -#include "read.h" +#include "entry.h" +#include "parse.h" +#include "read.h" typedef enum eCssKinds { - K_NONE = -1, K_SELECTOR, K_ID, K_CLASS + K_CLASS, K_SELECTOR, K_ID } cssKind; static kindOption CssKinds [] = { - { TRUE, 's', "struct", "selectors" }, - { TRUE, 'v', "variable", "identities" }, - { TRUE, 'c', "class", "classes" } + { TRUE, 'c', "class", "classes" }, + { TRUE, 's', "struct", "selectors" }, + { TRUE, 'v', "variable", "identities" } }; -typedef enum _CssParserState { /* state of parsing */ - P_STATE_NONE, /* default state */ - P_STATE_IN_COMMENT, /* into a comment, only multi line in CSS */ - P_STATE_IN_SINGLE_STRING, /* into a single quoted string */ - P_STATE_IN_DOUBLE_STRING, /* into a double quoted string */ - P_STATE_IN_DEFINITION, /* on the body of the style definition, nothing for us */ - P_STATE_IN_MEDIA, /* on a @media declaration, can be multi-line */ - P_STATE_IN_IMPORT, /* on a @import declaration, can be multi-line */ - P_STATE_IN_NAMESPACE, /* on a @namespace declaration */ - P_STATE_IN_PAGE, /* on a @page declaration */ - P_STATE_IN_FONTFACE, /* on a @font-face declaration */ - P_STATE_AT_END /* end of parsing */ -} CssParserState; - -static void makeCssSimpleTag( vString *name, cssKind kind, boolean delete ) +typedef enum { + /* any ASCII */ + TOKEN_EOF = 257, + TOKEN_SELECTOR, + TOKEN_STRING +} tokenType; + +typedef struct { + tokenType type; + vString *string; +} tokenInfo; + + +static boolean isSelectorChar (const int c) { - vStringTerminate (name); - makeSimpleTag (name, CssKinds, kind); - vStringClear (name); - if( delete ) - vStringDelete (name); + /* attribute selectors are handled separately */ + return (isalnum (c) || + c == '_' || // allowed char + c == '-' || // allowed char + c == '+' || // allow all sibling in a single tag + c == '>' || // allow all child in a single tag + c == '|' || // allow namespace separator + c == '(' || // allow pseudo-class arguments + c == ')' || + c == '.' || // allow classes and selectors + c == ':' || // allow pseudo classes + c == '*' || // allow globs as P + * + c == '#'); // allow ids } -static boolean isCssDeclarationAllowedChar( const unsigned char *cp ) +static void parseSelector (vString *const string, const int firstChar) { - return isalnum ((int) *cp) || - isspace ((int) *cp) || - *cp == '_' || /* allowed char */ - *cp == '-' || /* allowed char */ - *cp == '+' || /* allow all sibling in a single tag */ - *cp == '>' || /* allow all child in a single tag */ - *cp == '{' || /* allow the start of the declaration */ - *cp == '.' || /* allow classes and selectors */ - *cp == ',' || /* allow multiple declarations */ - *cp == ':' || /* allow pseudo classes */ - *cp == '*' || /* allow globs as P + * */ - *cp == '#'; /* allow ids */ + int c = firstChar; + do + { + vStringPut (string, (char) c); + c = fileGetc (); + } while (isSelectorChar (c)); + fileUngetc (c); + vStringTerminate (string); } -static CssParserState parseCssDeclaration( const unsigned char **position, cssKind kind, const char *aname) +static void readToken (tokenInfo *const token) { - const unsigned char *cp = *position; - vString *name = vStringNew (); - vStringCopyS(name, aname); - - /* pick to the end of line including children and sibling - * if declaration is multiline go for the next line */ - while ( isCssDeclarationAllowedChar(cp) || - *cp == '\0' ) /* track the end of line into the loop */ + int c; + + vStringClear (token->string); + +getNextChar: + + c = fileGetc (); + while (isspace (c)) + c = fileGetc (); + + token->type = c; + switch (c) { - if( *cp == ',' ) + case EOF: token->type = TOKEN_EOF; break; + + case '\'': + case '"': { - makeCssSimpleTag(name, kind, TRUE); - *position = cp; - return P_STATE_NONE; + const int delimiter = c; + do + { + vStringPut (token->string, c); + c = fileGetc (); + if (c == '\\') + c = fileGetc (); + } + while (c != EOF && c != delimiter); + if (c != EOF) + vStringPut (token->string, c); + token->type = TOKEN_STRING; + break; } - else if( *cp == '{' || *cp == '\0' ) - { /* assume that line end is the same as a starting definition (i.e. the { is on the next line */ - makeCssSimpleTag(name, kind, TRUE); - *position = cp; - return P_STATE_IN_DEFINITION; + + case '/': /* maybe comment start */ + { + int d = fileGetc (); + if (d != '*') + { + fileUngetc (d); + vStringPut (token->string, c); + token->type = c; + } + else + { + d = fileGetc (); + do + { + c = d; + d = fileGetc (); + } + while (d != EOF && ! (c == '*' && d == '/')); + goto getNextChar; + } + break; } - vStringPut (name, (int) *cp); - ++cp; + default: + if (! isSelectorChar (c)) + { + vStringPut (token->string, c); + token->type = c; + } + else + { + parseSelector (token->string, c); + token->type = TOKEN_SELECTOR; + } + break; } +} - makeCssSimpleTag(name, kind, TRUE); - *position = cp; +/* sets selector kind in @p kind if found, otherwise don't touches @p kind */ +static cssKind classifySelector (const vString *const selector) +{ + size_t i; - return P_STATE_NONE; + for (i = vStringLength (selector); i > 0; --i) + { + char c = vStringItem (selector, i - 1); + if (c == '.') + return K_CLASS; + else if (c == '#') + return K_ID; + } + return K_SELECTOR; } -static CssParserState parseCssLine( const unsigned char *line, CssParserState state ) +static void findCssTags (void) { - vString *aux; - vString *stack = vStringNew (); + boolean readNextToken = TRUE; + tokenInfo token; - while( *line != '\0' ) /* fileReadLine returns NULL terminated strings */ + token.string = vStringNew (); + + do { - vStringClear (stack); - while (state == P_STATE_NONE && - (isspace ((int) *line) || isalnum ((int) *line) || ( *line == '*' && *(line-1) != '/' ))) - { - if ((stack->length > 0 && isspace((int) *line)) || isalnum ((int) *line) || *line == '*') { - vStringPut(stack, (int) *line); - } + if (readNextToken) + readToken (&token); - ++line; + readNextToken = TRUE; + + if (token.type == '@') + { /* At-rules, from the "@" to the next block or semicolon */ + boolean useContents; + readToken (&token); + useContents = (strcmp (vStringValue (token.string), "media") == 0 || + strcmp (vStringValue (token.string), "supports") == 0); + while (token.type != TOKEN_EOF && + token.type != ';' && token.type != '{') + { + readToken (&token); + } + /* HACK: we *eat* the opening '{' for medias and the like so that + * the content is parsed as if it was at the root */ + readNextToken = useContents && token.type == '{'; } - vStringTerminate (stack); + else if (token.type == TOKEN_SELECTOR) + { /* collect selectors and make a tag */ + cssKind kind = K_SELECTOR; + MIOPos filePosition; + unsigned long lineNumber; + vString *selector = vStringNew (); + do + { + if (vStringLength (selector) > 0) + vStringPut (selector, ' '); + vStringCat (selector, token.string); - switch( state ) - { - case P_STATE_NONE: - if( *line == '.' ) /* a class */ - state = parseCssDeclaration( &line, K_CLASS, vStringValue(stack) ); - else if( *line == '#' ) /* an id */ - state = parseCssDeclaration( &line, K_ID, vStringValue(stack) ); - else if( *line == '@' ) /* at-rules, we'll ignore them */ + kind = classifySelector (token.string); + lineNumber = getSourceLineNumber (); + filePosition = getInputFilePosition (); + + readToken (&token); + + /* handle attribute selectors */ + if (token.type == '[') { - ++line; - aux = vStringNew(); - while( !isspace((int) *line) ) + int depth = 1; + while (depth > 0 && token.type != TOKEN_EOF) { - vStringPut (aux, (int) *line); - ++line; + vStringCat (selector, token.string); + readToken (&token); + if (token.type == '[') + depth++; + else if (token.type == ']') + depth--; } - vStringTerminate (aux); - if( strcmp( aux->buffer, "media" ) == 0 ) - state = P_STATE_IN_MEDIA; - else if ( strcmp( aux->buffer, "import" ) == 0 ) - state = P_STATE_IN_IMPORT; - else if ( strcmp( aux->buffer, "namespace" ) == 0 ) - state = P_STATE_IN_NAMESPACE; - else if ( strcmp( aux->buffer, "page" ) == 0 ) - state = P_STATE_IN_PAGE; - else if ( strcmp( aux->buffer, "font-face" ) == 0 ) - state = P_STATE_IN_FONTFACE; - vStringDelete (aux); + if (token.type != TOKEN_EOF) + vStringCat (selector, token.string); + readToken (&token); } - else if( *line == '*' && *(line-1) == '/' ) /* multi-line comment */ - state = P_STATE_IN_COMMENT; - else if ( stack->length > 0 ) - state = parseCssDeclaration( &line, K_SELECTOR, vStringValue(stack) ); + } + while (token.type == TOKEN_SELECTOR); + /* we already consumed the next token, don't read it twice */ + readNextToken = FALSE; - break; - case P_STATE_IN_COMMENT: - if( *line == '/' && *(line-1) == '*') - state = P_STATE_NONE; - break; - case P_STATE_IN_SINGLE_STRING: - if( *line == '\'' && *(line-1) != '\\' ) - state = P_STATE_IN_DEFINITION; /* PAGE, FONTFACE and DEFINITION are treated the same way */ - break; - case P_STATE_IN_DOUBLE_STRING: - if( *line=='"' && *(line-1) != '\\' ) - state = P_STATE_IN_DEFINITION; /* PAGE, FONTFACE and DEFINITION are treated the same way */ - break; - case P_STATE_IN_MEDIA: - /* skip to start of media body or line end */ - while( *line != '{' ) - { - if( *line == '\0' ) - break; - ++line; - } - if( *line == '{' ) - state = P_STATE_NONE; - break; - case P_STATE_IN_IMPORT: - case P_STATE_IN_NAMESPACE: - /* skip to end of declaration or line end */ - while( *line != ';' ) - { - if( *line == '\0' ) - break; - ++line; - } - if( *line == ';' ) - state = P_STATE_NONE; - break; - case P_STATE_IN_PAGE: - case P_STATE_IN_FONTFACE: - case P_STATE_IN_DEFINITION: - if( *line == '\0' ) - line = fileReadLine (); - if( *line == '}' ) - state = P_STATE_NONE; - else if( *line == '\'' ) - state = P_STATE_IN_SINGLE_STRING; - else if( *line == '"' ) - state = P_STATE_IN_DOUBLE_STRING; - break; - case P_STATE_AT_END: - return state; - break; + vStringTerminate (selector); + if (CssKinds[kind].enabled) + { + tagEntryInfo e; + initTagEntry (&e, vStringValue (selector)); + + e.lineNumber = lineNumber; + e.filePosition = filePosition; + e.kindName = CssKinds[kind].name; + e.kind = (char) CssKinds[kind].letter; + + makeTagEntry (&e); + } + vStringDelete (selector); + } + else if (token.type == '{') + { /* skip over { ... } */ + int depth = 1; + while (depth > 0 && token.type != TOKEN_EOF) + { + readToken (&token); + if (token.type == '{') + depth++; + else if (token.type == '}') + depth--; + } } - if (line == NULL) return P_STATE_AT_END; - line++; } - vStringDelete (stack); + while (token.type != TOKEN_EOF); - return state; -} - -static void findCssTags (void) -{ - const unsigned char *line; - CssParserState state = P_STATE_NONE; - - while ( (line = fileReadLine ()) != NULL ) - { - state = parseCssLine( line, state ); - if( state==P_STATE_AT_END ) return; - } + vStringDelete (token.string); } /* parser definition */ @@ -232,3 +267,4 @@ extern parserDefinition* CssParser (void) def->parser = findCssTags; return def; } + Modified: tests/ctags/css-at-rules.css.tags 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1,3 +1,3 @@ # format=tagmanager -body �2048�0 -html �2048�0 +body�2048�0 +html�2048�0 Modified: tests/ctags/css-at-supports.css.tags 5 lines changed, 1 insertions(+), 4 deletions(-) =================================================================== @@ -1,5 +1,2 @@ # format=tagmanager -html �2048�0 -or �2048�0 -test-property2: 42�2048�0 -test-property: 42�2048�0 +html�2048�0 Modified: tests/ctags/css-attribute-selectors.css.tags 16 lines changed, 5 insertions(+), 11 deletions(-) =================================================================== @@ -1,12 +1,6 @@ # format=tagmanager -a�2048�0 -background-color: light-green�2048�0 -body �2048�0 -color: green�2048�0 -color: red�2048�0 -en�2048�0 -href�2048�0 -http:�2048�0 -https:�2048�0 -lang�2048�0 -p �2048�0 +a[href^="http://"]�2048�0 +a[href^="https://"]�2048�0 +a[lang~=en]�2048�0 +body�2048�0 +p�2048�0 Modified: tests/ctags/css-namespace-selectors.css.tags 7 lines changed, 3 insertions(+), 4 deletions(-) =================================================================== @@ -1,5 +1,4 @@ # format=tagmanager -*�2048�0 -a �2048�0 -div �2048�0 -svg�2048�0 +*|div�2048�0 +svg|a�2048�0 +|a�2048�0 Modified: tests/ctags/css-pseudo-classes.css.tags 33 lines changed, 11 insertions(+), 22 deletions(-) =================================================================== @@ -1,23 +1,12 @@ # format=tagmanager -0n+1�2048�0 -1�2048�0 -10n+0�2048�0 -2n�2048�0 -2n+1�2048�0 -a:lang�2048�0 -after �2048�0 -background-color: gray �2048�0 -background-color: light-gray �2048�0 -body :not�2048�0 -color: green�2048�0 -color: lime�2048�0 -color: red�2048�0 -en�2048�0 -even�2048�0 -first-child�2048�0 -n+3�2048�0 -odd�2048�0 -span�2048�0 -span:not�2048�0 -span:nth-child�2048�0 -tr:nth-child�2048�0 +a:lang(en):after�2048�0 +body :not(span)�2048�0 +span:not(:first-child)�2048�0 +span:nth-child(-n+3)�2048�0 +span:nth-child(0n+1)�2048�0 +span:nth-child(1)�2048�0 +tr:nth-child(10n+0)�2048�0 +tr:nth-child(2n)�2048�0 +tr:nth-child(2n+1)�2048�0 +tr:nth-child(even)�2048�0 +tr:nth-child(odd)�2048�0 Modified: tests/ctags/css-simple.css.tags 18 lines changed, 9 insertions(+), 9 deletions(-) =================================================================== @@ -1,11 +1,11 @@ # format=tagmanager -#footer �16384�0 -* �2048�0 -.foo a�1�0 -.foo b �1�0 -.header �1�0 -.red �1�0 -div.magic �1�0 +#footer�16384�0 +*�2048�0 +.foo a�2048�0 +.foo b�2048�0 +.header�1�0 +.red�1�0 +div.magic�1�0 html�2048�0 -ul > li > a �2048�0 -ul li �2048�0 +ul > li > a�2048�0 +ul li�2048�0 Modified: tests/ctags/css-singlequote-in-comment-issue2.css.tags 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,2 +1,3 @@ # format=tagmanager a�2048�0 +b�2048�0 Modified: tests/ctags/css-tag-types.css.tags 40 lines changed, 20 insertions(+), 20 deletions(-) =================================================================== @@ -1,36 +1,36 @@ # format=tagmanager #a #foo�16384�0 #a #foo #bar�16384�0 -#a #foo .bar�16384�0 -#a #foo bar�16384�0 -#a .foo�16384�0 +#a #foo .bar�1�0 +#a #foo bar�2048�0 +#a .foo�1�0 #a .foo #bar�16384�0 -#a .foo .bar�16384�0 -#a .foo bar�16384�0 -#a foo�16384�0 +#a .foo .bar�1�0 +#a .foo bar�2048�0 +#a foo�2048�0 #a foo #bar�16384�0 -#a foo .bar�16384�0 -#a foo bar�16384�0 -.a #foo�1�0 -.a #foo #bar�1�0 +#a foo .bar�1�0 +#a foo bar�2048�0 +.a #foo�16384�0 +.a #foo #bar�16384�0 .a #foo .bar�1�0 -.a #foo bar�1�0 +.a #foo bar�2048�0 .a .foo�1�0 -.a .foo #bar�1�0 +.a .foo #bar�16384�0 .a .foo .bar�1�0 -.a .foo bar�1�0 -.a foo�1�0 -.a foo #bar�1�0 +.a .foo bar�2048�0 +.a foo�2048�0 +.a foo #bar�16384�0 .a foo .bar�1�0 -.a foo bar�1�0 +.a foo bar�2048�0 a #foo�16384�0 a #foo #bar�16384�0 -a #foo .bar�16384�0 -a #foo bar�16384�0 +a #foo .bar�1�0 +a #foo bar�2048�0 a .foo�1�0 -a .foo #bar�1�0 +a .foo #bar�16384�0 a .foo .bar�1�0 -a .foo bar�1�0 +a .foo bar�2048�0 a foo�2048�0 a foo #bar�16384�0 a foo .bar�1�0 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 207279: Import CSS test cases from fishman-ctags
by Colomban Wendling 11 Nov '14

11 Nov '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 11 Nov 2014 00:59:12 UTC Commit: 207279728317082bac040e7f32c50697919090b0 https://github.com/geany/geany/commit/207279728317082bac040e7f32c5069791909… Log Message: ----------- Import CSS test cases from fishman-ctags Modified Paths: -------------- tests/ctags/Makefile.am tests/ctags/css-at-rules.css tests/ctags/css-at-rules.css.tags tests/ctags/css-at-supports.css tests/ctags/css-at-supports.css.tags tests/ctags/css-attribute-selectors.css tests/ctags/css-attribute-selectors.css.tags tests/ctags/css-comma-no-space.css tests/ctags/css-comma-no-space.css.tags tests/ctags/css-namespace-selectors.css tests/ctags/css-namespace-selectors.css.tags tests/ctags/css-pseudo-classes.css tests/ctags/css-pseudo-classes.css.tags tests/ctags/css-simple.css tests/ctags/css-simple.css.tags tests/ctags/css-singlequote-in-comment-issue2.css tests/ctags/css-singlequote-in-comment-issue2.css.tags tests/ctags/css-tag-types.css tests/ctags/css-tag-types.css.tags tests/ctags/css-trivial.css tests/ctags/css-trivial.css.tags Modified: tests/ctags/Makefile.am 10 lines changed, 10 insertions(+), 0 deletions(-) =================================================================== @@ -116,6 +116,16 @@ test_sources = \ continuation.f90 \ countall.sql \ cpp_destructor.cpp \ + css-at-rules.css \ + css-at-supports.css \ + css-attribute-selectors.css \ + css-comma-no-space.css \ + css-namespace-selectors.css \ + css-pseudo-classes.css \ + css-simple.css \ + css-singlequote-in-comment-issue2.css \ + css-tag-types.css \ + css-trivial.css \ cython_sample.pyx \ cython_sample2.pyx \ cxx11enum.cpp \ Modified: tests/ctags/css-at-rules.css 27 lines changed, 27 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,27 @@ + +@import "foo.css"; + +@namespace url(http://www.w3.org/1999/xhtml); +@namespace svg url(http://www.w3.org/2000/svg); + +@media screen { + body { font-size: 10pt; } +} +@media print { + body { font-size: 12px; } +} +@media screen, print { + body { line-height: 1.2 } +} + +@page :first { + margin: 2in; +} + +@font-face { + font-family: Sample; + src: local("Sample"), + url(Sample.ttf); +} + +html { color: blue; } Modified: tests/ctags/css-at-rules.css.tags 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,3 @@ +# format=tagmanager +body �2048�0 +html �2048�0 Modified: tests/ctags/css-at-supports.css 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,6 @@ + +@supports ((test-property: 42) or (test-property2: 42)) { + html { test-property: 42; } +} + +html { color: blue; } Modified: tests/ctags/css-at-supports.css.tags 5 lines changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,5 @@ +# format=tagmanager +html �2048�0 +or �2048�0 +test-property2: 42�2048�0 +test-property: 42�2048�0 Modified: tests/ctags/css-attribute-selectors.css 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,6 @@ + +body { color: black; } +a[href^="http://"] { color: red; } +a[href^="https://"] { color: green; } +a[lang~=en] { background-color: light-green; } +p { color: gray } Modified: tests/ctags/css-attribute-selectors.css.tags 12 lines changed, 12 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,12 @@ +# format=tagmanager +a�2048�0 +background-color: light-green�2048�0 +body �2048�0 +color: green�2048�0 +color: red�2048�0 +en�2048�0 +href�2048�0 +http:�2048�0 +https:�2048�0 +lang�2048�0 +p �2048�0 Modified: tests/ctags/css-comma-no-space.css 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1 @@ +input,textarea{border: 1px solid red;} Modified: tests/ctags/css-comma-no-space.css.tags 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,3 @@ +# format=tagmanager +input�2048�0 +textarea�2048�0 Modified: tests/ctags/css-namespace-selectors.css 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,4 @@ + +|a { color: red; } +svg|a { color: green; } +*|div { color: blue; } Modified: tests/ctags/css-namespace-selectors.css.tags 5 lines changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,5 @@ +# format=tagmanager +*�2048�0 +a �2048�0 +div �2048�0 +svg�2048�0 Modified: tests/ctags/css-pseudo-classes.css 15 lines changed, 15 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,15 @@ + +tr:nth-child(2n+1) { background-color: light-gray } +tr:nth-child(odd) { background-color: light-gray } +tr:nth-child(2n) { background-color: light-gray } +tr:nth-child(even) { background-color: light-gray } +tr:nth-child(10n+0) { background-color: gray } + +span:nth-child(0n+1) { color: lime; } +span:nth-child(1) { color: lime; } +span:nth-child(-n+3) { color: lime; } + +span:not(:first-child) { color: red; } +body :not(span) { color: green; } + +a:lang(en):after { content: "[en]" } Modified: tests/ctags/css-pseudo-classes.css.tags 23 lines changed, 23 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,23 @@ +# format=tagmanager +0n+1�2048�0 +1�2048�0 +10n+0�2048�0 +2n�2048�0 +2n+1�2048�0 +a:lang�2048�0 +after �2048�0 +background-color: gray �2048�0 +background-color: light-gray �2048�0 +body :not�2048�0 +color: green�2048�0 +color: lime�2048�0 +color: red�2048�0 +en�2048�0 +even�2048�0 +first-child�2048�0 +n+3�2048�0 +odd�2048�0 +span�2048�0 +span:not�2048�0 +span:nth-child�2048�0 +tr:nth-child�2048�0 Modified: tests/ctags/css-simple.css 27 lines changed, 27 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,27 @@ + +* { padding:0; } + +html +{ + margin: 0 +} + +.header { font-size: 200%; } + +#footer { font-size: 80%; } + +div.magic + +{ +/* haha */ +text-decoration: blink; +} + +.red { color: red } + +ul li { padding-left: 1em; } +.foo a, .foo b { color: blue; } + +ul > li > a { + font: monospace; +} Modified: tests/ctags/css-simple.css.tags 11 lines changed, 11 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,11 @@ +# format=tagmanager +#footer �16384�0 +* �2048�0 +.foo a�1�0 +.foo b �1�0 +.header �1�0 +.red �1�0 +div.magic �1�0 +html�2048�0 +ul > li > a �2048�0 +ul li �2048�0 Modified: tests/ctags/css-singlequote-in-comment-issue2.css 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,2 @@ +a{x:0;/*'*/} +b{y:0;} Modified: tests/ctags/css-singlequote-in-comment-issue2.css.tags 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,2 @@ +# format=tagmanager +a�2048�0 Modified: tests/ctags/css-tag-types.css 38 lines changed, 38 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,38 @@ +a foo{ color: red } +a #foo{ color: red } +a .foo{ color: red } +a foo bar{ color: red } +a foo #bar{ color: red } +a foo .bar{ color: red } +a #foo bar{ color: red } +a #foo #bar{ color: red } +a #foo .bar{ color: red } +a .foo bar{ color: red } +a .foo #bar{ color: red } +a .foo .bar{ color: red } + +#a foo{ color: red } +#a #foo{ color: red } +#a .foo{ color: red } +#a foo bar{ color: red } +#a foo #bar{ color: red } +#a foo .bar{ color: red } +#a #foo bar{ color: red } +#a #foo #bar{ color: red } +#a #foo .bar{ color: red } +#a .foo bar{ color: red } +#a .foo #bar{ color: red } +#a .foo .bar{ color: red } + +.a foo{ color: red } +.a #foo{ color: red } +.a .foo{ color: red } +.a foo bar{ color: red } +.a foo #bar{ color: red } +.a foo .bar{ color: red } +.a #foo bar{ color: red } +.a #foo #bar{ color: red } +.a #foo .bar{ color: red } +.a .foo bar{ color: red } +.a .foo #bar{ color: red } +.a .foo .bar{ color: red } Modified: tests/ctags/css-tag-types.css.tags 37 lines changed, 37 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,37 @@ +# format=tagmanager +#a #foo�16384�0 +#a #foo #bar�16384�0 +#a #foo .bar�16384�0 +#a #foo bar�16384�0 +#a .foo�16384�0 +#a .foo #bar�16384�0 +#a .foo .bar�16384�0 +#a .foo bar�16384�0 +#a foo�16384�0 +#a foo #bar�16384�0 +#a foo .bar�16384�0 +#a foo bar�16384�0 +.a #foo�1�0 +.a #foo #bar�1�0 +.a #foo .bar�1�0 +.a #foo bar�1�0 +.a .foo�1�0 +.a .foo #bar�1�0 +.a .foo .bar�1�0 +.a .foo bar�1�0 +.a foo�1�0 +.a foo #bar�1�0 +.a foo .bar�1�0 +.a foo bar�1�0 +a #foo�16384�0 +a #foo #bar�16384�0 +a #foo .bar�16384�0 +a #foo bar�16384�0 +a .foo�1�0 +a .foo #bar�1�0 +a .foo .bar�1�0 +a .foo bar�1�0 +a foo�2048�0 +a foo #bar�16384�0 +a foo .bar�1�0 +a foo bar�2048�0 Modified: tests/ctags/css-trivial.css 5 lines changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,5 @@ + +html{ font: sans-serif; } +a{ color: red; } +p{ text-align: justify; } +input, textarea{ border: 1px solid green; } Modified: tests/ctags/css-trivial.css.tags 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,6 @@ +# format=tagmanager +a�2048�0 +html�2048�0 +input�2048�0 +p�2048�0 +textarea�2048�0 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 67cc8f: Fix closing of the "missing file" infobar
by Colomban Wendling 09 Nov '14

09 Nov '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 09 Nov 2014 21:14:12 UTC Commit: 67cc8faf4be7778cda8c2901785b038319c1f01a https://github.com/geany/geany/commit/67cc8faf4be7778cda8c2901785b038319c1f… Log Message: ----------- Fix closing of the "missing file" infobar The issue was introduced in b646424ddb715382a937d233a75bc684c22e18ec as it removed the default handler that used to destroy the infobar. Now, the infobar is properly closed, but only if the action succeeded. Closes #375. Modified Paths: -------------- src/document.c Modified: src/document.c 15 lines changed, 13 insertions(+), 2 deletions(-) =================================================================== @@ -3358,12 +3358,23 @@ static void on_monitor_resave_missing_file_response(GtkWidget *bar, gint response_id, GeanyDocument *doc) { + gboolean close = TRUE; + unprotect_document(doc); if (response_id == RESPONSE_DOCUMENT_SAVE) - dialogs_show_save_as(); + close = dialogs_show_save_as(); - doc->priv->info_bars[MSG_TYPE_RESAVE] = NULL; + if (close) + { + doc->priv->info_bars[MSG_TYPE_RESAVE] = NULL; + gtk_widget_destroy(bar); + } + else + { + /* protect back the document if save didn't occur */ + protect_document(doc); + } } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 1dc095: Fix check for fnmatch and remove strict dependency on it for Windows
by Colomban Wendling 09 Nov '14

09 Nov '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 09 Nov 2014 16:40:03 UTC Commit: 1dc09597b24d19683abc597d45d7c28d37c199f0 https://github.com/geany/geany/commit/1dc09597b24d19683abc597d45d7c28d37c19… Log Message: ----------- Fix check for fnmatch and remove strict dependency on it for Windows Strict dependency on fnmatch was removed in 52076d19e8fe7ab41ebc92928e. We still have an optional dependency on it from CTags, but I don't think we use this code, and anyways the checks we had for the optional path to be taken were incorrect, so it was never actually used. So, drop the dependency on libibrety for Windows builds, and fix the remaining checks for an optional fnmatch so if it is found it can actually be used. Modified Paths: -------------- configure.ac m4/geany-mingw.m4 src/Makefile.am wscript Modified: configure.ac 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -49,7 +49,7 @@ AC_TYPE_SIZE_T AC_STRUCT_TM # Checks for library functions. -AC_CHECK_FUNCS([ftruncate fgetpos mkstemp strerror strstr]) +AC_CHECK_FUNCS([ftruncate fgetpos fnmatch mkstemp strerror strstr]) # autoscan end Modified: m4/geany-mingw.m4 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -6,8 +6,6 @@ AC_DEFUN([GEANY_CHECK_MINGW], [ case "${host}" in *mingw*) - AC_CHECK_LIB([iberty], [fnmatch], [], - [AC_MSG_ERROR([fnmatch does not present in libiberty. You need to update it, read http://www.geany.org/Support/CrossCompile for details.])]) AC_DEFINE([WIN32], [1], [we are cross compiling for WIN32]) GEANY_CHECK_VTE([no]) GEANY_CHECK_SOCKET([yes]) Modified: src/Makefile.am 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -108,7 +108,7 @@ geany_LDADD = \ @GTK_LIBS@ \ @GTHREAD_LIBS@ \ $(INTLLIBS) \ - -lole32 -luuid -liberty -lwsock32 \ + -lole32 -luuid -lwsock32 \ geany_private.res AM_CFLAGS = -DGEANY_DATADIR=\"data\" \ Modified: wscript 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -193,6 +193,7 @@ def configure(conf): _add_to_env_and_define(conf, 'HAVE_REGCOMP', 1) # needed for CTags conf.check_cc(function_name='fgetpos', header_name='stdio.h', mandatory=False) + conf.check_cc(function_name='fnmatch', header_name='fnmatch.h', mandatory=False) conf.check_cc(function_name='ftruncate', header_name='unistd.h', mandatory=False) conf.check_cc(function_name='mkstemp', header_name='stdlib.h', mandatory=False) conf.check_cc(function_name='strstr', header_name='string.h') @@ -259,7 +260,7 @@ but you then may not have a local copy of the HTML manual.''' '-mwindows', '-static-libgcc', '-static-libstdc++']) - conf.env.append_value('LIB_WIN32', ['wsock32', 'uuid', 'ole32', 'iberty']) + conf.env.append_value('LIB_WIN32', ['wsock32', 'uuid', 'ole32']) # explicitly define Windows version for older Mingw environments conf.define('WINVER', '0x0501', quote=False) # for SHGetFolderPathAndSubDirW conf.define('_WIN32_IE', '0x0500', quote=False) # for SHGFP_TYPE -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] fea71a: Allow MRU file list length to be set to 0 to disable it
by Enrico Tröger 09 Nov '14

09 Nov '14

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 09 Nov 2014 10:22:16 UTC Commit: fea71a282fe91629335167f2c05ff2239c8e02e4 https://github.com/geany/geany/commit/fea71a282fe91629335167f2c05ff2239c8e0… Log Message: ----------- Allow MRU file list length to be set to 0 to disable it Since the rest of the code is already prepared for it, setting mru_length to 0 just disables the recent files menu. Modified Paths: -------------- data/geany.glade Modified: data/geany.glade 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -70,7 +70,7 @@ <property name="page_increment">10</property> </object> <object class="GtkAdjustment" id="adjustment8"> - <property name="lower">1</property> + <property name="lower">0</property> <property name="upper">50</property> <property name="value">4</property> <property name="step_increment">1</property> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] d4135c: Add prototypes for all plugin symbols
by Colomban Wendling 09 Nov '14

09 Nov '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 20 Oct 2014 15:55:32 UTC Commit: d4135c9842bb7fc0c8701fc47a1ab148bed5e992 https://github.com/geany/geany/commit/d4135c9842bb7fc0c8701fc47a1ab148bed5e… Log Message: ----------- Add prototypes for all plugin symbols This allows the compilers to check that the plugin's symbols have the proper prototype. Doing so can avoid subtle and hard-to-find bugs in case a plugin's symbol has incorrect signature as dlsym() can't check if the signature is actually the one we expect. As a bonus, it helps when using -Wmissing-prototypes as it provides the prototypes. Modified Paths: -------------- src/plugindata.h Modified: src/plugindata.h 26 lines changed, 17 insertions(+), 9 deletions(-) =================================================================== @@ -157,15 +157,6 @@ GeanyPlugin; } -#ifndef GEANY_PRIVATE - -/* Prototypes for building plugins with -Wmissing-prototypes */ -gint plugin_version_check(gint abi_ver); -void plugin_set_info(PluginInfo *info); - -#endif - - /** @deprecated - use plugin_set_key_group() instead. * @see PLUGIN_KEY_GROUP() macro. */ typedef struct GeanyKeyGroupInfo @@ -258,6 +249,23 @@ GeanyData; #define geany geany_data /**< Simple macro for @c geany_data that reduces typing. */ +#ifndef GEANY_PRIVATE + +/* Prototypes for building plugins with -Wmissing-prototypes + * Also allows the compiler to check if the signature of the plugin's + * symbol properly matches what we expect. */ +gint plugin_version_check(gint abi_ver); +void plugin_set_info(PluginInfo *info); + +void plugin_init(GeanyData *data); +GtkWidget *plugin_configure(GtkDialog *dialog); +void plugin_configure_single(GtkWidget *parent); +void plugin_help(void); +void plugin_cleanup(void); + +#endif + + /** This contains pointers to functions owned by Geany for plugins to use. * Functions from the core can be appended when needed by plugin authors, but may * require some changes. */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] aa0642: Merge branch 'plugin-symbols-protoypes'
by Colomban Wendling 09 Nov '14

09 Nov '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 08 Nov 2014 23:19:14 UTC Commit: aa06427c71ef337f0a80e8d3eb001771a226fece https://github.com/geany/geany/commit/aa06427c71ef337f0a80e8d3eb001771a226f… Log Message: ----------- Merge branch 'plugin-symbols-protoypes' Modified Paths: -------------- src/plugindata.h Modified: src/plugindata.h 26 lines changed, 17 insertions(+), 9 deletions(-) =================================================================== @@ -157,15 +157,6 @@ GeanyPlugin; } -#ifndef GEANY_PRIVATE - -/* Prototypes for building plugins with -Wmissing-prototypes */ -gint plugin_version_check(gint abi_ver); -void plugin_set_info(PluginInfo *info); - -#endif - - /** @deprecated - use plugin_set_key_group() instead. * @see PLUGIN_KEY_GROUP() macro. */ typedef struct GeanyKeyGroupInfo @@ -258,6 +249,23 @@ GeanyData; #define geany geany_data /**< Simple macro for @c geany_data that reduces typing. */ +#ifndef GEANY_PRIVATE + +/* Prototypes for building plugins with -Wmissing-prototypes + * Also allows the compiler to check if the signature of the plugin's + * symbol properly matches what we expect. */ +gint plugin_version_check(gint abi_ver); +void plugin_set_info(PluginInfo *info); + +void plugin_init(GeanyData *data); +GtkWidget *plugin_configure(GtkDialog *dialog); +void plugin_configure_single(GtkWidget *parent); +void plugin_help(void); +void plugin_cleanup(void); + +#endif + + /** This contains pointers to functions owned by Geany for plugins to use. * Functions from the core can be appended when needed by plugin authors, but may * require some changes. */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 54a9fd: Get rid of the nested members in TMTag
by Jiří Techet 08 Nov '14

08 Nov '14

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sat, 18 Oct 2014 19:40:11 UTC Commit: 54a9fd83ea0c98b6ba34fe7cd75f1e3a73daa0be https://github.com/geany/geany/commit/54a9fd83ea0c98b6ba34fe7cd75f1e3a73daa… Log Message: ----------- Get rid of the nested members in TMTag The only real change is the removal of struct and union in TMTag, the rest is purely mechanical removal of "atts.entry." everywhere. Modified Paths: -------------- src/editor.c src/sidebar.c src/symbols.c tagmanager/src/tm_source_file.c tagmanager/src/tm_tag.c tagmanager/src/tm_tag.h tagmanager/src/tm_workspace.c Modified: src/editor.c 26 lines changed, 13 insertions(+), 13 deletions(-) =================================================================== @@ -639,7 +639,7 @@ static void show_tags_list(GeanyEditor *editor, const GPtrArray *tags, gsize roo g_string_append(words, tag->name); /* for now, tag types don't all follow C, so just look at arglist */ - if (!EMPTY(tag->atts.entry.arglist)) + if (!EMPTY(tag->arglist)) g_string_append(words, "?2"); else g_string_append(words, "?1"); @@ -732,7 +732,7 @@ static void autocomplete_scope(GeanyEditor *editor) return; tag = g_ptr_array_index(tags, 0); - name = tag->atts.entry.var_type; + name = tag->var_type; if (name) { TMSourceFile *obj = editor->document->tm_file; @@ -1784,43 +1784,43 @@ static gint find_start_bracket(ScintillaObject *sci, gint pos) static gboolean append_calltip(GString *str, const TMTag *tag, filetype_id ft_id) { - if (! tag->atts.entry.arglist) + if (! tag->arglist) return FALSE; if (ft_id != GEANY_FILETYPES_PASCAL) { /* usual calltips: "retval tagname (arglist)" */ - if (tag->atts.entry.var_type) + if (tag->var_type) { guint i; - g_string_append(str, tag->atts.entry.var_type); - for (i = 0; i < tag->atts.entry.pointerOrder; i++) + g_string_append(str, tag->var_type); + for (i = 0; i < tag->pointerOrder; i++) { g_string_append_c(str, '*'); } g_string_append_c(str, ' '); } - if (tag->atts.entry.scope) + if (tag->scope) { const gchar *cosep = symbols_get_context_separator(ft_id); - g_string_append(str, tag->atts.entry.scope); + g_string_append(str, tag->scope); g_string_append(str, cosep); } g_string_append(str, tag->name); g_string_append_c(str, ' '); - g_string_append(str, tag->atts.entry.arglist); + g_string_append(str, tag->arglist); } else { /* special case Pascal calltips: "tagname (arglist) : retval" */ g_string_append(str, tag->name); g_string_append_c(str, ' '); - g_string_append(str, tag->atts.entry.arglist); + g_string_append(str, tag->arglist); - if (!EMPTY(tag->atts.entry.var_type)) + if (!EMPTY(tag->var_type)) { g_string_append(str, " : "); - g_string_append(str, tag->atts.entry.var_type); + g_string_append(str, tag->var_type); } } @@ -1862,7 +1862,7 @@ static gchar *find_calltip(const gchar *word, GeanyFiletype *ft) { tag = TM_TAG(tags->pdata[i]); - if (! tag->atts.entry.arglist) + if (! tag->arglist) tags->pdata[i] = NULL; } tm_tags_prune((GPtrArray *) tags); Modified: src/sidebar.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -904,7 +904,7 @@ static gboolean taglist_go_to_selection(GtkTreeSelection *selection, guint keyva if (! tag) return FALSE; - line = tag->atts.entry.line; + line = tag->line; if (line > 0) { GeanyDocument *doc = document_get_current(); Modified: src/symbols.c 64 lines changed, 32 insertions(+), 32 deletions(-) =================================================================== @@ -266,10 +266,10 @@ GString *symbols_find_tags_as_string(GPtrArray *tags_array, guint tag_types, gin for (j = 0; j < typedefs->len; ++j) { tag = TM_TAG(typedefs->pdata[j]); - /* tag->atts.file.lang contains the line of the tag if tag->atts.entry.file + /* tag->atts.file.lang contains the line of the tag if tag->file * is not NULL (geany document); otherwise it's a global tag with lang - * information in tag->atts.entry.lang */ - tag_lang = (tag->atts.entry.file) ? tag->atts.entry.file->lang : tag->atts.entry.lang; + * information in tag->lang */ + tag_lang = (tag->file) ? tag->file->lang : tag->lang; /* the check for tag_lang == lang is necessary to avoid wrong type colouring of * e.g. PHP classes in C++ files @@ -351,8 +351,8 @@ GString *symbols_get_macro_list(gint lang) for (i = 0; ((i < tags->len) && (i < editor_prefs.autocompletion_max_entries)); ++i) { tag = TM_TAG(tags->pdata[i]); - tag_lang = (tag->atts.entry.file) ? - tag->atts.entry.file->lang : tag->atts.entry.lang; + tag_lang = (tag->file) ? + tag->file->lang : tag->lang; if (tag_lang == lang) g_ptr_array_add(ftags, (gpointer) tags->pdata[i]); @@ -466,7 +466,7 @@ static gint compare_symbol(const TMTag *tag_a, const TMTag *tag_b) ret = strcmp(tag_a->name, tag_b->name); if (ret == 0) { - return tag_a->atts.entry.line - tag_b->atts.entry.line; + return tag_a->line - tag_b->line; } return ret; } @@ -482,15 +482,15 @@ static gint compare_symbol_lines(gconstpointer a, gconstpointer b) if (a == NULL || b == NULL) return 0; - ret = tag_a->atts.entry.line - tag_b->atts.entry.line; + ret = tag_a->line - tag_b->line; if (ret == 0) { - if (tag_a->atts.entry.scope == NULL) - return -(tag_a->atts.entry.scope != tag_b->atts.entry.scope); - if (tag_b->atts.entry.scope == NULL) - return tag_a->atts.entry.scope != tag_b->atts.entry.scope; + if (tag_a->scope == NULL) + return -(tag_a->scope != tag_b->scope); + if (tag_b->scope == NULL) + return tag_a->scope != tag_b->scope; else - return strcmp(tag_a->atts.entry.scope, tag_b->atts.entry.scope); + return strcmp(tag_a->scope, tag_b->scope); } return ret; } @@ -1035,7 +1035,7 @@ static void hide_empty_rows(GtkTreeStore *store) static const gchar *get_symbol_name(GeanyDocument *doc, const TMTag *tag, gboolean found_parent) { gchar *utf8_name; - const gchar *scope = tag->atts.entry.scope; + const gchar *scope = tag->scope; static GString *buffer = NULL; /* buffer will be small so we can keep it for reuse */ gboolean doc_is_utf8 = FALSE; @@ -1076,7 +1076,7 @@ static const gchar *get_symbol_name(GeanyDocument *doc, const TMTag *tag, gboole if (! doc_is_utf8) g_free(utf8_name); - g_string_append_printf(buffer, " [%lu]", tag->atts.entry.line); + g_string_append_printf(buffer, " [%lu]", tag->line); return buffer->str; } @@ -1106,7 +1106,7 @@ static gchar *get_symbol_tooltip(GeanyDocument *doc, const TMTag *tag) /* find the last word in "foo::bar::blah", e.g. "blah" */ static const gchar *get_parent_name(const TMTag *tag, filetype_id ft_id) { - const gchar *scope = tag->atts.entry.scope; + const gchar *scope = tag->scope; const gchar *separator = symbols_get_context_separator(ft_id); const gchar *str, *ptr; @@ -1224,9 +1224,9 @@ static gboolean tag_equal(gconstpointer v1, gconstpointer v2) const TMTag *t2 = v2; return (t1->type == t2->type && strcmp(t1->name, t2->name) == 0 && - utils_str_equal(t1->atts.entry.scope, t2->atts.entry.scope) && + utils_str_equal(t1->scope, t2->scope) && /* include arglist in match to support e.g. C++ overloading */ - utils_str_equal(t1->atts.entry.arglist, t2->atts.entry.arglist)); + utils_str_equal(t1->arglist, t2->arglist)); } @@ -1240,15 +1240,15 @@ static guint tag_hash(gconstpointer v) h = (h << 5) + h + tag->type; for (p = tag->name; *p != '\0'; p++) h = (h << 5) + h + *p; - if (tag->atts.entry.scope) + if (tag->scope) { - for (p = tag->atts.entry.scope; *p != '\0'; p++) + for (p = tag->scope; *p != '\0'; p++) h = (h << 5) + h + *p; } /* for e.g. C++ overloading */ - if (tag->atts.entry.arglist) + if (tag->arglist) { - for (p = tag->atts.entry.arglist; *p != '\0'; p++) + for (p = tag->arglist; *p != '\0'; p++) h = (h << 5) + h + *p; } @@ -1346,7 +1346,7 @@ static GList *tags_table_lookup(GHashTable *table, TMTag *tag) glong delta; data = node->data; -#define TAG_DELTA(a, b) ABS((glong) TM_TAG(a)->atts.entry.line - (glong) TM_TAG(b)->atts.entry.line) +#define TAG_DELTA(a, b) ABS((glong) TM_TAG(a)->line - (glong) TM_TAG(b)->line) delta = TAG_DELTA(((GList *) node->data)->data, tag); for (node = node->next; node; node = node->next) @@ -1540,7 +1540,7 @@ static void update_tree_tags(GeanyDocument *doc, GList **tags) gtk_tree_model_get(GTK_TREE_MODEL(store), node->data, SYMBOLS_COLUMN_TAG, &parent_tag, -1); - d = tag->atts.entry.line - parent_tag->atts.entry.line; + d = tag->line - parent_tag->line; if (! parent_search || (d >= 0 && d < delta)) { delta = d; @@ -1614,7 +1614,7 @@ static gboolean tag_has_missing_parent(const TMTag *tag, GtkTreeStore *store, GtkTreeIter *iter) { /* if the tag has a parent tag, it should be at depth >= 2 */ - return !EMPTY(tag->atts.entry.scope) && + return !EMPTY(tag->scope) && gtk_tree_store_iter_depth(store, iter) == 1; } @@ -1664,7 +1664,7 @@ static gint tree_sort_func(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, if (tag_a && tag_b) if (!sort_by_name || (utils_str_equal(tag_a->name, tag_b->name) && - utils_str_equal(tag_a->atts.entry.scope, tag_b->atts.entry.scope))) + utils_str_equal(tag_a->scope, tag_b->scope))) cmp = compare_symbol_lines(tag_a, tag_b); } } @@ -1948,13 +1948,13 @@ static gboolean goto_tag(const gchar *name, gboolean definition) if (tmtag != NULL) { GeanyDocument *new_doc = document_find_by_real_path( - tmtag->atts.entry.file->file_name); + tmtag->file->file_name); if (new_doc) { /* If we are already on the tag line, swap definition/declaration */ if (new_doc == old_doc && - tmtag->atts.entry.line == (guint)sci_get_current_line(old_doc->editor->sci) + 1) + tmtag->line == (guint)sci_get_current_line(old_doc->editor->sci) + 1) { if (goto_tag(name, !definition)) return TRUE; @@ -1963,10 +1963,10 @@ static gboolean goto_tag(const gchar *name, gboolean definition) else { /* not found in opened document, should open */ - new_doc = document_open_file(tmtag->atts.entry.file->file_name, FALSE, NULL, NULL); + new_doc = document_open_file(tmtag->file->file_name, FALSE, NULL, NULL); } - if (navqueue_goto_line(old_doc, new_doc, tmtag->atts.entry.line)) + if (navqueue_goto_line(old_doc, new_doc, tmtag->line)) return TRUE; } return FALSE; @@ -2135,7 +2135,7 @@ static gint get_current_tag_name(GeanyDocument *doc, gchar **tagname, guint tag_ if (tag) { - gint tag_line = tag->atts.entry.line - 1; + gint tag_line = tag->line - 1; gint last_child = line + 1; /* if it may be a false positive because we're inside a fold level not inside anything @@ -2150,8 +2150,8 @@ static gint get_current_tag_name(GeanyDocument *doc, gchar **tagname, guint tag_ if (line <= last_child) { - if (tag->atts.entry.scope) - *tagname = g_strconcat(tag->atts.entry.scope, + if (tag->scope) + *tagname = g_strconcat(tag->scope, symbols_get_context_separator(doc->file_type->id), tag->name, NULL); else *tagname = g_strdup(tag->name); Modified: tagmanager/src/tm_source_file.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -136,8 +136,8 @@ static void tm_source_file_set_tag_arglist(const char *tag_name, const char *arg if (tags != NULL && count == 1) { tag = tags[0]; - g_free(tag->atts.entry.arglist); - tag->atts.entry.arglist = g_strdup(arglist); + g_free(tag->arglist); + tag->arglist = g_strdup(arglist); } } Modified: tagmanager/src/tm_tag.c 160 lines changed, 80 insertions(+), 80 deletions(-) =================================================================== @@ -233,27 +233,27 @@ static gboolean tm_tag_init(TMTag *tag, TMSourceFile *file, const tagEntryInfo * return FALSE; tag->name = g_strdup(tag_entry->name); tag->type = get_tag_type(tag_entry->kindName); - tag->atts.entry.local = tag_entry->isFileScope; - tag->atts.entry.pointerOrder = 0; /* backward compatibility (use var_type instead) */ - tag->atts.entry.line = tag_entry->lineNumber; + 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->atts.entry.arglist = g_strdup(tag_entry->extensionFields.arglist); + tag->arglist = g_strdup(tag_entry->extensionFields.arglist); if ((NULL != tag_entry->extensionFields.scope[1]) && (isalpha(tag_entry->extensionFields.scope[1][0]) || tag_entry->extensionFields.scope[1][0] == '_' || tag_entry->extensionFields.scope[1][0] == '$')) - tag->atts.entry.scope = g_strdup(tag_entry->extensionFields.scope[1]); + tag->scope = g_strdup(tag_entry->extensionFields.scope[1]); if (tag_entry->extensionFields.inheritance != NULL) - tag->atts.entry.inheritance = g_strdup(tag_entry->extensionFields.inheritance); + tag->inheritance = g_strdup(tag_entry->extensionFields.inheritance); if (tag_entry->extensionFields.varType != NULL) - tag->atts.entry.var_type = g_strdup(tag_entry->extensionFields.varType); + tag->var_type = g_strdup(tag_entry->extensionFields.varType); if (tag_entry->extensionFields.access != NULL) - tag->atts.entry.access = get_tag_access(tag_entry->extensionFields.access); + tag->access = get_tag_access(tag_entry->extensionFields.access); if (tag_entry->extensionFields.implementation != NULL) - tag->atts.entry.impl = get_tag_impl(tag_entry->extensionFields.implementation); - if ((tm_tag_macro_t == tag->type) && (NULL != tag->atts.entry.arglist)) + tag->impl = get_tag_impl(tag_entry->extensionFields.implementation); + if ((tm_tag_macro_t == tag->type) && (NULL != tag->arglist)) tag->type = tm_tag_macro_with_arg_t; - tag->atts.entry.file = file; + tag->file = file; return TRUE; } } @@ -316,28 +316,28 @@ static gboolean tm_tag_init_from_file(TMTag *tag, TMSourceFile *file, FILE *fp) switch (*start) { case TA_LINE: - tag->atts.entry.line = atol((gchar*)start + 1); + tag->line = atol((gchar*)start + 1); break; case TA_LOCAL: - tag->atts.entry.local = atoi((gchar*)start + 1); + tag->local = atoi((gchar*)start + 1); break; case TA_TYPE: tag->type = (TMTagType) atoi((gchar*)start + 1); break; case TA_ARGLIST: - tag->atts.entry.arglist = g_strdup((gchar*)start + 1); + tag->arglist = g_strdup((gchar*)start + 1); break; case TA_SCOPE: - tag->atts.entry.scope = g_strdup((gchar*)start + 1); + tag->scope = g_strdup((gchar*)start + 1); break; case TA_POINTER: - tag->atts.entry.pointerOrder = atoi((gchar*)start + 1); + tag->pointerOrder = atoi((gchar*)start + 1); break; case TA_VARTYPE: - tag->atts.entry.var_type = g_strdup((gchar*)start + 1); + tag->var_type = g_strdup((gchar*)start + 1); break; case TA_INHERITS: - tag->atts.entry.inheritance = g_strdup((gchar*)start + 1); + tag->inheritance = g_strdup((gchar*)start + 1); break; case TA_TIME: /* Obsolete */ break; @@ -346,10 +346,10 @@ static gboolean tm_tag_init_from_file(TMTag *tag, TMSourceFile *file, FILE *fp) case TA_INACTIVE: /* Obsolete */ break; case TA_ACCESS: - tag->atts.entry.access = *(start + 1); + tag->access = *(start + 1); break; case TA_IMPL: - tag->atts.entry.impl = *(start + 1); + tag->impl = *(start + 1); break; default: #ifdef GEANY_DEBUG @@ -362,7 +362,7 @@ static gboolean tm_tag_init_from_file(TMTag *tag, TMSourceFile *file, FILE *fp) } if (NULL == tag->name) return FALSE; - tag->atts.entry.file = file; + tag->file = file; return TRUE; } @@ -397,8 +397,8 @@ static gboolean tm_tag_init_from_file_alt(TMTag *tag, TMSourceFile *file, FILE * if (field_len >= 1) tag->name = g_strdup(fields[0]); else tag->name = NULL; - if (field_len >= 2 && fields[1] != NULL) tag->atts.entry.var_type = g_strdup(fields[1]); - if (field_len >= 3 && fields[2] != NULL) tag->atts.entry.arglist = g_strdup(fields[2]); + if (field_len >= 2 && fields[1] != NULL) tag->var_type = g_strdup(fields[1]); + if (field_len >= 3 && fields[2] != NULL) tag->arglist = g_strdup(fields[2]); tag->type = tm_tag_prototype_t; g_strfreev(fields); } @@ -406,7 +406,7 @@ static gboolean tm_tag_init_from_file_alt(TMTag *tag, TMSourceFile *file, FILE * if (NULL == tag->name) return FALSE; - tag->atts.entry.file = file; + tag->file = file; return TRUE; } @@ -455,7 +455,7 @@ static gboolean tm_tag_init_from_file_ctags(TMTag *tag, TMSourceFile *file, FILE } } else /* assume a line */ - tag->atts.entry.line = atol(p); + tag->line = atol(p); tab = strstr(p, ";\""); /* read extension fields */ if (tab) @@ -522,35 +522,35 @@ static gboolean tm_tag_init_from_file_ctags(TMTag *tag, TMSourceFile *file, FILE } else if (0 == strcmp(key, "inherits")) /* comma-separated list of classes this class inherits from */ { - g_free(tag->atts.entry.inheritance); - tag->atts.entry.inheritance = g_strdup(value); + g_free(tag->inheritance); + tag->inheritance = g_strdup(value); } else if (0 == strcmp(key, "implementation")) /* implementation limit */ - tag->atts.entry.impl = get_tag_impl(value); + tag->impl = get_tag_impl(value); else if (0 == strcmp(key, "line")) /* line */ - tag->atts.entry.line = atol(value); + tag->line = atol(value); else if (0 == strcmp(key, "access")) /* access */ - tag->atts.entry.access = get_tag_access(value); + tag->access = get_tag_access(value); else if (0 == strcmp(key, "class") || 0 == strcmp(key, "enum") || 0 == strcmp(key, "function") || 0 == strcmp(key, "struct") || 0 == strcmp(key, "union")) /* Name of the class/enum/function/struct/union in which this tag is a member */ { - g_free(tag->atts.entry.scope); - tag->atts.entry.scope = g_strdup(value); + g_free(tag->scope); + tag->scope = g_strdup(value); } else if (0 == strcmp(key, "file")) /* static (local) tag */ - tag->atts.entry.local = TRUE; + tag->local = TRUE; else if (0 == strcmp(key, "signature")) /* arglist */ { - g_free(tag->atts.entry.arglist); - tag->atts.entry.arglist = g_strdup(value); + g_free(tag->arglist); + tag->arglist = g_strdup(value); } } } - tag->atts.entry.file = file; + tag->file = file; return TRUE; } @@ -583,7 +583,7 @@ TMTag *tm_tag_new_from_file(TMSourceFile *file, FILE *fp, gint mode, TMFileForma TAG_FREE(tag); return NULL; } - tag->atts.entry.lang = mode; + tag->lang = mode; return tag; } @@ -599,24 +599,24 @@ gboolean tm_tag_write(TMTag *tag, FILE *fp, guint attrs) fprintf(fp, "%s", tag->name); if (attrs & tm_tag_attr_type_t) fprintf(fp, "%c%d", TA_TYPE, tag->type); - if ((attrs & tm_tag_attr_arglist_t) && (NULL != tag->atts.entry.arglist)) - fprintf(fp, "%c%s", TA_ARGLIST, tag->atts.entry.arglist); + if ((attrs & tm_tag_attr_arglist_t) && (NULL != tag->arglist)) + fprintf(fp, "%c%s", TA_ARGLIST, tag->arglist); if (attrs & tm_tag_attr_line_t) - fprintf(fp, "%c%ld", TA_LINE, tag->atts.entry.line); + fprintf(fp, "%c%ld", TA_LINE, tag->line); if (attrs & tm_tag_attr_local_t) - fprintf(fp, "%c%d", TA_LOCAL, tag->atts.entry.local); - if ((attrs & tm_tag_attr_scope_t) && (NULL != tag->atts.entry.scope)) - fprintf(fp, "%c%s", TA_SCOPE, tag->atts.entry.scope); - if ((attrs & tm_tag_attr_inheritance_t) && (NULL != tag->atts.entry.inheritance)) - fprintf(fp, "%c%s", TA_INHERITS, tag->atts.entry.inheritance); + fprintf(fp, "%c%d", TA_LOCAL, tag->local); + if ((attrs & tm_tag_attr_scope_t) && (NULL != tag->scope)) + fprintf(fp, "%c%s", TA_SCOPE, tag->scope); + if ((attrs & tm_tag_attr_inheritance_t) && (NULL != tag->inheritance)) + fprintf(fp, "%c%s", TA_INHERITS, tag->inheritance); if (attrs & tm_tag_attr_pointer_t) - fprintf(fp, "%c%d", TA_POINTER, tag->atts.entry.pointerOrder); - if ((attrs & tm_tag_attr_vartype_t) && (NULL != tag->atts.entry.var_type)) - fprintf(fp, "%c%s", TA_VARTYPE, tag->atts.entry.var_type); - if ((attrs & tm_tag_attr_access_t) && (TAG_ACCESS_UNKNOWN != tag->atts.entry.access)) - fprintf(fp, "%c%c", TA_ACCESS, tag->atts.entry.access); - if ((attrs & tm_tag_attr_impl_t) && (TAG_IMPL_UNKNOWN != tag->atts.entry.impl)) - fprintf(fp, "%c%c", TA_IMPL, tag->atts.entry.impl); + fprintf(fp, "%c%d", TA_POINTER, tag->pointerOrder); + if ((attrs & tm_tag_attr_vartype_t) && (NULL != tag->var_type)) + fprintf(fp, "%c%s", TA_VARTYPE, tag->var_type); + if ((attrs & tm_tag_attr_access_t) && (TAG_ACCESS_UNKNOWN != tag->access)) + fprintf(fp, "%c%c", TA_ACCESS, tag->access); + if ((attrs & tm_tag_attr_impl_t) && (TAG_IMPL_UNKNOWN != tag->impl)) + fprintf(fp, "%c%c", TA_IMPL, tag->impl); if (fprintf(fp, "\n")) return TRUE; @@ -632,10 +632,10 @@ gboolean tm_tag_write(TMTag *tag, FILE *fp, guint attrs) static void tm_tag_destroy(TMTag *tag) { g_free(tag->name); - g_free(tag->atts.entry.arglist); - g_free(tag->atts.entry.scope); - g_free(tag->atts.entry.inheritance); - g_free(tag->atts.entry.var_type); + g_free(tag->arglist); + g_free(tag->scope); + g_free(tag->inheritance); + g_free(tag->var_type); } @@ -708,27 +708,27 @@ static int tm_tag_compare(const void *ptr1, const void *ptr2) return returnval; break; case tm_tag_attr_file_t: - if (0 != (returnval = (t1->atts.entry.file - t2->atts.entry.file))) + if (0 != (returnval = (t1->file - t2->file))) return returnval; break; case tm_tag_attr_scope_t: - if (0 != (returnval = strcmp(FALLBACK(t1->atts.entry.scope, ""), FALLBACK(t2->atts.entry.scope, "")))) + if (0 != (returnval = strcmp(FALLBACK(t1->scope, ""), FALLBACK(t2->scope, "")))) return returnval; break; case tm_tag_attr_arglist_t: - if (0 != (returnval = strcmp(FALLBACK(t1->atts.entry.arglist, ""), FALLBACK(t2->atts.entry.arglist, "")))) + if (0 != (returnval = strcmp(FALLBACK(t1->arglist, ""), FALLBACK(t2->arglist, "")))) { - int line_diff = (t1->atts.entry.line - t2->atts.entry.line); + int line_diff = (t1->line - t2->line); return line_diff ? line_diff : returnval; } break; case tm_tag_attr_vartype_t: - if (0 != (returnval = strcmp(FALLBACK(t1->atts.entry.var_type, ""), FALLBACK(t2->atts.entry.var_type, "")))) + if (0 != (returnval = strcmp(FALLBACK(t1->var_type, ""), FALLBACK(t2->var_type, "")))) return returnval; break; case tm_tag_attr_line_t: - if (0 != (returnval = (t1->atts.entry.line - t2->atts.entry.line))) + if (0 != (returnval = (t1->line - t2->line))) return returnval; break; } @@ -809,7 +809,7 @@ GPtrArray *tm_tags_remove_file_tags(TMSourceFile *source_file, GPtrArray *tags_a { TMTag *tag = tags_array->pdata[i]; - if (tag != NULL && tag->atts.entry.file == source_file) + if (tag != NULL && tag->file == source_file) tags_array->pdata[i] = NULL; } tm_tags_prune(tags_array); @@ -1121,7 +1121,7 @@ TMTagType tm_tag_name_type(const char* tag_name) static const char *tm_tag_impl_name(TMTag *tag) { g_return_val_if_fail(tag, NULL); - if (TAG_IMPL_VIRTUAL == tag->atts.entry.impl) + if (TAG_IMPL_VIRTUAL == tag->impl) return "virtual"; else return NULL; @@ -1130,11 +1130,11 @@ static const char *tm_tag_impl_name(TMTag *tag) static const char *tm_tag_access_name(TMTag *tag) { g_return_val_if_fail(tag, NULL); - if (TAG_ACCESS_PUBLIC == tag->atts.entry.access) + if (TAG_ACCESS_PUBLIC == tag->access) return "public"; - else if (TAG_ACCESS_PROTECTED == tag->atts.entry.access) + else if (TAG_ACCESS_PROTECTED == tag->access) return "protected"; - else if (TAG_ACCESS_PRIVATE == tag->atts.entry.access) + else if (TAG_ACCESS_PRIVATE == tag->access) return "private"; else return NULL; @@ -1159,18 +1159,18 @@ void tm_tag_print(TMTag *tag, FILE *fp) fprintf(fp, "%s ", impl); if (type) fprintf(fp, "%s ", type); - if (tag->atts.entry.var_type) - fprintf(fp, "%s ", tag->atts.entry.var_type); - if (tag->atts.entry.scope) - fprintf(fp, "%s::", tag->atts.entry.scope); + if (tag->var_type) + fprintf(fp, "%s ", tag->var_type); + if (tag->scope) + fprintf(fp, "%s::", tag->scope); fprintf(fp, "%s", tag->name); - if (tag->atts.entry.arglist) - fprintf(fp, "%s", tag->atts.entry.arglist); - if (tag->atts.entry.inheritance) - fprintf(fp, " : from %s", tag->atts.entry.inheritance); - if ((tag->atts.entry.file) && (tag->atts.entry.line > 0)) - fprintf(fp, "[%s:%ld]", tag->atts.entry.file->file_name - , tag->atts.entry.line); + if (tag->arglist) + fprintf(fp, "%s", tag->arglist); + if (tag->inheritance) + fprintf(fp, " : from %s", tag->inheritance); + if ((tag->file) && (tag->line > 0)) + fprintf(fp, "[%s:%ld]", tag->file->file_name + , tag->line); fprintf(fp, "\n"); } @@ -1197,9 +1197,9 @@ gint tm_tag_scope_depth(const TMTag *t) { gint depth; char *s; - if(!(t && t->atts.entry.scope)) + if(!(t && t->scope)) return 0; - for (s = t->atts.entry.scope, depth = 0; s; s = strstr(s, "::")) + for (s = t->scope, depth = 0; s; s = strstr(s, "::")) { ++ depth; ++ s; Modified: tagmanager/src/tm_tag.h 36 lines changed, 16 insertions(+), 20 deletions(-) =================================================================== @@ -124,26 +124,22 @@ typedef struct _TMTag { char *name; /**< Name of tag */ TMTagType type; /**< Tag Type */ - union - { - /** These are *real* tag attributes */ - struct - { - TMSourceFile *file; /**< File in which the tag occurs; NULL for global tags */ - gulong line; /**< Line number of the tag */ - gboolean local; /**< Is the tag of local scope */ - guint pointerOrder; - char *arglist; /**< Argument list (functions/prototypes/macros) */ - char *scope; /**< Scope of tag */ - char *inheritance; /**< Parent classes */ - char *var_type; /**< Variable type (maps to struct for typedefs) */ - char access; /**< Access type (public/protected/private/etc.) */ - char impl; /**< Implementation (e.g. virtual) */ - - langType lang; /**< Programming language of the file - set only for - global tags when the file member is NULL */ - } entry; - } atts; + + /** These are tag attributes */ + TMSourceFile *file; /**< File in which the tag occurs; NULL for global tags */ + gulong line; /**< Line number of the tag */ + gboolean local; /**< Is the tag of local scope */ + guint pointerOrder; + char *arglist; /**< Argument list (functions/prototypes/macros) */ + char *scope; /**< Scope of tag */ + char *inheritance; /**< Parent classes */ + char *var_type; /**< Variable type (maps to struct for typedefs) */ + char access; /**< Access type (public/protected/private/etc.) */ + char impl; /**< Implementation (e.g. virtual) */ + + langType lang; /**< Programming language of the file - set only for + global tags when the file member is NULL */ + gint refcount; /**< the reference count of the tag */ } TMTag; Modified: tagmanager/src/tm_workspace.c 108 lines changed, 54 insertions(+), 54 deletions(-) =================================================================== @@ -612,8 +612,8 @@ const GPtrArray *tm_workspace_find(const char *name, int type, TMTagAttrType *at if (matches[0] && *matches[0]) { /* tag->atts.file.lang contains the line of the tag and - * tags->atts.entry.file->lang contains the language */ - tags_lang = (*matches[0])->atts.entry.file->lang; + * tags->file->lang contains the language */ + tags_lang = (*matches[0])->file->lang; for (tagIter=0;tagIter<tagCount[0];++tagIter) { @@ -638,8 +638,8 @@ const GPtrArray *tm_workspace_find(const char *name, int type, TMTagAttrType *at { int tags_lang_alt = 0; /* tag->atts.file.lang contains the language and - * tags->atts.entry.file is NULL */ - tags_lang = (*matches[1])->atts.entry.lang; + * tags->file is NULL */ + tags_lang = (*matches[1])->lang; /* tags_lang_alt is used to load C global tags only once for C and C++ * lang = 1 is C++, lang = 0 is C * if we have lang 0, than accept also lang 1 for C++ */ @@ -675,14 +675,14 @@ const GPtrArray *tm_workspace_find(const char *name, int type, TMTagAttrType *at static gboolean match_langs(gint lang, const TMTag *tag) { - if (tag->atts.entry.file) + if (tag->file) { /* workspace tag */ - if (lang == tag->atts.entry.file->lang) + if (lang == tag->file->lang) return TRUE; } else { /* global tag */ - if (lang == tag->atts.entry.lang) + if (lang == tag->lang) return TRUE; } return FALSE; @@ -706,8 +706,8 @@ fill_find_tags_array (GPtrArray *dst, const GPtrArray *src, { for (tagIter = 0; tagIter < count; ++tagIter) { - if (! scope || (match[tagIter]->atts.entry.scope && - 0 == strcmp(match[tagIter]->atts.entry.scope, scope))) + if (! scope || (match[tagIter]->scope && + 0 == strcmp(match[tagIter]->scope, scope))) { if (type & match[tagIter]->type) if (lang == -1 || match_langs(lang, match[tagIter])) @@ -779,10 +779,10 @@ tm_get_current_tag (GPtrArray * file_tags, const gulong line, const guint tag_ty { TMTag *tag = TM_TAG (file_tags->pdata[i]); if (tag && tag->type & tag_types && - tag->atts.entry.line <= line && tag->atts.entry.line > matching_line) + tag->line <= line && tag->line > matching_line) { matching_tag = tag; - matching_line = tag->atts.entry.line; + matching_line = tag->line; } } } @@ -802,15 +802,15 @@ find_scope_members_tags (const GPtrArray * all, GPtrArray * tags, for (i = 0; (i < all->len); ++i) { tag = TM_TAG (all->pdata[i]); - if (no_definitions && filename && tag->atts.entry.file && + if (no_definitions && filename && tag->file && 0 != strcmp (filename, - tag->atts.entry.file->short_name)) + tag->file->short_name)) { continue; } - if (tag && tag->atts.entry.scope && tag->atts.entry.scope[0] != '\0') + if (tag && tag->scope && tag->scope[0] != '\0') { - if (0 == strncmp (name, tag->atts.entry.scope, len)) + if (0 == strncmp (name, tag->scope, len)) { g_ptr_array_add (local, tag); } @@ -827,7 +827,7 @@ find_scope_members_tags (const GPtrArray * all, GPtrArray * tags, for (i = 0; (i < local->len); ++i) { tag = TM_TAG (local->pdata[i]); - scope = tag->atts.entry.scope; + scope = tag->scope; if (scope && 0 == strcmp (name, scope)) { g_ptr_array_add (tags, tag); @@ -841,23 +841,23 @@ find_scope_members_tags (const GPtrArray * all, GPtrArray * tags, { backup = s_backup[0]; s_backup[0] = '\0'; - if (0 == strcmp (name, tag->atts.entry.scope)) + if (0 == strcmp (name, tag->scope)) { j = local->len; s_backup[0] = backup; break; } } - if (tag->atts.entry.file - && tag->atts.entry.file->lang == langJava) + if (tag->file + && tag->file->lang == langJava) { - scope = strrchr (tag->atts.entry.scope, '.'); + scope = strrchr (tag->scope, '.'); if (scope) var_type = scope + 1; } else { - scope = strrchr (tag->atts.entry.scope, ':'); + scope = strrchr (tag->scope, ':'); if (scope) { var_type = scope + 1; @@ -880,8 +880,8 @@ find_scope_members_tags (const GPtrArray * all, GPtrArray * tags, if (i == j) continue; tag2 = TM_TAG (local->pdata[j]); - if (tag2->atts.entry.var_type && - 0 == strcmp (var_type, tag2->atts.entry.var_type)) + if (tag2->var_type && + 0 == strcmp (var_type, tag2->var_type)) { break; } @@ -957,11 +957,11 @@ tm_workspace_find_scope_members (const GPtrArray * file_tags, const char *name, if ((tags2) && (tags2->len == 1) && (tag = TM_TAG (tags2->pdata[0]))) { - if (tag->type == tm_tag_typedef_t && tag->atts.entry.var_type - && tag->atts.entry.var_type[0] != '\0') + if (tag->type == tm_tag_typedef_t && tag->var_type + && tag->var_type[0] != '\0') { char *tmp_name; - tmp_name = tag->atts.entry.var_type; + tmp_name = tag->var_type; if (strcmp(tmp_name, new_name) == 0) { new_name = NULL; } @@ -970,22 +970,22 @@ tm_workspace_find_scope_members (const GPtrArray * file_tags, const char *name, } continue; } - filename = (tag->atts.entry.file ? - tag->atts.entry.file->short_name : NULL); - if (tag->atts.entry.scope && tag->atts.entry.scope[0] != '\0') + filename = (tag->file ? + tag->file->short_name : NULL); + if (tag->scope && tag->scope[0] != '\0') { del = 1; - if (tag->atts.entry.file && - tag->atts.entry.file->lang == langJava) + if (tag->file && + tag->file->lang == langJava) { new_name = g_strdup_printf ("%s.%s", - tag->atts.entry.scope, + tag->scope, new_name); } else { new_name = g_strdup_printf ("%s::%s", - tag->atts.entry.scope, + tag->scope, new_name); } } @@ -999,9 +999,9 @@ tm_workspace_find_scope_members (const GPtrArray * file_tags, const char *name, g_ptr_array_set_size (tags, 0); - if (no_definitions && tag && tag->atts.entry.file) + if (no_definitions && tag && tag->file) { - local = tm_tags_extract (tag->atts.entry.file->tags_array, + local = tm_tags_extract (tag->file->tags_array, (tm_tag_function_t | tm_tag_prototype_t | tm_tag_member_t | tm_tag_field_t | tm_tag_method_t | tm_tag_enumerator_t)); @@ -1098,16 +1098,16 @@ find_namespace_members_tags (const GPtrArray * all, GPtrArray * tags, for (i = 0; (i < all->len); ++i) { tag = TM_TAG (all->pdata[i]); - if (filename && tag->atts.entry.file && + if (filename && tag->file && 0 != strcmp (filename, - tag->atts.entry.file->short_name)) + tag->file->short_name)) { continue; } - if (tag && tag->atts.entry.scope && tag->atts.entry.scope[0] != '\0') + if (tag && tag->scope && tag->scope[0] != '\0') { - if (0 == strncmp (name, tag->atts.entry.scope, len)) + if (0 == strncmp (name, tag->scope, len)) { g_ptr_array_add (local, tag); } @@ -1120,7 +1120,7 @@ find_namespace_members_tags (const GPtrArray * all, GPtrArray * tags, for (i = 0; (i < local->len); ++i) { tag = TM_TAG (local->pdata[i]); - scope = tag->atts.entry.scope; + scope = tag->scope; /* if we wanna complete something like * namespace1:: @@ -1186,28 +1186,28 @@ tm_workspace_find_namespace_members (const GPtrArray * file_tags, const char *na if ((tags2) && (tags2->len == 1) && (tag = TM_TAG (tags2->pdata[0]))) { - if (tag->type == tm_tag_typedef_t && tag->atts.entry.var_type - && tag->atts.entry.var_type[0] != '\0') + if (tag->type == tm_tag_typedef_t && tag->var_type + && tag->var_type[0] != '\0') { - new_name = tag->atts.entry.var_type; + new_name = tag->var_type; continue; } - filename = (tag->atts.entry.file ? - tag->atts.entry.file->short_name : NULL); - if (tag->atts.entry.scope && tag->atts.entry.scope[0] != '\0') + filename = (tag->file ? + tag->file->short_name : NULL); + if (tag->scope && tag->scope[0] != '\0') { del = 1; - if (tag->atts.entry.file && - tag->atts.entry.file->lang == langJava) + if (tag->file && + tag->file->lang == langJava) { new_name = g_strdup_printf ("%s.%s", - tag->atts.entry.scope, + tag->scope, new_name); } else { new_name = g_strdup_printf ("%s::%s", - tag->atts.entry.scope, + tag->scope, new_name); } } @@ -1221,9 +1221,9 @@ tm_workspace_find_namespace_members (const GPtrArray * file_tags, const char *na g_ptr_array_set_size (tags, 0); - if (tag && tag->atts.entry.file) + if (tag && tag->file) { - local = tm_tags_extract (tag->atts.entry.file->tags_array, + local = tm_tags_extract (tag->file->tags_array, (tm_tag_function_t | tm_tag_field_t | tm_tag_enumerator_t | tm_tag_namespace_t | tm_tag_class_t )); @@ -1311,9 +1311,9 @@ static const GPtrArray *tm_workspace_get_parents(const gchar *name) while (i < parents->len) { tag = TM_TAG(parents->pdata[i]); - if ((NULL != tag->atts.entry.inheritance) && (isalpha(tag->atts.entry.inheritance[0]))) + if ((NULL != tag->inheritance) && (isalpha(tag->inheritance[0]))) { - klasses = g_strsplit(tag->atts.entry.inheritance, ",", 10); + klasses = g_strsplit(tag->inheritance, ",", 10); for (klass = klasses; (NULL != *klass); ++ klass) { for (j=0; j < parents->len; ++j) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] d8b178: Whitespace changes
by Jiří Techet 08 Nov '14

08 Nov '14

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Wed, 22 Oct 2014 13:59:36 UTC Commit: d8b178e4cbf4c0569a4b5c67e8c48f566d58a5b1 https://github.com/geany/geany/commit/d8b178e4cbf4c0569a4b5c67e8c48f566d58a… Log Message: ----------- Whitespace changes Modified Paths: -------------- tagmanager/src/tm_source_file.c tagmanager/src/tm_workspace.c tagmanager/src/tm_workspace.h Modified: tagmanager/src/tm_source_file.c 48 lines changed, 24 insertions(+), 24 deletions(-) =================================================================== @@ -58,24 +58,24 @@ static int get_path_max(const char *path) * with special chars within the filename */ static char *realpath (const char *pathname, char *resolved_path) { - int size; - - if (resolved_path != NULL) - { - int path_max = get_path_max(pathname); - size = GetFullPathNameA (pathname, path_max, resolved_path, NULL); - if (size > path_max) - return NULL; - else - return resolved_path; - } - else - { - size = GetFullPathNameA (pathname, 0, NULL, NULL); - resolved_path = g_new0 (char, size); - GetFullPathNameA (pathname, size, resolved_path, NULL); - return resolved_path; - } + int size; + + if (resolved_path != NULL) + { + int path_max = get_path_max(pathname); + size = GetFullPathNameA (pathname, path_max, resolved_path, NULL); + if (size > path_max) + return NULL; + else + return resolved_path; + } + else + { + size = GetFullPathNameA (pathname, 0, NULL, NULL); + resolved_path = g_new0 (char, size); + GetFullPathNameA (pathname, size, resolved_path, NULL); + return resolved_path; + } } #endif @@ -142,8 +142,8 @@ static void tm_source_file_set_tag_arglist(const char *tag_name, const char *arg } /* Initializes a TMSourceFile structure from a file name. */ -static gboolean tm_source_file_init(TMSourceFile *source_file, const char *file_name - , gboolean update, const char* name) +static gboolean tm_source_file_init(TMSourceFile *source_file, const char *file_name, + gboolean update, const char* name) { struct stat s; int status; @@ -412,8 +412,8 @@ void tm_source_file_update(TMSourceFile *source_file, gboolean update_workspace) } #ifdef TM_DEBUG else - g_message("Skipping workspace update because update_workspace is %s" - , update_workspace?"TRUE":"FALSE"); + g_message("Skipping workspace update because update_workspace is %s", + update_workspace?"TRUE":"FALSE"); #endif } @@ -459,8 +459,8 @@ void tm_source_file_buffer_update(TMSourceFile *source_file, guchar* text_buf, } #ifdef TM_DEBUG else - g_message("Skipping workspace update because update_workspace is %s" - , update_workspace?"TRUE":"FALSE"); + g_message("Skipping workspace update because update_workspace is %s", + update_workspace?"TRUE":"FALSE"); #endif } Modified: tagmanager/src/tm_workspace.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -584,8 +584,8 @@ void tm_workspace_update(void) -1 for all @return Array of matching tags. Do not free() it since it is a static member. */ -const GPtrArray *tm_workspace_find(const char *name, int type, TMTagAttrType *attrs - , gboolean partial, langType lang) +const GPtrArray *tm_workspace_find(const char *name, int type, TMTagAttrType *attrs, + gboolean partial, langType lang) { static GPtrArray *tags = NULL; TMTag **matches[2]; Modified: tagmanager/src/tm_workspace.h 12 lines changed, 6 insertions(+), 6 deletions(-) =================================================================== @@ -28,8 +28,8 @@ extern "C" */ typedef struct { - GPtrArray *global_tags; /**< Global tags loaded at startup */ - GPtrArray *source_files; /**< An array of TMSourceFile pointers */ + GPtrArray *global_tags; /**< Global tags loaded at startup */ + GPtrArray *source_files; /**< An array of TMSourceFile pointers */ GPtrArray *tags_array; /**< Sorted tags from all source files (just pointers to source file tags, the tag objects are owned by the source files) */ } TMWorkspace; @@ -48,14 +48,14 @@ const TMWorkspace *tm_get_workspace(void); gboolean tm_workspace_load_global_tags(const char *tags_file, gint mode); gboolean tm_workspace_create_global_tags(const char *pre_process, const char **includes, - int includes_count, const char *tags_file, int lang); + int includes_count, const char *tags_file, int lang); -const GPtrArray *tm_workspace_find(const char *name, int type, TMTagAttrType *attrs - , gboolean partial, langType lang); +const GPtrArray *tm_workspace_find(const char *name, int type, TMTagAttrType *attrs, + gboolean partial, langType lang); const GPtrArray * tm_workspace_find_scoped (const char *name, const char *scope, gint type, - TMTagAttrType *attrs, gboolean partial, langType lang, gboolean global_search); + TMTagAttrType *attrs, gboolean partial, langType lang, gboolean global_search); const GPtrArray *tm_workspace_find_scope_members(const GPtrArray *file_tags, const char *scope_name, -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2014