Commits August 2013

commits@lists.geany.org

1 participants
45 discussions

[geany/geany] c4f98d: Use proper string comparison for portability
by Nick Treleaven 11 Aug '13

11 Aug '13

Branch: refs/heads/master Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Sun, 11 Aug 2013 09:57:53 UTC Commit: c4f98d85cbd04b876b1925f69b1a8aff0004e7cf https://github.com/geany/geany/commit/c4f98d85cbd04b876b1925f69b1a8aff0004e… Log Message: ----------- Use proper string comparison for portability Modified Paths: -------------- src/dialogs.c Modified: src/dialogs.c 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1309,7 +1309,8 @@ static gint show_prompt(GtkWidget *parent, #ifdef G_OS_WIN32 /* our native dialog code doesn't support custom buttons */ - if (btn_3 == (gchar*)GTK_STOCK_YES && btn_2 == (gchar*)GTK_STOCK_NO && btn_1 == NULL) + if (utils_str_equal(btn_3, GTK_STOCK_YES) && + utils_str_equal(btn_2, GTK_STOCK_NO) && btn_1 == NULL) { gchar *string = (extra_text == NULL) ? g_strdup(question_text) : g_strconcat(question_text, "\n\n", extra_text, NULL); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] cc9e56: PHP: Fix parsing of anonymous functions using the "use" keyword
by Colomban Wendling 08 Aug '13

08 Aug '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 08 Aug 2013 15:27:25 UTC Commit: cc9e56e9bc1624dcebd4c2cae9010edd9acb1936 https://github.com/geany/geany/commit/cc9e56e9bc1624dcebd4c2cae9010edd9acb1… Log Message: ----------- PHP: Fix parsing of anonymous functions using the "use" keyword http://www.php.net/manual/en/language.namespaces.php#104136 Modified Paths: -------------- tagmanager/ctags/php.c tests/ctags/anonymous_functions.php tests/ctags/anonymous_functions.php.tags Modified: tagmanager/ctags/php.c 30 files changed, 28 insertions(+), 2 deletions(-) =================================================================== @@ -1085,7 +1085,8 @@ static boolean parseTrait (tokenInfo *const token) * * if @name is not NULL, parses an anonymous function with name @name * $foo = function($foo, $bar) {} - * $foo = function&($foo, $bar) {} */ + * $foo = function&($foo, $bar) {} + * $foo = function($foo, $bar) use ($x, &$y) {} */ static boolean parseFunction (tokenInfo *const token, const tokenInfo *name) { boolean readNext = TRUE; @@ -1176,8 +1177,33 @@ static boolean parseFunction (tokenInfo *const token, const tokenInfo *name) makeFunctionTag (name, arglist, access, impl); vStringDelete (arglist); - readToken (token); /* normally it's an open brace or a semicolon */ + readToken (token); /* normally it's an open brace or "use" keyword */ } + + /* skip use(...) */ + if (token->type == TOKEN_KEYWORD && token->keyword == KEYWORD_use) + { + readToken (token); + if (token->type == TOKEN_OPEN_PAREN) + { + int depth = 1; + + do + { + readToken (token); + switch (token->type) + { + case TOKEN_OPEN_PAREN: depth++; break; + case TOKEN_CLOSE_PAREN: depth--; break; + default: break; + } + } + while (token->type != TOKEN_EOF && depth > 0); + + readToken (token); + } + } + if (token->type == TOKEN_OPEN_CURLY) enterScope (token, name->string, K_FUNCTION); else Modified: tests/ctags/anonymous_functions.php 7 files changed, 7 insertions(+), 0 deletions(-) =================================================================== @@ -22,3 +22,10 @@ global $_g; return $_g; }; + +$f = function&() use (&$_g) { + + function f_sub() {} + + return $_g; +}; Modified: tests/ctags/anonymous_functions.php.tags 2 files changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -5,3 +5,5 @@ b c�16�()�0 d�16�()�0 e�16�()�0 +f�16�()�0 +f_sub�16�()�f�0 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] fb7bd3: PHP: Fix parsing of anonymous functions returning a reference
by Colomban Wendling 08 Aug '13

08 Aug '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 08 Aug 2013 15:27:25 UTC Commit: fb7bd34592e2905b83aee43c1a396354dfd6867a https://github.com/geany/geany/commit/fb7bd34592e2905b83aee43c1a396354dfd68… Log Message: ----------- PHP: Fix parsing of anonymous functions returning a reference Modified Paths: -------------- tagmanager/ctags/php.c tests/ctags/Makefile.am tests/ctags/anonymous_functions.php tests/ctags/anonymous_functions.php.tags Modified: tagmanager/ctags/php.c 14 files changed, 8 insertions(+), 6 deletions(-) =================================================================== @@ -1084,7 +1084,8 @@ static boolean parseTrait (tokenInfo *const token) * function &myfunc($foo, $bar) {} * * if @name is not NULL, parses an anonymous function with name @name - * $foo = function($foo, $bar) {} */ + * $foo = function($foo, $bar) {} + * $foo = function&($foo, $bar) {} */ static boolean parseFunction (tokenInfo *const token, const tokenInfo *name) { boolean readNext = TRUE; @@ -1092,20 +1093,21 @@ static boolean parseFunction (tokenInfo *const token, const tokenInfo *name) implType impl = CurrentStatement.impl; tokenInfo *nameFree = NULL; + readToken (token); + /* skip a possible leading ampersand (return by reference) */ + if (token->type == TOKEN_AMPERSAND) + readToken (token); + if (! name) { - readToken (token); - /* skip a possible leading ampersand (return by reference) */ - if (token->type == TOKEN_AMPERSAND) - readToken (token); if (token->type != TOKEN_IDENTIFIER) return FALSE; name = nameFree = newToken (); copyToken (nameFree, token, TRUE); + readToken (token); } - readToken (token); if (token->type == TOKEN_OPEN_PAREN) { vString *arglist = vStringNew (); Modified: tests/ctags/Makefile.am 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -13,6 +13,7 @@ test_sources = \ 3526726.tex \ 68hc11.asm \ angle_bracket.cpp \ + anonymous_functions.php \ array_ref_and_out.cs \ array_spec.f90 \ array-spec.f90 \ Modified: tests/ctags/anonymous_functions.php 24 files changed, 24 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,24 @@ +<?php + +$a = function() {}; + +$b = function($x, $y) {}; + +/* return a value */ +$c = function() { + return 42; +}; + +/* return a function */ +$d = function() { + return function() { + return "hello"; + }; +}; + +/* return by reference */ +$_g = 42; +$e = function&() { + global $_g; + return $_g; +}; Modified: tests/ctags/anonymous_functions.php.tags 7 files changed, 7 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,7 @@ +# format=tagmanager +_g�16384�0 +a�16�()�0 +b�16�($x, $y)�0 +c�16�()�0 +d�16�()�0 +e�16�()�0 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 9fbe2b: splitwindow: Change wording for keybinding to by in sync with tools-menu entries. Should fix #102
by Frank Lanitz 08 Aug '13

08 Aug '13

Branch: refs/heads/master Author: Frank Lanitz <flanitz(a)bgc-jena.mpg.de> Committer: Frank Lanitz <flanitz(a)bgc-jena.mpg.de> Date: Thu, 08 Aug 2013 09:43:12 UTC Commit: 9fbe2bc3193a2c1ee5af43c7b40fa3e69372433c https://github.com/geany/geany/commit/9fbe2bc3193a2c1ee5af43c7b40fa3e693724… Log Message: ----------- splitwindow: Change wording for keybinding to by in sync with tools-menu entries. Should fix #102 Modified Paths: -------------- plugins/splitwindow.c Modified: plugins/splitwindow.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -426,9 +426,9 @@ void plugin_init(GeanyData *data) /* setup keybindings */ key_group = plugin_set_key_group(geany_plugin, "split_window", KB_COUNT, NULL); keybindings_set_item(key_group, KB_SPLIT_HORIZONTAL, kb_activate, - 0, 0, "split_horizontal", _("Split Horizontally"), menu_items.horizontal); + 0, 0, "split_horizontal", _("Side by Side"), menu_items.horizontal); keybindings_set_item(key_group, KB_SPLIT_VERTICAL, kb_activate, - 0, 0, "split_vertical", _("Split Vertically"), menu_items.vertical); + 0, 0, "split_vertical", _("Top and Bottom"), menu_items.vertical); keybindings_set_item(key_group, KB_SPLIT_UNSPLIT, kb_activate, 0, 0, "split_unsplit", _("_Unsplit"), menu_items.unsplit); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] f15f61: Fix sign comparison warning
by elextr 05 Aug '13

05 Aug '13

Branch: refs/heads/master Author: elextr <elextr(a)gmail.com> Committer: elextr <elextr(a)gmail.com> Date: Mon, 05 Aug 2013 02:13:42 UTC Commit: f15f61768d190dbddb58a7e25b72be035f7cffda https://github.com/geany/geany/commit/f15f61768d190dbddb58a7e25b72be035f7cf… Log Message: ----------- Fix sign comparison warning Since the previous line ensured len is < 100, just casting it is fine. Modified Paths: -------------- src/editor.c Modified: src/editor.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -665,7 +665,7 @@ static gboolean match_last_chars(ScintillaObject *sci, gint pos, const gchar *st gchar *buf; g_return_val_if_fail(len < 100, FALSE); - g_return_val_if_fail(len <= pos, FALSE); + g_return_val_if_fail((gint)len <= pos, FALSE); buf = g_alloca(len + 1); sci_get_text_range(sci, pos - len, pos, buf); -------------- 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 August 2013