From 0347e7411661401f7ef82c26c646c5123fba6653 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Techet?= Date: Wed, 18 Nov 2020 15:45:46 -0800 Subject: [PATCH] Add the geany_ prefix to all parser files The geany_ prefix is meant to indicate that the parser either has a geany-specific implementation or that there are some things in the parser which should be committed upstream. Once a parser is fully synced with the upstream version, we can drop the geany_ prefix. This helps us know which parsers are synced (and for which we can just copy the uctags version) and where we still have some work to do. In this initial commit, add the geany_ prefix everywhere - some parsers are already fully synced and the geany_ prefix can be dropped when we update to the up-to-date uctags version. --- ctags/Makefile.am | 90 +++++++++---------- ctags/parsers/{abaqus.c => geany_abaqus.c} | 0 ctags/parsers/{abc.c => geany_abc.c} | 0 .../parsers/{asciidoc.c => geany_asciidoc.c} | 0 ctags/parsers/{asm.c => geany_asm.c} | 0 ctags/parsers/{basic.c => geany_basic.c} | 0 ctags/parsers/{bibtex.c => geany_bibtex.c} | 0 ctags/parsers/{c.c => geany_c.c} | 2 +- ctags/parsers/{cobol.c => geany_cobol.c} | 0 ctags/parsers/{css.c => geany_css.c} | 0 ctags/parsers/{diff.c => geany_diff.c} | 0 ctags/parsers/{docbook.c => geany_docbook.c} | 0 ctags/parsers/{erlang.c => geany_erlang.c} | 0 ctags/parsers/{flex.c => geany_flex.c} | 0 ctags/parsers/{fortran.c => geany_fortran.c} | 0 ctags/parsers/{go.c => geany_go.c} | 0 ctags/parsers/{haskell.c => geany_haskell.c} | 0 ctags/parsers/{haxe.c => geany_haxe.c} | 0 ctags/parsers/{html.c => geany_html.c} | 0 ctags/parsers/{iniconf.c => geany_iniconf.c} | 0 ctags/parsers/{jscript.c => geany_jscript.c} | 0 ctags/parsers/{json.c => geany_json.c} | 0 ctags/parsers/{lcpp.c => geany_lcpp.c} | 2 +- ctags/parsers/{lcpp.h => geany_lcpp.h} | 0 ctags/parsers/{lua.c => geany_lua.c} | 0 ctags/parsers/{make.c => geany_make.c} | 0 .../parsers/{markdown.c => geany_markdown.c} | 0 ctags/parsers/{matlab.c => geany_matlab.c} | 0 ctags/parsers/{nsis.c => geany_nsis.c} | 0 ctags/parsers/{objc.c => geany_objc.c} | 0 ctags/parsers/{pascal.c => geany_pascal.c} | 0 ctags/parsers/{perl.c => geany_perl.c} | 0 ctags/parsers/{php.c => geany_php.c} | 0 .../{powershell.c => geany_powershell.c} | 0 ctags/parsers/{python.c => geany_python.c} | 0 ctags/parsers/{r.c => geany_r.c} | 0 ctags/parsers/{rst.c => geany_rst.c} | 0 ctags/parsers/{ruby.c => geany_ruby.c} | 0 ctags/parsers/{rust.c => geany_rust.c} | 0 ctags/parsers/{sh.c => geany_sh.c} | 0 ctags/parsers/{sql.c => geany_sql.c} | 0 ctags/parsers/{tcl.c => geany_tcl.c} | 0 ctags/parsers/{tex.c => geany_tex.c} | 0 .../parsers/{txt2tags.c => geany_txt2tags.c} | 0 ctags/parsers/{verilog.c => geany_verilog.c} | 2 +- ctags/parsers/{vhdl.c => geany_vhdl.c} | 0 46 files changed, 48 insertions(+), 48 deletions(-) rename ctags/parsers/{abaqus.c => geany_abaqus.c} (100%) rename ctags/parsers/{abc.c => geany_abc.c} (100%) rename ctags/parsers/{asciidoc.c => geany_asciidoc.c} (100%) rename ctags/parsers/{asm.c => geany_asm.c} (100%) rename ctags/parsers/{basic.c => geany_basic.c} (100%) rename ctags/parsers/{bibtex.c => geany_bibtex.c} (100%) rename ctags/parsers/{c.c => geany_c.c} (99%) rename ctags/parsers/{cobol.c => geany_cobol.c} (100%) rename ctags/parsers/{css.c => geany_css.c} (100%) rename ctags/parsers/{diff.c => geany_diff.c} (100%) rename ctags/parsers/{docbook.c => geany_docbook.c} (100%) rename ctags/parsers/{erlang.c => geany_erlang.c} (100%) rename ctags/parsers/{flex.c => geany_flex.c} (100%) rename ctags/parsers/{fortran.c => geany_fortran.c} (100%) rename ctags/parsers/{go.c => geany_go.c} (100%) rename ctags/parsers/{haskell.c => geany_haskell.c} (100%) rename ctags/parsers/{haxe.c => geany_haxe.c} (100%) rename ctags/parsers/{html.c => geany_html.c} (100%) rename ctags/parsers/{iniconf.c => geany_iniconf.c} (100%) rename ctags/parsers/{jscript.c => geany_jscript.c} (100%) rename ctags/parsers/{json.c => geany_json.c} (100%) rename ctags/parsers/{lcpp.c => geany_lcpp.c} (99%) rename ctags/parsers/{lcpp.h => geany_lcpp.h} (100%) rename ctags/parsers/{lua.c => geany_lua.c} (100%) rename ctags/parsers/{make.c => geany_make.c} (100%) rename ctags/parsers/{markdown.c => geany_markdown.c} (100%) rename ctags/parsers/{matlab.c => geany_matlab.c} (100%) rename ctags/parsers/{nsis.c => geany_nsis.c} (100%) rename ctags/parsers/{objc.c => geany_objc.c} (100%) rename ctags/parsers/{pascal.c => geany_pascal.c} (100%) rename ctags/parsers/{perl.c => geany_perl.c} (100%) rename ctags/parsers/{php.c => geany_php.c} (100%) rename ctags/parsers/{powershell.c => geany_powershell.c} (100%) rename ctags/parsers/{python.c => geany_python.c} (100%) rename ctags/parsers/{r.c => geany_r.c} (100%) rename ctags/parsers/{rst.c => geany_rst.c} (100%) rename ctags/parsers/{ruby.c => geany_ruby.c} (100%) rename ctags/parsers/{rust.c => geany_rust.c} (100%) rename ctags/parsers/{sh.c => geany_sh.c} (100%) rename ctags/parsers/{sql.c => geany_sql.c} (100%) rename ctags/parsers/{tcl.c => geany_tcl.c} (100%) rename ctags/parsers/{tex.c => geany_tex.c} (100%) rename ctags/parsers/{txt2tags.c => geany_txt2tags.c} (100%) rename ctags/parsers/{verilog.c => geany_verilog.c} (99%) rename ctags/parsers/{vhdl.c => geany_vhdl.c} (100%) diff --git a/ctags/Makefile.am b/ctags/Makefile.am index ddd805af4e..2eb528346c 100644 --- a/ctags/Makefile.am +++ b/ctags/Makefile.am @@ -10,51 +10,51 @@ AM_CFLAGS = \ noinst_LTLIBRARIES = libctags.la parsers = \ - parsers/abaqus.c \ - parsers/abc.c \ - parsers/asciidoc.c \ - parsers/asm.c \ - parsers/basic.c \ - parsers/bibtex.c \ - parsers/c.c \ - parsers/cobol.c \ - parsers/iniconf.c \ - parsers/css.c \ - parsers/diff.c \ - parsers/docbook.c \ - parsers/erlang.c \ - parsers/flex.c \ - parsers/fortran.c \ - parsers/go.c \ - parsers/haskell.c \ - parsers/haxe.c \ - parsers/html.c \ - parsers/jscript.c \ - parsers/json.c \ - parsers/lcpp.c \ - parsers/lcpp.h \ - parsers/lua.c \ - parsers/make.c \ - parsers/markdown.c \ - parsers/matlab.c \ - parsers/nsis.c \ - parsers/objc.c \ - parsers/pascal.c \ - parsers/perl.c \ - parsers/php.c \ - parsers/powershell.c \ - parsers/python.c \ - parsers/r.c \ - parsers/rst.c \ - parsers/ruby.c \ - parsers/rust.c \ - parsers/sh.c \ - parsers/sql.c \ - parsers/tcl.c \ - parsers/tex.c \ - parsers/txt2tags.c \ - parsers/verilog.c \ - parsers/vhdl.c + parsers/geany_abaqus.c \ + parsers/geany_abc.c \ + parsers/geany_asciidoc.c \ + parsers/geany_asm.c \ + parsers/geany_basic.c \ + parsers/geany_bibtex.c \ + parsers/geany_c.c \ + parsers/geany_cobol.c \ + parsers/geany_iniconf.c \ + parsers/geany_css.c \ + parsers/geany_diff.c \ + parsers/geany_docbook.c \ + parsers/geany_erlang.c \ + parsers/geany_flex.c \ + parsers/geany_fortran.c \ + parsers/geany_go.c \ + parsers/geany_haskell.c \ + parsers/geany_haxe.c \ + parsers/geany_html.c \ + parsers/geany_jscript.c \ + parsers/geany_json.c \ + parsers/geany_lcpp.c \ + parsers/geany_lcpp.h \ + parsers/geany_lua.c \ + parsers/geany_make.c \ + parsers/geany_markdown.c \ + parsers/geany_matlab.c \ + parsers/geany_nsis.c \ + parsers/geany_objc.c \ + parsers/geany_pascal.c \ + parsers/geany_perl.c \ + parsers/geany_php.c \ + parsers/geany_powershell.c \ + parsers/geany_python.c \ + parsers/geany_r.c \ + parsers/geany_rst.c \ + parsers/geany_ruby.c \ + parsers/geany_rust.c \ + parsers/geany_sh.c \ + parsers/geany_sql.c \ + parsers/geany_tcl.c \ + parsers/geany_tex.c \ + parsers/geany_txt2tags.c \ + parsers/geany_verilog.c \ + parsers/geany_vhdl.c # skip cmd.c and mini-geany.c which define main() libctags_la_SOURCES = \ diff --git a/ctags/parsers/abaqus.c b/ctags/parsers/geany_abaqus.c similarity index 100% rename from ctags/parsers/abaqus.c rename to ctags/parsers/geany_abaqus.c diff --git a/ctags/parsers/abc.c b/ctags/parsers/geany_abc.c similarity index 100% rename from ctags/parsers/abc.c rename to ctags/parsers/geany_abc.c diff --git a/ctags/parsers/asciidoc.c b/ctags/parsers/geany_asciidoc.c similarity index 100% rename from ctags/parsers/asciidoc.c rename to ctags/parsers/geany_asciidoc.c diff --git a/ctags/parsers/asm.c b/ctags/parsers/geany_asm.c similarity index 100% rename from ctags/parsers/asm.c rename to ctags/parsers/geany_asm.c diff --git a/ctags/parsers/basic.c b/ctags/parsers/geany_basic.c similarity index 100% rename from ctags/parsers/basic.c rename to ctags/parsers/geany_basic.c diff --git a/ctags/parsers/bibtex.c b/ctags/parsers/geany_bibtex.c similarity index 100% rename from ctags/parsers/bibtex.c rename to ctags/parsers/geany_bibtex.c diff --git a/ctags/parsers/c.c b/ctags/parsers/geany_c.c similarity index 99% rename from ctags/parsers/c.c rename to ctags/parsers/geany_c.c index 41a997e73b..e5f1c1a301 100644 --- a/ctags/parsers/c.c +++ b/ctags/parsers/geany_c.c @@ -19,7 +19,7 @@ #include "debug.h" #include "mio.h" #include "entry.h" -#include "lcpp.h" +#include "geany_lcpp.h" #include "keyword.h" #include "options.h" #include "parse.h" diff --git a/ctags/parsers/cobol.c b/ctags/parsers/geany_cobol.c similarity index 100% rename from ctags/parsers/cobol.c rename to ctags/parsers/geany_cobol.c diff --git a/ctags/parsers/css.c b/ctags/parsers/geany_css.c similarity index 100% rename from ctags/parsers/css.c rename to ctags/parsers/geany_css.c diff --git a/ctags/parsers/diff.c b/ctags/parsers/geany_diff.c similarity index 100% rename from ctags/parsers/diff.c rename to ctags/parsers/geany_diff.c diff --git a/ctags/parsers/docbook.c b/ctags/parsers/geany_docbook.c similarity index 100% rename from ctags/parsers/docbook.c rename to ctags/parsers/geany_docbook.c diff --git a/ctags/parsers/erlang.c b/ctags/parsers/geany_erlang.c similarity index 100% rename from ctags/parsers/erlang.c rename to ctags/parsers/geany_erlang.c diff --git a/ctags/parsers/flex.c b/ctags/parsers/geany_flex.c similarity index 100% rename from ctags/parsers/flex.c rename to ctags/parsers/geany_flex.c diff --git a/ctags/parsers/fortran.c b/ctags/parsers/geany_fortran.c similarity index 100% rename from ctags/parsers/fortran.c rename to ctags/parsers/geany_fortran.c diff --git a/ctags/parsers/go.c b/ctags/parsers/geany_go.c similarity index 100% rename from ctags/parsers/go.c rename to ctags/parsers/geany_go.c diff --git a/ctags/parsers/haskell.c b/ctags/parsers/geany_haskell.c similarity index 100% rename from ctags/parsers/haskell.c rename to ctags/parsers/geany_haskell.c diff --git a/ctags/parsers/haxe.c b/ctags/parsers/geany_haxe.c similarity index 100% rename from ctags/parsers/haxe.c rename to ctags/parsers/geany_haxe.c diff --git a/ctags/parsers/html.c b/ctags/parsers/geany_html.c similarity index 100% rename from ctags/parsers/html.c rename to ctags/parsers/geany_html.c diff --git a/ctags/parsers/iniconf.c b/ctags/parsers/geany_iniconf.c similarity index 100% rename from ctags/parsers/iniconf.c rename to ctags/parsers/geany_iniconf.c diff --git a/ctags/parsers/jscript.c b/ctags/parsers/geany_jscript.c similarity index 100% rename from ctags/parsers/jscript.c rename to ctags/parsers/geany_jscript.c diff --git a/ctags/parsers/json.c b/ctags/parsers/geany_json.c similarity index 100% rename from ctags/parsers/json.c rename to ctags/parsers/geany_json.c diff --git a/ctags/parsers/lcpp.c b/ctags/parsers/geany_lcpp.c similarity index 99% rename from ctags/parsers/lcpp.c rename to ctags/parsers/geany_lcpp.c index 886141a5ee..f771a61f78 100644 --- a/ctags/parsers/lcpp.c +++ b/ctags/parsers/geany_lcpp.c @@ -17,7 +17,7 @@ #include "debug.h" #include "entry.h" -#include "lcpp.h" +#include "geany_lcpp.h" #include "kind.h" #include "options_p.h" #include "read.h" diff --git a/ctags/parsers/lcpp.h b/ctags/parsers/geany_lcpp.h similarity index 100% rename from ctags/parsers/lcpp.h rename to ctags/parsers/geany_lcpp.h diff --git a/ctags/parsers/lua.c b/ctags/parsers/geany_lua.c similarity index 100% rename from ctags/parsers/lua.c rename to ctags/parsers/geany_lua.c diff --git a/ctags/parsers/make.c b/ctags/parsers/geany_make.c similarity index 100% rename from ctags/parsers/make.c rename to ctags/parsers/geany_make.c diff --git a/ctags/parsers/markdown.c b/ctags/parsers/geany_markdown.c similarity index 100% rename from ctags/parsers/markdown.c rename to ctags/parsers/geany_markdown.c diff --git a/ctags/parsers/matlab.c b/ctags/parsers/geany_matlab.c similarity index 100% rename from ctags/parsers/matlab.c rename to ctags/parsers/geany_matlab.c diff --git a/ctags/parsers/nsis.c b/ctags/parsers/geany_nsis.c similarity index 100% rename from ctags/parsers/nsis.c rename to ctags/parsers/geany_nsis.c diff --git a/ctags/parsers/objc.c b/ctags/parsers/geany_objc.c similarity index 100% rename from ctags/parsers/objc.c rename to ctags/parsers/geany_objc.c diff --git a/ctags/parsers/pascal.c b/ctags/parsers/geany_pascal.c similarity index 100% rename from ctags/parsers/pascal.c rename to ctags/parsers/geany_pascal.c diff --git a/ctags/parsers/perl.c b/ctags/parsers/geany_perl.c similarity index 100% rename from ctags/parsers/perl.c rename to ctags/parsers/geany_perl.c diff --git a/ctags/parsers/php.c b/ctags/parsers/geany_php.c similarity index 100% rename from ctags/parsers/php.c rename to ctags/parsers/geany_php.c diff --git a/ctags/parsers/powershell.c b/ctags/parsers/geany_powershell.c similarity index 100% rename from ctags/parsers/powershell.c rename to ctags/parsers/geany_powershell.c diff --git a/ctags/parsers/python.c b/ctags/parsers/geany_python.c similarity index 100% rename from ctags/parsers/python.c rename to ctags/parsers/geany_python.c diff --git a/ctags/parsers/r.c b/ctags/parsers/geany_r.c similarity index 100% rename from ctags/parsers/r.c rename to ctags/parsers/geany_r.c diff --git a/ctags/parsers/rst.c b/ctags/parsers/geany_rst.c similarity index 100% rename from ctags/parsers/rst.c rename to ctags/parsers/geany_rst.c diff --git a/ctags/parsers/ruby.c b/ctags/parsers/geany_ruby.c similarity index 100% rename from ctags/parsers/ruby.c rename to ctags/parsers/geany_ruby.c diff --git a/ctags/parsers/rust.c b/ctags/parsers/geany_rust.c similarity index 100% rename from ctags/parsers/rust.c rename to ctags/parsers/geany_rust.c diff --git a/ctags/parsers/sh.c b/ctags/parsers/geany_sh.c similarity index 100% rename from ctags/parsers/sh.c rename to ctags/parsers/geany_sh.c diff --git a/ctags/parsers/sql.c b/ctags/parsers/geany_sql.c similarity index 100% rename from ctags/parsers/sql.c rename to ctags/parsers/geany_sql.c diff --git a/ctags/parsers/tcl.c b/ctags/parsers/geany_tcl.c similarity index 100% rename from ctags/parsers/tcl.c rename to ctags/parsers/geany_tcl.c diff --git a/ctags/parsers/tex.c b/ctags/parsers/geany_tex.c similarity index 100% rename from ctags/parsers/tex.c rename to ctags/parsers/geany_tex.c diff --git a/ctags/parsers/txt2tags.c b/ctags/parsers/geany_txt2tags.c similarity index 100% rename from ctags/parsers/txt2tags.c rename to ctags/parsers/geany_txt2tags.c diff --git a/ctags/parsers/verilog.c b/ctags/parsers/geany_verilog.c similarity index 99% rename from ctags/parsers/verilog.c rename to ctags/parsers/geany_verilog.c index 747631dcc0..ca01b99c7b 100644 --- a/ctags/parsers/verilog.c +++ b/ctags/parsers/geany_verilog.c @@ -27,7 +27,7 @@ #include "parse.h" #include "read.h" #include "vstring.h" -#include "lcpp.h" +#include "geany_lcpp.h" #include "routines.h" #include "xtag.h" diff --git a/ctags/parsers/vhdl.c b/ctags/parsers/geany_vhdl.c similarity index 100% rename from ctags/parsers/vhdl.c rename to ctags/parsers/geany_vhdl.c