Commits February 2014

commits@lists.geany.org

1 participants
36 discussions

[geany/geany] 26d2ef: Merge branch 'win32-quote-spawn-args'
by Colomban Wendling 19 Feb '14

19 Feb '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 19 Feb 2014 15:15:52 UTC Commit: 26d2ef8d99c6c66796d7ab8b4a09aa230c9905ac https://github.com/geany/geany/commit/26d2ef8d99c6c66796d7ab8b4a09aa230c990… Log Message: ----------- Merge branch 'win32-quote-spawn-args' Closes bug #943 and PR #180. Modified Paths: -------------- src/win32.c Modified: src/win32.c 11 files changed, 9 insertions(+), 2 deletions(-) =================================================================== @@ -1038,6 +1038,7 @@ gboolean win32_spawn(const gchar *dir, gchar **argv, gchar **env, GSpawnFlags fl gchar *tmp_file = create_temp_file(); gchar *tmp_errfile = create_temp_file(); gchar *command; + gchar *locale_command; if (env != NULL) { @@ -1050,10 +1051,15 @@ gboolean win32_spawn(const gchar *dir, gchar **argv, gchar **env, GSpawnFlags fl return FALSE; } command = g_strjoinv(" ", argv); - SETPTR(command, g_strdup_printf("%s >%s 2>%s", + SETPTR(command, g_strdup_printf("cmd.exe /S /C \"%s >%s 2>%s\"", command, tmp_file, tmp_errfile)); + locale_command = g_locale_from_utf8(command, -1, NULL, NULL, NULL); + if (! locale_command) + locale_command = g_strdup(command); + geany_debug("WIN32: actually running command:\n%s", command); g_chdir(dir); - ret = system(command); + errno = 0; + ret = system(locale_command); /* the command can return -1 as an exit code, so check errno also */ fail = ret == -1 && errno; if (!fail) @@ -1067,6 +1073,7 @@ gboolean win32_spawn(const gchar *dir, gchar **argv, gchar **env, GSpawnFlags fl g_set_error_literal(error, G_SPAWN_ERROR, errno, g_strerror(errno)); g_free(command); + g_free(locale_command); g_unlink(tmp_file); g_free(tmp_file); g_unlink(tmp_errfile); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 044120: Windows: properly initialize errno before checking it
by Colomban Wendling 19 Feb '14

19 Feb '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 19 Feb 2014 14:56:24 UTC Commit: 044120e87ce8ce021832868ae690d282f59d3b15 https://github.com/geany/geany/commit/044120e87ce8ce021832868ae690d282f59d3… Log Message: ----------- Windows: properly initialize errno before checking it errno is never reset to 0 by the system libraries, so if we test its value we need to reset it to 0 before the call that may change it to something else. Modified Paths: -------------- src/win32.c Modified: src/win32.c 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1058,6 +1058,7 @@ gboolean win32_spawn(const gchar *dir, gchar **argv, gchar **env, GSpawnFlags fl locale_command = g_strdup(command); geany_debug("WIN32: actually running command:\n%s", command); g_chdir(dir); + errno = 0; ret = system(locale_command); /* the command can return -1 as an exit code, so check errno also */ fail = ret == -1 && errno; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 0ebf6a: Windows: convert the spawned command to locale encoding
by Colomban Wendling 19 Feb '14

19 Feb '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 19 Feb 2014 14:54:51 UTC Commit: 0ebf6ab82e8a9232caaabf0dd845390307fa1c80 https://github.com/geany/geany/commit/0ebf6ab82e8a9232caaabf0dd845390307fa1… Log Message: ----------- Windows: convert the spawned command to locale encoding Converting to locale encoding is required to allows non-ASCII characters in the command, e.g. in the file names. Modified Paths: -------------- src/win32.c Modified: src/win32.c 7 files changed, 6 insertions(+), 1 deletions(-) =================================================================== @@ -1038,6 +1038,7 @@ gboolean win32_spawn(const gchar *dir, gchar **argv, gchar **env, GSpawnFlags fl gchar *tmp_file = create_temp_file(); gchar *tmp_errfile = create_temp_file(); gchar *command; + gchar *locale_command; if (env != NULL) { @@ -1052,9 +1053,12 @@ gboolean win32_spawn(const gchar *dir, gchar **argv, gchar **env, GSpawnFlags fl command = g_strjoinv(" ", argv); SETPTR(command, g_strdup_printf("cmd.exe /S /C \"%s >%s 2>%s\"", command, tmp_file, tmp_errfile)); + locale_command = g_locale_from_utf8(command, -1, NULL, NULL, NULL); + if (! locale_command) + locale_command = g_strdup(command); geany_debug("WIN32: actually running command:\n%s", command); g_chdir(dir); - ret = system(command); + ret = system(locale_command); /* the command can return -1 as an exit code, so check errno also */ fail = ret == -1 && errno; if (!fail) @@ -1068,6 +1072,7 @@ gboolean win32_spawn(const gchar *dir, gchar **argv, gchar **env, GSpawnFlags fl g_set_error_literal(error, G_SPAWN_ERROR, errno, g_strerror(errno)); g_free(command); + g_free(locale_command); g_unlink(tmp_file); g_free(tmp_file); g_unlink(tmp_errfile); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 5c893e: Windows: fix spawning commands with spaces
by Colomban Wendling 19 Feb '14

19 Feb '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 19 Feb 2014 14:53:25 UTC Commit: 5c893e9b0eac95cc26f35a5dc279872ff1588f27 https://github.com/geany/geany/commit/5c893e9b0eac95cc26f35a5dc279872ff1588… Log Message: ----------- Windows: fix spawning commands with spaces Fix spawnning command under Windows when they contain spaces in both the executable and the arguments. Apparently system() quoting is unexpected, and doesn't work properly if there is more than 2 quotes in the whole command. To work this around, spawn the command through `cmd.exe /S /C`. Modified Paths: -------------- src/win32.c Modified: src/win32.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1050,7 +1050,7 @@ gboolean win32_spawn(const gchar *dir, gchar **argv, gchar **env, GSpawnFlags fl return FALSE; } command = g_strjoinv(" ", argv); - SETPTR(command, g_strdup_printf("%s >%s 2>%s", + SETPTR(command, g_strdup_printf("cmd.exe /S /C \"%s >%s 2>%s\"", command, tmp_file, tmp_errfile)); g_chdir(dir); ret = system(command); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 6af27e: Windows: add a debug to show the command as it is run
by Colomban Wendling 19 Feb '14

19 Feb '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 19 Feb 2014 14:53:25 UTC Commit: 6af27eeb7af7fbb458c93bf98133a6a177014a5e https://github.com/geany/geany/commit/6af27eeb7af7fbb458c93bf98133a6a177014… Log Message: ----------- Windows: add a debug to show the command as it is run Modified Paths: -------------- src/win32.c Modified: src/win32.c 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1052,6 +1052,7 @@ gboolean win32_spawn(const gchar *dir, gchar **argv, gchar **env, GSpawnFlags fl command = g_strjoinv(" ", argv); SETPTR(command, g_strdup_printf("cmd.exe /S /C \"%s >%s 2>%s\"", command, tmp_file, tmp_errfile)); + geany_debug("WIN32: actually running command:\n%s", command); g_chdir(dir); ret = system(command); /* the command can return -1 as an exit code, so check errno also */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 5a67a4: Fortran: report interfaces
by Colomban Wendling 18 Feb '14

18 Feb '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 18 Feb 2014 18:33:39 UTC Commit: 5a67a4f64c633e83d0764eb71caaa6707e19c71f https://github.com/geany/geany/commit/5a67a4f64c633e83d0764eb71caaa6707e19c… Log Message: ----------- Fortran: report interfaces Modified Paths: -------------- tagmanager/ctags/fortran.c tests/ctags/bug734933.f90.tags tests/ctags/numlib.f90.tags tests/ctags/recursive.f95.tags Modified: tagmanager/ctags/fortran.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -210,7 +210,7 @@ { TRUE, 'c', "macro", "common blocks"}, { TRUE, 'e', "entry", "entry points"}, { TRUE, 'f', "function", "functions"}, - { FALSE, 'i', "interface", "interface contents, generic names, and operators"}, + { TRUE, 'i', "interface", "interface contents, generic names, and operators"}, { TRUE, 'k', "member", "type and structure components"}, { TRUE, 'l', "label", "labels"}, { FALSE, 'L', "local", "local, common block, and namelist variables"}, Modified: tests/ctags/bug734933.f90.tags 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -8,6 +8,7 @@ COMPONENT_POINTER COMP_TMPÌ16384ÎMDCOMPONENTSÖ0 LIM_COMPONENTSÌ16384ÎMDCOMPONENTSÖ0 MDCOMPONENTSÌ256Ö0 +MEMDEALLOCÌ32ÎMDCOMPONENTSÖ0 NAMEÌ64ÎCOMPONENTÖ0 NCOMPÌ16384ÎMDCOMPONENTSÖ0 NUM_COMPONENTSÌ16384ÎMDCOMPONENTSÖ0 Modified: tests/ctags/numlib.f90.tags 3 files changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -1,2 +1,5 @@ # format=tagmanager +a2aldÌ128Înumerical_librariesÖ0 +b2lsfÌ128Înumerical_librariesÖ0 +fcnÌ128Îb2lsfÖ0 numerical_librariesÌ256Ö0 Modified: tests/ctags/recursive.f95.tags 8 files changed, 8 insertions(+), 0 deletions(-) =================================================================== @@ -1,6 +1,14 @@ # format=tagmanager approxĚ256Ö0 approx2Ě256Ö0 +arcsinĚ16ÎapproxÖ0 +arcsin1Ě16ÎapproxÖ0 +arcsin2Ě16ÎapproxÖ0 +arcsin3Ě16ÎapproxÖ0 +asĚ16Îapprox2Ö0 +as1Ě16Îapprox2Ö0 +as2Ě16Îapprox2Ö0 +as3Ě16Îapprox2Ö0 partsĚ16384ÎapproxÖ0 parts2Ě16384Îapprox2Ö0 yĚ16384ÎapproxÖ0 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 29336f: Fortran: display components
by Colomban Wendling 18 Feb '14

18 Feb '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 18 Feb 2014 18:11:47 UTC Commit: 29336ffed0742a876ef49ae3d6be220f09e554f2 https://github.com/geany/geany/commit/29336ffed0742a876ef49ae3d6be220f09e55… Log Message: ----------- Fortran: display components Modified Paths: -------------- src/symbols.c tagmanager/ctags/fortran.c tests/ctags/array-spec.f90.tags tests/ctags/bug565813.f90.tags tests/ctags/bug734933.f90.tags tests/ctags/invalid_name.f90.tags tests/ctags/misc_types.f90.tags tests/ctags/square_parens.f90.tags tests/ctags/structure.f.tags tests/ctags/union.f.tags Modified: src/symbols.c 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -977,6 +977,7 @@ static void add_top_level_items(GeanyDocument *doc) &(tv_iters.tag_function), _("Functions / Subroutines"), "classviewer-method", &(tv_iters.tag_variable), _("Variables"), "classviewer-var", &(tv_iters.tag_class), _("Types"), "classviewer-class", + &(tv_iters.tag_member), _("Components"), "classviewer-member", &(tv_iters.tag_macro), _("Blocks"), "classviewer-member", &(tv_iters.tag_other), _("Other"), "classviewer-other", NULL); Modified: tagmanager/ctags/fortran.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -211,7 +211,7 @@ { TRUE, 'e', "entry", "entry points"}, { TRUE, 'f', "function", "functions"}, { FALSE, 'i', "interface", "interface contents, generic names, and operators"}, - { TRUE, 'k', "component", "type and structure components"}, + { TRUE, 'k', "member", "type and structure components"}, { TRUE, 'l', "label", "labels"}, { FALSE, 'L', "local", "local, common block, and namelist variables"}, { TRUE, 'm', "namespace", "modules"}, Modified: tests/ctags/array-spec.f90.tags 4 files changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,7 @@ # format=tagmanager +df_mb_dataÌ64Îdf_typeÖ0 +df_mb_timeÌ64Îdf_typeÖ0 df_typeÌ1Îinm_dfÖ0 +df_wb_dataÌ64Îdf_typeÖ0 +df_wb_timeÌ64Îdf_typeÖ0 inm_dfÌ256Ö0 Modified: tests/ctags/bug565813.f90.tags 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,5 +1,6 @@ # format=tagmanager NÌ16384Îctags_bugÖ0 +barÌ64Îfoo_tÖ0 ctags_bugÌ256Ö0 foo_getbarÌ16Îctags_bugÖ0 foo_set_barÌ128Îctags_bugÖ0 Modified: tests/ctags/bug734933.f90.tags 4 files changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -8,5 +8,9 @@ COMPONENT_POINTER COMP_TMPÌ16384ÎMDCOMPONENTSÖ0 LIM_COMPONENTSÌ16384ÎMDCOMPONENTSÖ0 MDCOMPONENTSÌ256Ö0 +NAMEÌ64ÎCOMPONENTÖ0 NCOMPÌ16384ÎMDCOMPONENTSÖ0 NUM_COMPONENTSÌ16384ÎMDCOMPONENTSÖ0 +NUM_PARTÌ64ÎCOMPONENTÖ0 +PÌ64ÎCOMPONENT_POINTERÖ0 +PART_LISTÌ64ÎCOMPONENTÖ0 Modified: tests/ctags/invalid_name.f90.tags 3 files changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -1,5 +1,8 @@ # format=tagmanager +ActivityÌ64ÎDetection_RecordÖ0 DR_FilenameÌ16384ÎTR_DetectionRecordingÖ0 DR_LunÌ16384ÎTR_DetectionRecordingÖ0 Detection_RecordÌ1ÎTR_DetectionRecordingÖ0 +FaceÌ64ÎDetection_RecordÖ0 TR_DetectionRecordingÌ256Ö0 +TypeÌ64ÎDetection_RecordÖ0 Modified: tests/ctags/misc_types.f90.tags 2 files changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -1,5 +1,7 @@ # format=tagmanager +align_second_16Ì64Îmy_structÖ0 base_typeÌ16384ÎtestallocÖ0 +first_byteÌ64Îmy_structÖ0 iÌ16384ÎtestallocÖ0 i2Ì16384ÎtestallocÖ0 i3Ì16384ÎtestallocÖ0 Modified: tests/ctags/square_parens.f90.tags 2 files changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -6,7 +6,9 @@ invisible invisible_fourĚ16384ÎsquaretestÖ0 invisible_threeĚ16384ÎsquaretestÖ0 invisible_twoĚ16384ÎsquaretestÖ0 +iterationsĚ64ÎSymmetryÖ0 mainĚ2048Ö0 +matrixĚ64ÎSymmetryÖ0 squaretestĚ256Ö0 stateĚ16384ÎsquaretestÖ0 state_twoĚ16384ÎsquaretestÖ0 Modified: tests/ctags/structure.f.tags 9 files changed, 9 insertions(+), 0 deletions(-) =================================================================== @@ -1,10 +1,19 @@ # format=tagmanager +aÌ64ÎanonymousÖ0 +cloudsÌ64ÎweatherÖ0 +dayÌ64ÎweatherÖ0 initialized_structureÌ2048Ö0 latestÌ16384Îinitialized_structureÖ0 latestÌ16384Îuninitialized_structureÖ0 +level2Ì64ÎtopÖ0 +level3aÌ64ÎnestedÖ0 +level3bÌ64ÎnestedÖ0 +monthÌ64ÎweatherÖ0 nestedÌ1ÎtopÖ0 nested_structureÌ2048Ö0 +rainfallÌ64ÎweatherÖ0 topÌ1Înested_structureÖ0 uninitialized_structureÌ2048Ö0 weatherÌ1Îinitialized_structureÖ0 weatherÌ1Îuninitialized_structureÖ0 +yearÌ64ÎweatherÖ0 Modified: tests/ctags/union.f.tags 4 files changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,8 @@ # format=tagmanager +dateÌ64ÎstartÖ0 +dayÌ64ÎstartÖ0 +monthÌ64ÎstartÖ0 sdateÌ16384ÎwritedateÖ0 startÌ1ÎwritedateÖ0 writedateÌ2048Ö0 +yearÌ64ÎstartÖ0 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 362a5c: Fortran: properly report scope for programs, subroutines and types
by Colomban Wendling 18 Feb '14

18 Feb '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 18 Feb 2014 18:04:37 UTC Commit: 362a5cc6548982efa0898eaeabc353c089397580 https://github.com/geany/geany/commit/362a5cc6548982efa0898eaeabc353c089397… Log Message: ----------- Fortran: properly report scope for programs, subroutines and types To do this we change the internal types to only use types matched by symbols_get_current_scope(). This is a bit of a hack, but the tag types were already questionable and simply mapped to ones the TagManager know. This however merges Functions and Subroutines under the same top-level item in the symbol list. Modified Paths: -------------- src/symbols.c tagmanager/ctags/fortran.c tests/ctags/array-spec.f90.tags tests/ctags/auto.f.tags tests/ctags/bug565813.f90.tags tests/ctags/bug670433.f90.tags tests/ctags/bug726712.f90.tags tests/ctags/bug734933.f90.tags tests/ctags/bug858165.f90.tags tests/ctags/bug877956.f90.tags tests/ctags/byte.f.tags tests/ctags/common.f.tags tests/ctags/debian_432872.f90.tags tests/ctags/forall_module.f90.tags tests/ctags/fortran_associate.f90.tags tests/ctags/invalid_name.f90.tags tests/ctags/misc_types.f.tags tests/ctags/misc_types.f90.tags tests/ctags/namelist.f.tags tests/ctags/procedure_pointer_module.f90.tags tests/ctags/procpoint.f90.tags tests/ctags/square_parens.f90.tags tests/ctags/stdcall.f.tags tests/ctags/structure.f.tags tests/ctags/union.f.tags tests/ctags/value.f.tags Modified: src/symbols.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -972,11 +972,11 @@ static void add_top_level_items(GeanyDocument *doc) { tag_list_add_groups(tag_store, &(tv_iters.tag_namespace), _("Module"), "classviewer-class", + &(tv_iters.tag_struct), _("Programs"), "classviewer-class", &(tv_iters.tag_interface), _("Interfaces"), "classviewer-struct", - &(tv_iters.tag_function), _("Functions"), "classviewer-method", - &(tv_iters.tag_member), _("Subroutines"), "classviewer-method", + &(tv_iters.tag_function), _("Functions / Subroutines"), "classviewer-method", &(tv_iters.tag_variable), _("Variables"), "classviewer-var", - &(tv_iters.tag_type), _("Types"), "classviewer-namespace", + &(tv_iters.tag_class), _("Types"), "classviewer-class", &(tv_iters.tag_macro), _("Blocks"), "classviewer-member", &(tv_iters.tag_other), _("Other"), "classviewer-other", NULL); Modified: tagmanager/ctags/fortran.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -216,9 +216,9 @@ { FALSE, 'L', "local", "local, common block, and namelist variables"}, { TRUE, 'm', "namespace", "modules"}, { TRUE, 'n', "namelist", "namelists"}, - { TRUE, 'p', "package", "programs"}, - { TRUE, 's', "member", "subroutines"}, - { TRUE, 't', "typedef", "derived types and structures"}, + { TRUE, 'p', "struct", "programs"}, + { TRUE, 's', "method", "subroutines"}, + { TRUE, 't', "class", "derived types and structures"}, { TRUE, 'v', "variable", "program (global) and module variables"} }; Modified: tests/ctags/array-spec.f90.tags 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,3 @@ # format=tagmanager -df_typeÌ4096Îinm_dfÖ0 +df_typeÌ1Îinm_dfÖ0 inm_dfÌ256Ö0 Modified: tests/ctags/auto.f.tags 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,5 @@ # format=tagmanager -AUTO_TESTÌ512Ö0 +AUTO_TESTÌ2048Ö0 DÌ16384ÎAUTO_TESTÖ0 PÌ16384ÎAUTO_TESTÖ0 QÌ16384ÎAUTO_TESTÖ0 Modified: tests/ctags/bug565813.f90.tags 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -2,6 +2,6 @@ NÌ16384Îctags_bugÖ0 ctags_bugÌ256Ö0 foo_getbarÌ16Îctags_bugÖ0 -foo_set_barÌ64Îctags_bugÖ0 -foo_setbarÌ64Îctags_bugÖ0 -foo_tÌ4096Îctags_bugÖ0 +foo_set_barÌ128Îctags_bugÖ0 +foo_setbarÌ128Îctags_bugÖ0 +foo_tÌ1Îctags_bugÖ0 Modified: tests/ctags/bug670433.f90.tags 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,5 @@ # format=tagmanager -barÌ64ÎfoobarÖ0 +barÌ128ÎfoobarÖ0 fÌ16ÎfooÖ0 fooÌ16ÎfoobarÖ0 foobarÌ256Ö0 Modified: tests/ctags/bug726712.f90.tags 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -1,4 +1,4 @@ # format=tagmanager -sub1Ì64Ö0 -sub2Ì64Ö0 -tagstest_ctrlÌ64Ö0 +sub1Ì128Ö0 +sub2Ì128Ö0 +tagstest_ctrlÌ128Ö0 Modified: tests/ctags/bug734933.f90.tags 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -1,10 +1,10 @@ # format=tagmanager -ADD_COMPONENTSÌ64ÎMDCOMPONENTSÖ0 +ADD_COMPONENTSÌ128ÎMDCOMPONENTSÖ0 COMPÌ16384ÎMDCOMPONENTSÖ0 -COMPONENTÌ4096ÎMDCOMPONENTSÖ0 +COMPONENTÌ1ÎMDCOMPONENTSÖ0 COMPONENTSÌ16384ÎMDCOMPONENTSÖ0 COMPONENTS_TMPÌ16384ÎMDCOMPONENTSÖ0 -COMPONENT_POINTERÌ4096ÎMDCOMPONENTSÖ0 +COMPONENT_POINTERÌ1ÎMDCOMPONENTSÖ0 COMP_TMPÌ16384ÎMDCOMPONENTSÖ0 LIM_COMPONENTSÌ16384ÎMDCOMPONENTSÖ0 MDCOMPONENTSÌ256Ö0 Modified: tests/ctags/bug858165.f90.tags 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -3,4 +3,4 @@ a bÌ16384ÎtestÖ0 cÌ16384ÎtestÖ0 dÌ16384ÎtestÖ0 -testÌ512Ö0 +testÌ2048Ö0 Modified: tests/ctags/bug877956.f90.tags 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,4 @@ # format=tagmanager c2Ì16384ÎtestÖ0 cm1Ì16384ÎtestÖ0 -testÌ512Ö0 +testÌ2048Ö0 Modified: tests/ctags/byte.f.tags 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -8,4 +8,4 @@ B2 CÌ16384Îbyte_testÖ0 C1Ì16384Îbyte_testÖ0 C2Ì16384Îbyte_testÖ0 -byte_testÌ512Ö0 +byte_testÌ2048Ö0 Modified: tests/ctags/common.f.tags 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -2,4 +2,4 @@ common1Ì65536ÎmainÖ0 common2Ì65536ÎmainÖ0 common3Ì65536ÎmainÖ0 -mainÌ512Ö0 +mainÌ2048Ö0 Modified: tests/ctags/debian_432872.f90.tags 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,3 @@ # format=tagmanager FOOÌ256Ö0 -FOOÌ64ÎFOOÖ0 +FOOÌ128ÎFOOÖ0 Modified: tests/ctags/forall_module.f90.tags 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,5 @@ # format=tagmanager aÌ16384Îwith_forallÖ0 -sub_with_forallÌ64Îwith_forallÖ0 +sub_with_forallÌ128Îwith_forallÖ0 twoÌ16Îwith_forallÖ0 with_forallÌ256Ö0 Modified: tests/ctags/fortran_associate.f90.tags 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,5 @@ # format=tagmanager aÌ16384Îwith_associateÖ0 -do_other_stuffÌ64Îwith_associateÖ0 +do_other_stuffÌ128Îwith_associateÖ0 do_stuffÌ16Îwith_associateÖ0 with_associateÌ256Ö0 Modified: tests/ctags/invalid_name.f90.tags 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,5 @@ # format=tagmanager DR_FilenameÌ16384ÎTR_DetectionRecordingÖ0 DR_LunÌ16384ÎTR_DetectionRecordingÖ0 -Detection_RecordÌ4096ÎTR_DetectionRecordingÖ0 +Detection_RecordÌ1ÎTR_DetectionRecordingÖ0 TR_DetectionRecordingÌ256Ö0 Modified: tests/ctags/misc_types.f.tags 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,4 @@ # format=tagmanager INFOOBARÌ16384ÎspecsÖ0 MÌ16384ÎspecsÖ0 -specsÌ512Ö0 +specsÌ2048Ö0 Modified: tests/ctags/misc_types.f90.tags 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -9,7 +9,7 @@ i6 i7Ì16384ÎtestallocÖ0 i8Ì16384ÎtestallocÖ0 listÌ16384ÎtestallocÖ0 -my_structÌ4096ÎtestallocÖ0 +my_structÌ1ÎtestallocÖ0 statusÌ16384ÎtestallocÖ0 -testallocÌ512Ö0 +testallocÌ2048Ö0 the_structÌ16384ÎtestallocÖ0 Modified: tests/ctags/namelist.f.tags 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,2 +1,2 @@ # format=tagmanager -mainÌ512Ö0 +mainÌ2048Ö0 Modified: tests/ctags/procedure_pointer_module.f90.tags 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -2,4 +2,4 @@ aĚ16384Îproc_pointerÖ0 my_pointerĚ16384Îproc_pointerÖ0 proc_pointerĚ256Ö0 -subĚ64Îproc_pointerÖ0 +subĚ128Îproc_pointerÖ0 Modified: tests/ctags/procpoint.f90.tags 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,5 @@ # format=tagmanager -MainÌ512Ö0 +MainÌ2048Ö0 MyOtherProcÌ16384ÎTestÖ0 MyProcÌ16384ÎTestÖ0 ProcOneÌ16ÎTestÖ0 Modified: tests/ctags/square_parens.f90.tags 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -1,12 +1,12 @@ # format=tagmanager -SymmetryĚ4096ÎsquaretestÖ0 +SymmetryĚ1ÎsquaretestÖ0 assigneeĚ16384ÎsquaretestÖ0 -executeĚ64ÎsquaretestÖ0 +executeĚ128ÎsquaretestÖ0 invisibleĚ16384ÎsquaretestÖ0 invisible_fourĚ16384ÎsquaretestÖ0 invisible_threeĚ16384ÎsquaretestÖ0 invisible_twoĚ16384ÎsquaretestÖ0 -mainĚ512Ö0 +mainĚ2048Ö0 squaretestĚ256Ö0 stateĚ16384ÎsquaretestÖ0 state_twoĚ16384ÎsquaretestÖ0 Modified: tests/ctags/stdcall.f.tags 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1,6 +1,6 @@ # format=tagmanager D02CJWÌ16384Ö0 -FCNÌ64Ö0 +FCNÌ128Ö0 GÌ16Ö0 GÌ16384Ö0 HÌ16384Ö0 @@ -11,7 +11,7 @@ J KÌ16384Ö0 NÌ16384Ö0 NOUTÌ16384Ö0 -OUTÌ64Ö0 +OUTÌ128Ö0 PIÌ16384Ö0 RELABSÌ16384Ö0 TOLÌ16384Ö0 Modified: tests/ctags/structure.f.tags 14 files changed, 7 insertions(+), 7 deletions(-) =================================================================== @@ -1,10 +1,10 @@ # format=tagmanager -initialized_structureÌ512Ö0 +initialized_structureÌ2048Ö0 latestÌ16384Îinitialized_structureÖ0 latestÌ16384Îuninitialized_structureÖ0 -nestedÌ4096ÎtopÖ0 -nested_structureÌ512Ö0 -topÌ4096Înested_structureÖ0 -uninitialized_structureÌ512Ö0 -weatherÌ4096Îinitialized_structureÖ0 -weatherÌ4096Îuninitialized_structureÖ0 +nestedÌ1ÎtopÖ0 +nested_structureÌ2048Ö0 +topÌ1Înested_structureÖ0 +uninitialized_structureÌ2048Ö0 +weatherÌ1Îinitialized_structureÖ0 +weatherÌ1Îuninitialized_structureÖ0 Modified: tests/ctags/union.f.tags 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1,4 +1,4 @@ # format=tagmanager sdateÌ16384ÎwritedateÖ0 -startÌ4096ÎwritedateÖ0 -writedateÌ512Ö0 +startÌ1ÎwritedateÖ0 +writedateÌ2048Ö0 Modified: tests/ctags/value.f.tags 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,4 @@ # format=tagmanager aaÌ16384ÎfigureÖ0 figÌ16384ÎfigureÖ0 -figureÌ512Ö0 +figureÌ2048Ö0 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 7d7606: Fortran: fix handling of pointer association operator
by Colomban Wendling 17 Feb '14

17 Feb '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 17 Feb 2014 22:17:35 UTC Commit: 7d760632824efacd44231f89d46de3a1deac64ec https://github.com/geany/geany/commit/7d760632824efacd44231f89d46de3a1deac6… Log Message: ----------- Fortran: fix handling of pointer association operator Test case contributed by Adam Hirst, thanks. Closes #1030. Modified Paths: -------------- tagmanager/ctags/fortran.c tests/ctags/Makefile.am tests/ctags/procpoint.f90 tests/ctags/procpoint.f90.tags Modified: tagmanager/ctags/fortran.c 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1371,7 +1371,8 @@ static void parseEntityDecl (tokenInfo *const token) readToken (token); skipPast (token, TOKEN_OPERATOR); } - else if (strcmp (vStringValue (token->string), "=") == 0) + else if (strcmp (vStringValue (token->string), "=") == 0 || + strcmp (vStringValue (token->string), "=>") == 0) { while (! isType (token, TOKEN_COMMA) && ! isType (token, TOKEN_STATEMENT_END)) Modified: tests/ctags/Makefile.am 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -193,6 +193,7 @@ test_sources = \ Package.pm \ php5_5_class_kw.php \ procedure_pointer_module.f90 \ + procpoint.f90 \ property.cs \ prototype.h \ pure_elem.f95 \ Modified: tests/ctags/procpoint.f90 32 files changed, 32 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,32 @@ +module Test + implicit none + + procedure(ProcOne), pointer :: MyProc => null(), & + MyOtherProc => ProcTwo + real, parameter :: myparameter + +contains + + function ProcOne(arg1, optformat) + ! not relevant + end function ProcOne + + function ProcTwo(arg1, optformat) + ! not relevant + end function ProcTwo + +end module Test + +program Main + implicit none + + ! deliberately break up the line to make sure the tagparser doesn't choke on awkward cases + procedure(:), pointer :: ProcPointOne & + => null(), ProcPointTwo => & + null() + real :: variable, variable_two + integer :: variable_three + + ProcPointOne => ProcTwo + +end program Main Modified: tests/ctags/procpoint.f90.tags 13 files changed, 13 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,13 @@ +# format=tagmanager +MainÌ512Ö0 +MyOtherProcÌ16384ÎTestÖ0 +MyProcÌ16384ÎTestÖ0 +ProcOneÌ16ÎTestÖ0 +ProcPointOneÌ16384ÎMainÖ0 +ProcPointTwoÌ16384ÎMainÖ0 +ProcTwoÌ16ÎTestÖ0 +TestÌ256Ö0 +myparameterÌ16384ÎTestÖ0 +variableÌ16384ÎMainÖ0 +variable_threeÌ16384ÎMainÖ0 +variable_twoÌ16384ÎMainÖ0 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/talks] 3f7951: Adding a very first list of topics
by Frank Lanitz 15 Feb '14

15 Feb '14

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sat, 15 Feb 2014 14:51:36 UTC Commit: 3f7951782d84e15f272a2080cc7e6cdf6cf2d751 https://github.com/geany/talks/commit/3f7951782d84e15f272a2080cc7e6cdf6cf2d… Log Message: ----------- Adding a very first list of topics Modified Paths: -------------- de/html/index.html Modified: de/html/index.html 16 files changed, 16 insertions(+), 0 deletions(-) =================================================================== @@ -35,6 +35,22 @@ <div class="reveal">  <div class="slides"> + <section> + <h1>Best of Geany-FAQ</h1> + <h2>alles was ihr schon immer über den Editor wissen wolltet </h2> + <p>Frank Lanitz</p> + </section> + <section><h2>Einführung</h2></section> + <section><h2>Build-System</h2></section> + <section><h2>Dateitypen</h2></section> + <section><h2>Tags, Symbolbrowser und Autovervollständigung</h2></section> + <section><h2>Plugins</h2> +  + <section><h2>GeanyVC</h2></section> + <section><h2>GeanyGDB</h2></section> + <section><h2>Misc</h2></section> + </section> + </div> </div> -------------- 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 February 2014