Commits July 2015

commits@lists.geany.org

1 participants
73 discussions

[geany/geany] 10e9dd: autotools: Workaround a Ubuntu issue when installing in /usr/local/lib
by Colomban Wendling 05 Jul '15

05 Jul '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 05 Jul 2015 14:17:55 UTC Commit: 10e9dd70899cf7bc28246d84dce8a6483ed85f80 https://github.com/geany/geany/commit/10e9dd70899cf7bc28246d84dce8a6483ed85… Log Message: ----------- autotools: Workaround a Ubuntu issue when installing in /usr/local/lib Ubuntu's linker apparently has a bug when installing in /usr/local/lib, as it is setup in such a way that makes libtool recognize it correctly as a system path so doesn't add RPATH to our executable, but ld can't find the library without an explicit ldconfig call (unlike when installing in /usr/lib). So, workaround this by explicitly calling ldconfig when installing in /usr/local/lib -- and when our library is actually not found, to try and avoid doing something unnecessary on working systems, like e.g. Debian. Modified Paths: -------------- src/Makefile.am Modified: src/Makefile.am 13 lines changed, 13 insertions(+), 0 deletions(-) =================================================================== @@ -179,3 +179,16 @@ signallist.i: $(glade_file) Makefile ) > $@ || { $(RM) $@ && exit 1; } CLEANFILES += signallist.i + +# Ubuntu ld has a bug so that libtool sees /usr/local/lib as a system path so +# doesn't add RPATH, but ld requires explicit ldconfig there, unlike when +# installing in /usr/lib. So, workaround this by calling it explicitly when +# installing in /usr/local/lib and libgeany is not found by the linker. +fix-ubuntu-libdir: + if test "$(DESTDIR)$(libdir)" = /usr/local/lib && \ + LANG=C ldd "$(DESTDIR)$(bindir)/geany" | grep -q 'libgeany.*not found' \ + ; then \ + ldconfig "$(DESTDIR)$(libdir)"; \ + fi + +install-exec-hook: fix-ubuntu-libdir -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 6ebf90: Add an explicit entry about libgeany in the NEWS
by Colomban Wendling 05 Jul '15

05 Jul '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 05 Jul 2015 00:04:22 UTC Commit: 6ebf90ad1d04b5c8eb50f69e9b497486ac66a10c https://github.com/geany/geany/commit/6ebf90ad1d04b5c8eb50f69e9b497486ac66a… Log Message: ----------- Add an explicit entry about libgeany in the NEWS Modified Paths: -------------- NEWS Modified: NEWS 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -11,6 +11,8 @@ Geany 1.25 (unreleased) * Depend on GTK 2.24 and GLib 2.28. * Add per-project line wrapping, line breaking and comment continuation settings. + * The plugin API is now split out of the main executable into libgeany, + a shared library plugins have to link against. Bug fixes * Fix applying filetype-specific indentation settings for newly -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 43a769: Fix a small inconsistency in the French translation
by Colomban Wendling 04 Jul '15

04 Jul '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 04 Jul 2015 16:44:39 UTC Commit: 43a76923dbee4726e140879714eeefc026fb528c https://github.com/geany/geany/commit/43a76923dbee4726e140879714eeefc026fb5… Log Message: ----------- Fix a small inconsistency in the French translation In the VTE, the "Input Method" string mimics a GTK string, so use the same translation as GTK. Modified Paths: -------------- po/fr.po Modified: po/fr.po 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: Geany 1.25\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-06-20 11:22+0200\n" -"PO-Revision-Date: 2015-06-22 23:59+0200\n" +"PO-Revision-Date: 2015-07-04 18:43+0200\n" "Last-Translator: Colomban Wendling <ban(a)herbesfolles.org>\n" "Language-Team: French <geany-i18n(a)uvena.de>\n" "Language: fr\n" @@ -5394,7 +5394,7 @@ msgstr "_Relancer le terminal" #: ../src/vte.c:654 msgid "_Input Methods" -msgstr "_Méthodes d'entrée" +msgstr "_Méthodes de saisie" #: ../src/vte.c:747 msgid "" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 401744: Merge pull request #477 from eht16/ctags_powershell
by Enrico Tröger 04 Jul '15

04 Jul '15

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sat, 04 Jul 2015 10:52:46 UTC Commit: 4017442f86b2374dce86cb3855b48d3d7c9e24fe https://github.com/geany/geany/commit/4017442f86b2374dce86cb3855b48d3d7c9e2… Log Message: ----------- Merge pull request #477 from eht16/ctags_powershell Add PowerShell tag parser Modified Paths: -------------- src/filetypes.c src/symbols.c tagmanager/ctags/Makefile.am tagmanager/ctags/makefile.win32 tagmanager/ctags/parsers.h tagmanager/ctags/powershell.c tagmanager/src/tm_parser.h tests/ctags/Makefile.am tests/ctags/simple.ps1 tests/ctags/simple.ps1.tags wscript Modified: src/filetypes.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -188,7 +188,7 @@ static void init_builtin_filetypes(void) FT_INIT( ASCIIDOC, ASCIIDOC, "Asciidoc", NULL, SOURCE_FILE, MARKUP ); FT_INIT( ABAQUS, ABAQUS, "Abaqus", NULL, SOURCE_FILE, SCRIPT ); FT_INIT( BATCH, NONE, "Batch", NULL, SCRIPT, SCRIPT ); - FT_INIT( POWERSHELL, NONE, "PowerShell", NULL, SOURCE_FILE, SCRIPT ); + FT_INIT( POWERSHELL, POWERSHELL, "PowerShell", NULL, SOURCE_FILE, SCRIPT ); FT_INIT( RUST, RUST, "Rust", NULL, SOURCE_FILE, COMPILED ); FT_INIT( COFFEESCRIPT, NONE, "CoffeeScript", NULL, SOURCE_FILE, SCRIPT ); FT_INIT( GO, GO, "Go", NULL, SOURCE_FILE, COMPILED ); Modified: src/symbols.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -315,7 +315,7 @@ GString *symbols_find_typenames_as_string(gint lang, gboolean global) * type. * @param ft_id File type identifier. * @return The context separator string. - * + * * Returns non-printing sequence "\x03" ie ETX (end of text) for filetypes * without a context separator. * @@ -331,6 +331,7 @@ const gchar *symbols_get_context_separator(gint ft_id) case GEANY_FILETYPES_GLSL: /* for structs */ /*case GEANY_FILETYPES_RUBY:*/ /* not sure what to use atm*/ case GEANY_FILETYPES_PHP: + case GEANY_FILETYPES_POWERSHELL: case GEANY_FILETYPES_RUST: case GEANY_FILETYPES_ZEPHIR: return "::"; Modified: tagmanager/ctags/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -43,6 +43,7 @@ parsers = \ pascal.c \ perl.c \ php.c \ + powershell.c \ python.c \ r.c \ rest.c \ Modified: tagmanager/ctags/makefile.win32 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -45,7 +45,7 @@ clean: -$(RM) deps.mak *.o $(COMPLIB) $(COMPLIB): abaqus.o abc.o args.o c.o cobol.o erlang.o fortran.o make.o conf.o pascal.o perl.o php.o diff.o vhdl.o verilog.o lua.o js.o json.o \ -actionscript.o nsis.o objc.o \ +actionscript.o nsis.o objc.o powershell.c \ haskell.o haxe.o html.o python.o lregex.o asciidoc.o rest.o sh.o ctags.o entry.o get.o keyword.o nestlevel.o \ options.o \ parse.o basic.o read.o sort.o strlist.o latex.o markdown.o matlab.o docbook.o tcl.o ruby.o rust.o asm.o sql.o txt2tags.o css.o \ Modified: tagmanager/ctags/parsers.h 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -65,7 +65,8 @@ RustParser, \ GoParser, \ JsonParser, \ - ZephirParser + ZephirParser, \ + PowerShellParser #endif /* _PARSERS_H */ Modified: tagmanager/ctags/powershell.c 628 lines changed, 628 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,628 @@ +/* +* Copyright (c) 2015, Enrico Tröger <enrico.troeger(a)uvena.de> +* +* Loosely based on the PHP tags parser since the syntax is somewhat similar +* regarding variable and function definitions. +* +* This source code is released for free distribution under the terms of the +* GNU General Public License. +* +* This module contains code for generating tags for Windows PowerShell scripts. +*/ + +/* +* INCLUDE FILES +*/ +#include "general.h" /* must always come first */ +#include "main.h" +#include "parse.h" +#include "read.h" +#include "vstring.h" +#include "keyword.h" +#include "entry.h" +#include <string.h> + +#define SCOPE_SEPARATOR "::" + + +#define ARRAY_LENGTH(array) (sizeof array / sizeof array[0]) + +#define ACCESS_UNDEFINED NULL +static const char *const accessTypes[] = { + ACCESS_UNDEFINED, + "global", + "local", + "script", + "private" +}; + +typedef enum { + K_FUNCTION, + K_VARIABLE, + COUNT_KIND +} powerShellKind; + +static kindOption PowerShellKinds[COUNT_KIND] = { + { TRUE, 'f', "function", "functions" }, + { TRUE, 'v', "variable", "variables" } +}; + + +typedef enum eTokenType { + TOKEN_UNDEFINED, + TOKEN_EOF, + TOKEN_CLOSE_PAREN, + TOKEN_SEMICOLON, + TOKEN_COLON, + TOKEN_COMMA, + TOKEN_KEYWORD, + TOKEN_OPEN_PAREN, + TOKEN_OPERATOR, + TOKEN_IDENTIFIER, + TOKEN_STRING, + TOKEN_PERIOD, + TOKEN_OPEN_CURLY, + TOKEN_CLOSE_CURLY, + TOKEN_EQUAL_SIGN, + TOKEN_OPEN_SQUARE, + TOKEN_CLOSE_SQUARE, + TOKEN_VARIABLE +} tokenType; + +typedef struct { + tokenType type; + vString * string; + vString * scope; + unsigned long lineNumber; + MIOPos filePosition; + int parentKind; /* -1 if none */ +} tokenInfo; + + +static const char *findValidAccessType (const char *const access) +{ + unsigned int i; + if (access == ACCESS_UNDEFINED) + return ACCESS_UNDEFINED; /* early out to save the for-loop if possible */ + for (i = 0; i < ARRAY_LENGTH(accessTypes); i++) + { + if (accessTypes[i] == ACCESS_UNDEFINED) + continue; + if (strcasecmp (access, accessTypes[i]) == 0) + return accessTypes[i]; + i++; + } + return ACCESS_UNDEFINED; +} + +static void initPowerShellEntry (tagEntryInfo *const e, const tokenInfo *const token, + const powerShellKind kind, const char *const access) +{ + initTagEntry (e, vStringValue (token->string)); + + e->lineNumber = token->lineNumber; + e->filePosition = token->filePosition; + e->kindName = PowerShellKinds[kind].name; + e->kind = (char) PowerShellKinds[kind].letter; + + if (access != NULL) + e->extensionFields.access = access; + if (vStringLength (token->scope) > 0) + { + int parentKind = token->parentKind; + Assert (parentKind >= 0); + + e->extensionFields.scope[0] = PowerShellKinds[parentKind].name; + e->extensionFields.scope[1] = vStringValue (token->scope); + } +} + +static void makeSimplePowerShellTag (const tokenInfo *const token, const powerShellKind kind, + const char *const access) +{ + if (PowerShellKinds[kind].enabled) + { + tagEntryInfo e; + + initPowerShellEntry (&e, token, kind, access); + makeTagEntry (&e); + } +} + +static void makeFunctionTag (const tokenInfo *const token, const vString *const arglist, + const char *const access) +{ + if (PowerShellKinds[K_FUNCTION].enabled) + { + tagEntryInfo e; + + initPowerShellEntry (&e, token, K_FUNCTION, access); + + if (arglist) + e.extensionFields.arglist = vStringValue (arglist); + + makeTagEntry (&e); + } +} + +static tokenInfo *newToken (void) +{ + tokenInfo *const token = xMalloc (1, tokenInfo); + + token->type = TOKEN_UNDEFINED; + token->string = vStringNew (); + token->scope = vStringNew (); + token->lineNumber = getSourceLineNumber (); + token->filePosition = getInputFilePosition (); + token->parentKind = -1; + + return token; +} + +static void deleteToken (tokenInfo *const token) +{ + vStringDelete (token->string); + vStringDelete (token->scope); + eFree (token); +} + +static void copyToken (tokenInfo *const dest, const tokenInfo *const src, + boolean scope) +{ + dest->lineNumber = src->lineNumber; + dest->filePosition = src->filePosition; + dest->type = src->type; + vStringCopy (dest->string, src->string); + dest->parentKind = src->parentKind; + if (scope) + vStringCopy (dest->scope, src->scope); +} + +static void addToScope (tokenInfo *const token, const vString *const extra) +{ + if (vStringLength (token->scope) > 0) + vStringCatS (token->scope, SCOPE_SEPARATOR); + vStringCatS (token->scope, vStringValue (extra)); + vStringTerminate (token->scope); +} + +static boolean isIdentChar (const int c) +{ + return (isalnum (c) || c == ':' || c == '_' || c == '-' || c >= 0x80); +} + +static int skipToCharacter (const int c) +{ + int d; + do + { + d = fileGetc (); + } while (d != EOF && d != c); + return d; +} + +static void parseString (vString *const string, const int delimiter) +{ + while (TRUE) + { + int c = fileGetc (); + + if (c == '\\' && (c = fileGetc ()) != EOF) + vStringPut (string, (char) c); + else if (c == EOF || c == delimiter) + break; + else + vStringPut (string, (char) c); + } + vStringTerminate (string); +} + +static void parseIdentifier (vString *const string, const int firstChar) +{ + int c = firstChar; + do + { + vStringPut (string, (char) c); + c = fileGetc (); + } while (isIdentChar (c)); + fileUngetc (c); + vStringTerminate (string); +} + +static boolean isTokenFunction (vString *const name) +{ + return (strcasecmp (vStringValue (name), "function") == 0 || + strcasecmp (vStringValue (name), "filter") == 0); +} + +static boolean isSpace (int c) +{ + return (c == '\t' || c == ' ' || c == '\v' || + c == '\n' || c == '\r' || c == '\f'); +} + +static int skipWhitespaces (int c) +{ + while (isSpace (c)) + c = fileGetc (); + return c; +} + +static int skipSingleComment (void) +{ + int c; + do + { + c = fileGetc (); + if (c == '\r') + { + int next = fileGetc (); + if (next != '\n') + fileUngetc (next); + else + c = next; + } + } while (c != EOF && c != '\n' && c != '\r'); + return c; +} + +static void readToken (tokenInfo *const token) +{ + int c; + + token->type = TOKEN_UNDEFINED; + vStringClear (token->string); + +getNextChar: + + c = fileGetc (); + c = skipWhitespaces (c); + + token->lineNumber = getSourceLineNumber (); + token->filePosition = getInputFilePosition (); + + switch (c) + { + case EOF: token->type = TOKEN_EOF; break; + case '(': token->type = TOKEN_OPEN_PAREN; break; + case ')': token->type = TOKEN_CLOSE_PAREN; break; + case ';': token->type = TOKEN_SEMICOLON; break; + case ',': token->type = TOKEN_COMMA; break; + case '.': token->type = TOKEN_PERIOD; break; + case ':': token->type = TOKEN_COLON; break; + case '{': token->type = TOKEN_OPEN_CURLY; break; + case '}': token->type = TOKEN_CLOSE_CURLY; break; + case '[': token->type = TOKEN_OPEN_SQUARE; break; + case ']': token->type = TOKEN_CLOSE_SQUARE; break; + case '=': token->type = TOKEN_EQUAL_SIGN; break; + + case '\'': + case '"': + token->type = TOKEN_STRING; + parseString (token->string, c); + token->lineNumber = getSourceLineNumber (); + token->filePosition = getInputFilePosition (); + break; + + case '<': + { + int d = fileGetc (); + if (d == '#') + { + /* <# ... #> multiline comment */ + do + { + c = skipToCharacter ('#'); + if (c != EOF) + { + c = fileGetc (); + if (c == '>') + break; + else + fileUngetc (c); + } + } while (c != EOF); + goto getNextChar; + } + else + { + fileUngetc (d); + token->type = TOKEN_UNDEFINED; + } + break; + } + + case '#': /* comment */ + skipSingleComment (); + goto getNextChar; + break; + + case '+': + case '-': + case '*': + case '/': + case '%': + { + int d = fileGetc (); + if (d != '=') + fileUngetc (d); + token->type = TOKEN_OPERATOR; + break; + } + + case '$': /* variable start */ + { + int d = fileGetc (); + if (! isIdentChar (d)) + { + fileUngetc (d); + token->type = TOKEN_UNDEFINED; + } + else + { + parseIdentifier (token->string, d); + token->type = TOKEN_VARIABLE; + } + break; + } + + default: + if (! isIdentChar (c)) + token->type = TOKEN_UNDEFINED; + else + { + parseIdentifier (token->string, c); + if (isTokenFunction (token->string)) + token->type = TOKEN_KEYWORD; + else + token->type = TOKEN_IDENTIFIER; + } + break; + } +} + +static void enterScope (tokenInfo *const parentToken, + const vString *const extraScope, + const int parentKind); + +/* strip a possible PowerShell scope specification and convert it to accessType */ +static const char *parsePowerShellScope (tokenInfo *const token) +{ + const char *access = ACCESS_UNDEFINED; + const char *const tokenName = vStringValue (token->string); + const char *powershellScopeEnd; + + powershellScopeEnd = strchr (tokenName, ':'); + if (powershellScopeEnd) + { + size_t powershellScopeLen; + vString * powershellScope = vStringNew (); + + powershellScopeLen = (size_t)(powershellScopeEnd - tokenName); + /* extract the scope */ + vStringNCopyS (powershellScope, tokenName, powershellScopeLen); + vStringTerminate (powershellScope); + /* cut the resulting scope string from the identifier */ + memmove (token->string->buffer, + /* +1 to skip the leading colon */ + token->string->buffer + powershellScopeLen + 1, + /* +1 for the skipped leading colon and - 1 to include the trailing \0 byte */ + token->string->length + 1 - powershellScopeLen - 1); + token->string->length -= powershellScopeLen + 1; + + access = findValidAccessType (vStringValue (powershellScope)); + + vStringDelete (powershellScope); + } + return access; +} + + +/* parse a function + * + * function myfunc($foo, $bar) {} + */ +static boolean parseFunction (tokenInfo *const token) +{ + boolean readNext = TRUE; + tokenInfo *nameFree = NULL; + const char *access; + + readToken (token); + + if (token->type != TOKEN_IDENTIFIER) + return FALSE; + + access = parsePowerShellScope (token); + + nameFree = newToken (); + copyToken (nameFree, token, TRUE); + readToken (token); + + if (token->type == TOKEN_OPEN_PAREN) + { + vString *arglist = vStringNew (); + int depth = 1; + + vStringPut (arglist, '('); + do + { + readToken (token); + + switch (token->type) + { + case TOKEN_OPEN_PAREN: depth++; break; + case TOKEN_CLOSE_PAREN: depth--; break; + default: break; + } + /* display part */ + switch (token->type) + { + case TOKEN_CLOSE_CURLY: vStringPut (arglist, '}'); break; + case TOKEN_CLOSE_PAREN: vStringPut (arglist, ')'); break; + case TOKEN_CLOSE_SQUARE: vStringPut (arglist, ']'); break; + case TOKEN_COLON: vStringPut (arglist, ':'); break; + case TOKEN_COMMA: vStringCatS (arglist, ", "); break; + case TOKEN_EQUAL_SIGN: vStringCatS (arglist, " = "); break; + case TOKEN_OPEN_CURLY: vStringPut (arglist, '{'); break; + case TOKEN_OPEN_PAREN: vStringPut (arglist, '('); break; + case TOKEN_OPEN_SQUARE: vStringPut (arglist, '['); break; + case TOKEN_PERIOD: vStringPut (arglist, '.'); break; + case TOKEN_SEMICOLON: vStringPut (arglist, ';'); break; + case TOKEN_STRING: vStringCatS (arglist, "'...'"); break; + + case TOKEN_IDENTIFIER: + case TOKEN_KEYWORD: + case TOKEN_VARIABLE: + { + switch (vStringLast (arglist)) + { + case 0: + case ' ': + case '{': + case '(': + case '[': + case '.': + /* no need for a space between those and the identifier */ + break; + + default: + vStringPut (arglist, ' '); + break; + } + if (token->type == TOKEN_VARIABLE) + vStringPut (arglist, '$'); + vStringCat (arglist, token->string); + break; + } + + default: break; + } + } + while (token->type != TOKEN_EOF && depth > 0); + + vStringTerminate (arglist); + + makeFunctionTag (nameFree, arglist, access); + vStringDelete (arglist); + + readToken (token); + } + else if (token->type == TOKEN_OPEN_CURLY) + { /* filters doesn't need to have an arglist */ + makeFunctionTag (nameFree, NULL, access); + } + + if (token->type == TOKEN_OPEN_CURLY) + enterScope (token, nameFree->string, K_FUNCTION); + else + readNext = FALSE; + + if (nameFree) + deleteToken (nameFree); + + return readNext; +} + +/* parses declarations of the form + * $var = VALUE + */ +static boolean parseVariable (tokenInfo *const token) +{ + tokenInfo *name; + boolean readNext = TRUE; + const char *access; + + name = newToken (); + copyToken (name, token, TRUE); + + readToken (token); + if (token->type == TOKEN_EQUAL_SIGN) + { + if (token->parentKind != K_FUNCTION) + { /* ignore local variables (i.e. within a function) */ + access = parsePowerShellScope (name); + makeSimplePowerShellTag (name, K_VARIABLE, access); + readNext = TRUE; + } + } + else + readNext = FALSE; + + deleteToken (name); + + return readNext; +} + +static void enterScope (tokenInfo *const parentToken, + const vString *const extraScope, + const int parentKind) +{ + tokenInfo *token = newToken (); + int origParentKind = parentToken->parentKind; + + copyToken (token, parentToken, TRUE); + + if (extraScope) + { + addToScope (token, extraScope); + token->parentKind = parentKind; + } + + readToken (token); + while (token->type != TOKEN_EOF && + token->type != TOKEN_CLOSE_CURLY) + { + boolean readNext = TRUE; + + switch (token->type) + { + case TOKEN_OPEN_CURLY: + enterScope (token, NULL, -1); + break; + + case TOKEN_KEYWORD: + readNext = parseFunction (token); + break; + + case TOKEN_VARIABLE: + readNext = parseVariable (token); + break; + + default: break; + } + + if (readNext) + readToken (token); + } + + copyToken (parentToken, token, FALSE); + parentToken->parentKind = origParentKind; + deleteToken (token); +} + +static void findPowerShellTags (void) +{ + tokenInfo *const token = newToken (); + + do + { + enterScope (token, NULL, -1); + } + while (token->type != TOKEN_EOF); /* keep going even with unmatched braces */ + + deleteToken (token); +} + +extern parserDefinition* PowerShellParser (void) +{ + static const char *const extensions [] = { "ps1", "psm1", NULL }; + parserDefinition* def = parserNew ("PowerShell"); + def->kinds = PowerShellKinds; + def->kindCount = KIND_COUNT (PowerShellKinds); + def->extensions = extensions; + def->parser = findPowerShellTags; + return def; +} + +/* vi:set tabstop=4 shiftwidth=4: */ Modified: tagmanager/src/tm_parser.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -72,6 +72,7 @@ typedef enum TM_PARSER_GO, TM_PARSER_JSON, TM_PARSER_ZEPHIR, + TM_PARSER_POWERSHELL, TM_PARSER_COUNT } TMParserType; Modified: tests/ctags/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -266,6 +266,7 @@ test_sources = \ simple.mak \ simple.php \ simple.pl \ + simple.ps1 \ simple.py \ simple.rb \ simple.sh \ Modified: tests/ctags/simple.ps1 112 lines changed, 112 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,112 @@ +# pseudo #!/PowerShell :) +# +# test file for the CTags/Geany PowerShell tag parser +# based on real world code but simplified for automated tests + +<# +multiline comment including a function and variable, both should be ignored: + +$IgnoreThisVaribale = "Stop" + +function IgnoreThisFunction($arg1) { + Write-Host "dummy" +} +#> + +# immediately stop the script if an errors occurs +$ErrorActionPreference = "Stop" + +# a global scoped variable +$Global:Settings = $null + +# a local scoped variable +$Local:ALocalVar = $null + +# a usual variable +$BasePath = split-path -parent $Global:MyInvocation.InvocationName + + +FUNCTION Read-Configuration-File() { + $Hostname = [System.Environment]::MachineName + $ConfigurationFileName = $BasePath + "\script-${Hostname}.conf" + LogMessage "Read configuration '${ConfigurationFileName}'" + + $ConfigFileContent = Get-Content -raw $ConfigurationFileName + $Global:Settings = Convertfrom-Stringdata $ConfigFileContent +} + +Function LogMessageOK() +{ + $x = [Console]::WindowWidth - 6 + $y = [Console]::CursorTop + Try { + [Console]::setcursorposition($x, $y) + } Catch [system.exception] { + # intentionally left empty for redirect of outputs to file + } + + Write-Host -foregroundcolor "green" "[ok]" +} + +function LogMessage() { + param( + [Parameter(Mandatory=$false)][switch] $NoNewLine, + [Parameter(Mandatory=$true)][string] $Message + ) + $Date = Get-Date -UFormat "%Y-%m-%d %T: " + Write-Host -foregroundcolor "yellow" -NoNewLine $Date + + if ($NoNewLine) { + Write-Host -foregroundcolor "green" -NoNewLine $Message + } else { + Write-Host -foregroundcolor "green" $Message + } +} + +function global:A-Global-Scope-Function() { + Write-Host "dummy" +} + +filter Script:MyFilter { + filter-something +} + +Filter Private:MyPrivateFilter { + filter-something +} + +function LoadTemplate($template) { + # woah, this is real magic, + # see http://stackoverflow.com/questions/10754582/string-interpolation-of-hashtab… + + # Set all unbound variables (@args) in the local context + while ($args) + { + ($key, $val, $args) = $args + Set-Variable -Name $key.SubString(1, $key.Length-2) -Value $val + } + $ExecutionContext.InvokeCommand.ExpandString($template) +} + +function TopLevelFunction() { + function SecondLevelNestedFunction() { + function ThirdLevelNestedFunction() { + doSomething() + } + + ThirdLevelNestedFunction + } + + SecondLevelNestedFunction +} + +function Main() { + Read-Configuration-File + LogMessage $("Working on Environment '{0}'" -f $Settings["EnvironmentName"]) + + LogMessage "do something ..." + Stripped-Down-Code + LogMessageOK +} + +Main Modified: tests/ctags/simple.ps1.tags 16 lines changed, 16 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,16 @@ +# format=tagmanager +A-Global-Scope-Function�16�()�0 +ALocalVar�16384�0 +BasePath�16384�0 +ErrorActionPreference�16384�0 +LoadTemplate�16�($template)�0 +LogMessage�16�()�0 +LogMessageOK�16�()�0 +Main�16�()�0 +MyFilter�16�0 +MyPrivateFilter�16�0 +Read-Configuration-File�16�()�0 +SecondLevelNestedFunction�16�()�TopLevelFunction�0 +Settings�16384�0 +ThirdLevelNestedFunction�16�()�TopLevelFunction::SecondLevelNestedFunction�0 +TopLevelFunction�16�()�0 Modified: wscript 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -106,6 +106,7 @@ ctags_sources = set([ 'tagmanager/ctags/r.c', 'tagmanager/ctags/perl.c', 'tagmanager/ctags/php.c', + 'tagmanager/ctags/powershell.c', 'tagmanager/ctags/python.c', 'tagmanager/ctags/read.c', 'tagmanager/ctags/rest.c', -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] a90b99: Merge pull request #540 from kugel-/win32-plugindir
by Enrico Tröger 04 Jul '15

04 Jul '15

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sat, 04 Jul 2015 10:29:22 UTC Commit: a90b99b968be529c59d0f371975c8be0bfbfa258 https://github.com/geany/geany/commit/a90b99b968be529c59d0f371975c8be0bfbfa… Log Message: ----------- Merge pull request #540 from kugel-/win32-plugindir win32: change default plugin dir to match Linux. Modified Paths: -------------- geany.nsi plugins/Makefile.am src/utils.c wscript Modified: geany.nsi 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -168,7 +168,7 @@ Section "Plugins" SEC02 SectionIn 1 SetOverwrite ifnewer SetOutPath "$INSTDIR\lib" - File "${RESOURCEDIR}\lib\*.dll" + File "${RESOURCEDIR}\lib\geany\*.dll" SectionEnd Section "Language Files" SEC03 Modified: plugins/Makefile.am 4 lines changed, 0 insertions(+), 4 deletions(-) =================================================================== @@ -3,11 +3,7 @@ EXTRA_DIST = \ makefile.win32 -if MINGW -plugindir = $(libdir) -else plugindir = $(libdir)/geany -endif plugins_includedir = $(includedir)/geany plugins_include_HEADERS = \ Modified: src/utils.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -2121,7 +2121,7 @@ const gchar *utils_resource_dir(GeanyResourceDirType type) resdirs[RESOURCE_DIR_ICON] = g_build_filename(prefix, "share", "icons", NULL); resdirs[RESOURCE_DIR_DOC] = g_build_filename(prefix, "doc", NULL); resdirs[RESOURCE_DIR_LOCALE] = g_build_filename(prefix, "share", "locale", NULL); - resdirs[RESOURCE_DIR_PLUGIN] = g_build_filename(prefix, "lib", NULL); + resdirs[RESOURCE_DIR_PLUGIN] = g_build_filename(prefix, "lib", "geany", NULL); g_free(prefix); #else if (is_osx_bundle()) Modified: wscript 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -401,7 +401,7 @@ def build(bld): def build_plugin(plugin_name, install=True, uselib_add=[]): if install: - instpath = '${PREFIX}/lib' if is_win32 else '${LIBDIR}/geany' + instpath = '${LIBDIR}/geany' else: instpath = None -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 41184e: Properly escape working directory in run script using g_shell_quote()
by Jiří Techet 03 Jul '15

03 Jul '15

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Fri, 03 Jul 2015 08:30:23 UTC Commit: 41184e4b986b513da7163136da38eb6401ca88e5 https://github.com/geany/geany/commit/41184e4b986b513da7163136da38eb6401ca8… Log Message: ----------- Properly escape working directory in run script using g_shell_quote() The g_strescape() function escapes non-ASCII characters so that bash doesn't understand them. Modified Paths: -------------- src/build.c Modified: src/build.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1088,9 +1088,9 @@ static gchar *build_create_shellscript(const gchar *working_dir, const gchar *cm str = g_strdup_printf("cd \"%s\"\n\n%s\n\n%s\ndel \"%%0\"\n\npause\n", working_dir, expanded_cmd, (autoclose) ? "" : "pause"); g_free(expanded_cmd); #else - escaped_dir = g_strescape(working_dir, NULL); + escaped_dir = g_shell_quote(working_dir); str = g_strdup_printf( - "#!/bin/sh\n\nrm $0\n\ncd \'%s\'\n\n%s\n\necho \"\n\n------------------\n(program exited with code: $?)\" \ + "#!/bin/sh\n\nrm $0\n\ncd %s\n\n%s\n\necho \"\n\n------------------\n(program exited with code: $?)\" \ \n\n%s\n", escaped_dir, cmd, (autoclose) ? "" : "\necho \"Press return to continue\"\n#to be more compatible with shells like " "dash\ndummy_var=\"\"\nread dummy_var"); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] e22f0c: travis: Add a Travis CI settings file
by Colomban Wendling 03 Jul '15

03 Jul '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 02 Jul 2015 19:45:16 UTC Commit: e22f0ca05417d026b434518ce60e344a62514738 https://github.com/geany/geany/commit/e22f0ca05417d026b434518ce60e344a62514… Log Message: ----------- travis: Add a Travis CI settings file Modified Paths: -------------- .travis.yml Modified: .travis.yml 24 lines changed, 24 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,24 @@ +# we use both C and C++, so advertize C++ +language: cpp +compiler: + - gcc +env: + - GTK3=no + - GTK3=yes +before_install: + - sudo apt-get update -qq +install: + - sudo apt-get install -y libgtk2.0-dev libgtk-3-dev intltool libtool + - sudo apt-get install -y python-docutils rst2pdf + # try not to install doxygen-latex because we don't need it and it's huge + - sudo apt-get install -y --no-install-recommends doxygen +before_script: + - export CFLAGS="-g -O2 -Werror=pointer-arith -Werror=aggregate-return -Werror=implicit-function-declaration" +script: + - > + NOCONFIGURE=1 ./autogen.sh && + mkdir _build && + cd _build && + ../configure --enable-gtk3=$GTK3 && + make -j2 && + make -j2 check -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 0b4228: win32: change default plugin dir to match Linux.
by Thomas Martitz 02 Jul '15

02 Jul '15

Branch: refs/heads/master Author: Thomas Martitz <kugel(a)rockbox.org> Committer: Thomas Martitz <kugel(a)rockbox.org> Date: Wed, 01 Jul 2015 21:41:37 UTC Commit: 0b4228b94c6d647cb761f96ffd9f619bb38c4306 https://github.com/geany/geany/commit/0b4228b94c6d647cb761f96ffd9f619bb38c4… Log Message: ----------- win32: change default plugin dir to match Linux. There is no need to do it differently as Linux here, and it confuses the autotools based compilation of geany-plugins which installs to libdir/geany unconditionally. Modified Paths: -------------- geany.nsi plugins/Makefile.am src/utils.c wscript Modified: geany.nsi 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -168,7 +168,7 @@ Section "Plugins" SEC02 SectionIn 1 SetOverwrite ifnewer SetOutPath "$INSTDIR\lib" - File "${RESOURCEDIR}\lib\*.dll" + File "${RESOURCEDIR}\lib\geany\*.dll" SectionEnd Section "Language Files" SEC03 Modified: plugins/Makefile.am 4 lines changed, 0 insertions(+), 4 deletions(-) =================================================================== @@ -3,11 +3,7 @@ EXTRA_DIST = \ makefile.win32 -if MINGW -plugindir = $(libdir) -else plugindir = $(libdir)/geany -endif plugins_includedir = $(includedir)/geany plugins_include_HEADERS = \ Modified: src/utils.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -2121,7 +2121,7 @@ const gchar *utils_resource_dir(GeanyResourceDirType type) resdirs[RESOURCE_DIR_ICON] = g_build_filename(prefix, "share", "icons", NULL); resdirs[RESOURCE_DIR_DOC] = g_build_filename(prefix, "doc", NULL); resdirs[RESOURCE_DIR_LOCALE] = g_build_filename(prefix, "share", "locale", NULL); - resdirs[RESOURCE_DIR_PLUGIN] = g_build_filename(prefix, "lib", NULL); + resdirs[RESOURCE_DIR_PLUGIN] = g_build_filename(prefix, "lib", "geany", NULL); g_free(prefix); #else if (is_osx_bundle()) Modified: wscript 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -397,7 +397,7 @@ def build(bld): def build_plugin(plugin_name, install=True, uselib_add=[]): if install: - instpath = '${PREFIX}/lib' if is_win32 else '${LIBDIR}/geany' + instpath = '${LIBDIR}/geany' else: instpath = None -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] aa4025: Fix invalid memory access when quitting
by Colomban Wendling 02 Jul '15

02 Jul '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 01 Jul 2015 21:03:38 UTC Commit: aa40250fdab5b1b5867b48a19d12c2a9cf2ecf7b https://github.com/geany/geany/commit/aa40250fdab5b1b5867b48a19d12c2a9cf2ec… Log Message: ----------- Fix invalid memory access when quitting When quitting and the prefs dialog has been created, the StashPrefs are destroyed before the stash tree and so the stash tree cleanup code accesses freed memory. Fix this by removing access to the StashPref in the tree cleanup code, as fixing it properly is a bit of a mess. Closes #538. Modified Paths: -------------- src/stash.c Modified: src/stash.c 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -979,7 +979,7 @@ struct StashTreeValue { const gchar *group_name; StashPref *pref; - union + struct { gchararray tree_string; gint tree_int; @@ -1075,8 +1075,8 @@ static gboolean stash_tree_discard_value(GtkTreeModel *model, GtkTreePath *path, StashTreeValue *value; gtk_tree_model_get(model, iter, STASH_TREE_VALUE, &value, -1); - if (value->pref->setting_type == G_TYPE_STRING) - g_free(value->data.tree_string); + /* don't access value->pref as it might already have been freed */ + g_free(value->data.tree_string); g_free(value); return FALSE; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 11d0d5: Merge pull request #519 from techee/cxx_o2
by Enrico Tröger 02 Jul '15

02 Jul '15

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Wed, 01 Jul 2015 18:42:12 UTC Commit: 11d0d54552aa3565c88db646169a13405b6692aa https://github.com/geany/geany/commit/11d0d54552aa3565c88db646169a13405b669… Log Message: ----------- Merge pull request #519 from techee/cxx_o2 Add -O2 flag also for C++ files when building with waf Modified Paths: -------------- wscript Modified: wscript 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -336,6 +336,10 @@ but you then may not have a local copy of the HTML manual.''' conf.env.append_value('CFLAGS', ['-DGTK']) conf.env.append_value('CXXFLAGS', ['-DNDEBUG', '-DGTK', '-DSCI_LEXER', '-DG_THREADS_IMPL_NONE']) + if conf.env['CXX_NAME'] == 'gcc' and '-O' not in ''.join(conf.env['CXXFLAGS']): + conf.env.append_value('CXXFLAGS', ['-O2']) + if revision is not None: + conf.env.append_value('CXXFLAGS', ['-g']) # summary Logs.pprint('BLUE', 'Summary:') -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2015