Branch: refs/heads/master Author: Jiří Techet techet@gmail.com Committer: Jiří Techet techet@gmail.com Date: Thu, 28 Jul 2016 21:55:56 UTC Commit: 7b9d0dd83ce0874593758a620a9b9a2d256503c1 https://github.com/geany/geany/commit/7b9d0dd83ce0874593758a620a9b9a2d256503...
Log Message: ----------- Make parser includes closer to uctags and sync parser license header
Adds (currently empty) debug.h, routines.h and xtag.h and uses them at the same places like uctags.
Modified Paths: -------------- ctags/Makefile.am ctags/main/debug.h ctags/main/routines.h ctags/main/xtag.h ctags/parsers/asm.c ctags/parsers/basic.c ctags/parsers/c.c ctags/parsers/cobol.c ctags/parsers/css.c ctags/parsers/diff.c ctags/parsers/erlang.c ctags/parsers/fortran.c ctags/parsers/go.c ctags/parsers/html.c ctags/parsers/jscript.c ctags/parsers/json.c ctags/parsers/lua.c ctags/parsers/make.c ctags/parsers/objc.c ctags/parsers/pascal.c ctags/parsers/perl.c ctags/parsers/php.c ctags/parsers/python.c ctags/parsers/r.c ctags/parsers/ruby.c ctags/parsers/rust.c ctags/parsers/sh.c ctags/parsers/sql.c ctags/parsers/tcl.c ctags/parsers/verilog.c ctags/parsers/vhdl.c
Modified: ctags/Makefile.am 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -57,6 +57,7 @@ libctags_la_SOURCES = \ main/args.h \ main/ctags.c \ main/ctags.h \ + main/debug.h \ main/entry.c \ main/entry.h \ main/general.h \ @@ -77,10 +78,12 @@ libctags_la_SOURCES = \ main/parsers.h \ main/read.c \ main/read.h \ + main/routines.h \ main/sort.c \ main/sort.h \ main/strlist.c \ main/strlist.h \ main/vstring.c \ main/vstring.h \ + main/xtag.h \ $(parsers)
Modified: ctags/main/debug.h 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: ctags/main/routines.h 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: ctags/main/xtag.h 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: ctags/parsers/asm.c 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -2,7 +2,7 @@ * Copyright (c) 2000-2003, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * This module contains functions for generating tags for assembly language * files. @@ -15,9 +15,11 @@
#include <string.h>
+#include "debug.h" #include "keyword.h" #include "parse.h" #include "read.h" +#include "routines.h" #include "main.h" #include "vstring.h"
Modified: ctags/parsers/basic.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -2,7 +2,7 @@ * Copyright (c) 2000-2006, Darren Hiebert, Elias Pschernig * * This source code is released for free distribution under the terms of the - * GNU General Public License. + * GNU General Public License version 2 or (at your option) any later version. * * This module contains functions for generating tags for BlitzBasic * (BlitzMax), PureBasic and FreeBasic language files. For now, this is kept @@ -19,6 +19,7 @@
#include "parse.h" #include "read.h" +#include "routines.h" #include "vstring.h"
/*
Modified: ctags/parsers/c.c 10 lines changed, 6 insertions(+), 4 deletions(-) =================================================================== @@ -1,11 +1,10 @@ /* -* -* Copyright (c) 1996-2001, Darren Hiebert +* Copyright (c) 1996-2003, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * -* This module contains functions for parsing and scanning C, C++, D and Java +* This module contains functions for parsing and scanning C, C++, C#, D and Java * source files. */
@@ -17,6 +16,7 @@ #include <string.h> #include <setjmp.h>
+#include "debug.h" #include "mio.h" #include "entry.h" #include "get.h" @@ -25,6 +25,8 @@ #include "options.h" #include "parse.h" #include "read.h" +#include "routines.h" +#include "xtag.h"
/* * MACROS
Modified: ctags/parsers/cobol.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -2,7 +2,7 @@ * Copyright (c) 2000-2003, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * This module contains functions for generating tags for COBOL language * files. @@ -13,6 +13,7 @@ */ #include "general.h" /* must always come first */ #include "parse.h" +#include "routines.h"
/* * FUNCTION DEFINITIONS
Modified: ctags/parsers/css.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -2,6 +2,7 @@ * css.c * Token-based parser for CSS definitions * Author - Colomban Wendling colomban@geany.org + * License GPL-2 **************************************************************************/ #include "general.h"
@@ -11,7 +12,7 @@ #include "entry.h" #include "parse.h" #include "read.h" - +#include "routines.h"
typedef enum eCssKinds { K_CLASS, K_SELECTOR, K_ID
Modified: ctags/parsers/diff.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -3,7 +3,7 @@ * Copyright (c) 2000-2001, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * This module contains functions for generating tags for diff files (based on Sh parser). */ @@ -17,6 +17,7 @@ #include <string.h>
#include "parse.h" +#include "routines.h" #include "read.h" #include "vstring.h"
Modified: ctags/parsers/erlang.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -2,7 +2,7 @@ * Copyright (c) 2003, Brent Fulgham bfulgham@debian.org * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * This module contains functions for generating tags for Erlang language * files. Some of the parsing constructs are based on the Emacs 'etags' @@ -18,7 +18,7 @@ #include "entry.h" #include "options.h" #include "read.h" -// #include "routines.h" +#include "routines.h" #include "vstring.h"
/*
Modified: ctags/parsers/fortran.c 9 lines changed, 6 insertions(+), 3 deletions(-) =================================================================== @@ -2,7 +2,7 @@ * Copyright (c) 1998-2003, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * This module contains functions for generating tags for Fortran language * files. @@ -11,21 +11,24 @@ /* * INCLUDE FILES */ -#include "general.h" /* must always come first */ +#include "general.h" /* must always come first */
#include <string.h> #include <limits.h> -#include <ctype.h> /* to define tolower () */ +#include <ctype.h> /* to define tolower () */ #include <setjmp.h>
+#include "debug.h" #include "mio.h" #include "entry.h" #include "keyword.h" #include "main.h" #include "options.h" #include "parse.h" #include "read.h" +#include "routines.h" #include "vstring.h" +#include "xtag.h"
/* * MACROS
Modified: ctags/parsers/go.c 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -1,14 +1,20 @@ /* +* This source code is released for free distribution under the terms of the +* GNU General Public License version 2 or (at your option) any later version. +* * INCLUDE FILES */ #include "general.h" /* must always come first */
+#include "debug.h" #include "entry.h" #include "keyword.h" #include "read.h" #include "main.h" +#include "routines.h" #include "vstring.h" #include "options.h" +#include "xtag.h"
/* * MACROS
Modified: ctags/parsers/html.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -2,7 +2,7 @@ * Copyright (c) 2003, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * This module contains functions for generating tags for HTML language * files. @@ -13,6 +13,7 @@ */ #include "general.h" /* must always come first */ #include "parse.h" +#include "routines.h"
/* * FUNCTION DEFINITIONS
Modified: ctags/parsers/jscript.c 6 lines changed, 5 insertions(+), 1 deletions(-) =================================================================== @@ -2,11 +2,13 @@ * Copyright (c) 2003, Darren Hiebert * * This source code is released for free distribution under the terms of the - * GNU General Public License. + * GNU General Public License version 2 or (at your option) any later version. * * This module contains functions for generating tags for JavaScript language * files. * + * Reference: http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-262.pdf + * * This is a good reference for different forms of the function statement: * http://www.permadi.com/tutorial/jsFunc/ * Another good reference: @@ -23,11 +25,13 @@ #include <stdio.h> #endif
+#include "debug.h" #include "mio.h" #include "keyword.h" #include "parse.h" #include "read.h" #include "main.h" +#include "routines.h" #include "vstring.h"
/*
Modified: ctags/parsers/json.c 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -2,7 +2,7 @@ * Copyright (c) 2014, Colomban Wendling colomban@geany.org * * This source code is released for free distribution under the terms of the - * GNU General Public License. + * GNU General Public License version 2 or (at your option) any later version. */ /* * This module contains functions for generating tags for JSON files. @@ -17,11 +17,13 @@ #include "general.h"
#include <string.h> +#include "debug.h" #include "main.h" #include "entry.h" #include "keyword.h" #include "parse.h" #include "read.h" +#include "routines.h" #include "vstring.h"
typedef enum {
Modified: ctags/parsers/lua.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -2,7 +2,7 @@ * Copyright (c) 2000-2001, Max Ischenko mfi@ukr.net. * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * This module contains functions for generating tags for Lua language. */ @@ -16,6 +16,7 @@
#include "parse.h" #include "read.h" +#include "routines.h" #include "vstring.h"
/*
Modified: ctags/parsers/make.c 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -2,7 +2,7 @@ * Copyright (c) 2000-2005, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * This module contains functions for generating tags for makefiles. */ @@ -19,7 +19,9 @@ #include "options.h" #include "parse.h" #include "read.h" +#include "routines.h" #include "vstring.h" +#include "xtag.h"
/* * DATA DEFINITIONS
Modified: ctags/parsers/objc.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -3,7 +3,7 @@ * Copyright (c) 2010, Vincent Berthoux * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * This module contains functions for generating tags for Objective C * language files. @@ -19,6 +19,7 @@ #include "entry.h" #include "options.h" #include "read.h" +#include "routines.h" #include "vstring.h"
/* To get rid of unused parameter warning in
Modified: ctags/parsers/pascal.c 5 lines changed, 3 insertions(+), 2 deletions(-) =================================================================== @@ -2,7 +2,7 @@ * Copyright (c) 2001-2002, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * This module contains functions for generating tags for the Pascal language, * including some extensions for Object Pascal. @@ -11,14 +11,15 @@ /* * INCLUDE FILES */ -#include "general.h" /* must always come first */ +#include "general.h" /* must always come first */
#include <string.h>
#include "entry.h" #include "parse.h" #include "read.h" #include "main.h" +#include "routines.h" #include "vstring.h"
/*
Modified: ctags/parsers/perl.c 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -2,7 +2,7 @@ * Copyright (c) 2000-2003, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * This module contains functions for generating tags for PERL language * files. @@ -12,14 +12,17 @@ * INCLUDE FILES */ #include "general.h" /* must always come first */ +#include "debug.h"
#include <string.h>
#include "entry.h" #include "options.h" #include "read.h" #include "main.h" +#include "routines.h" #include "vstring.h" +#include "xtag.h"
#define TRACE_PERL_C 0 #define TRACE if (TRACE_PERL_C) printf("perl.c:%d: ", __LINE__), printf
Modified: ctags/parsers/php.c 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -2,7 +2,7 @@ * Copyright (c) 2013, Colomban Wendling ban@herbesfolles.org * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * This module contains code for generating tags for the PHP scripting * language. @@ -18,6 +18,8 @@ #include "vstring.h" #include "keyword.h" #include "entry.h" +#include "routines.h" +#include "debug.h"
#define SCOPE_SEPARATOR "::"
Modified: ctags/parsers/python.c 7 lines changed, 5 insertions(+), 2 deletions(-) =================================================================== @@ -2,7 +2,7 @@ * Copyright (c) 2000-2003, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * This module contains functions for generating tags for Python language * files. @@ -15,11 +15,14 @@ #include <string.h>
#include "entry.h" +#include "nestlevel.h" #include "options.h" #include "read.h" #include "main.h" #include "vstring.h" -#include "nestlevel.h" +#include "routines.h" +#include "debug.h" +#include "xtag.h"
/* * DATA DEFINITIONS
Modified: ctags/parsers/r.c 7 lines changed, 4 insertions(+), 3 deletions(-) =================================================================== @@ -2,7 +2,7 @@ * Copyright (c) 2003-2004, Ascher Stefan stievie@utanet.at * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * This module contains functions for generating tags for R language files. * R is a programming language for statistical computing. @@ -12,11 +12,12 @@ /* * INCLUDE FILES */ -#include "general.h" /* must always come first */ +#include "general.h" /* must always come first */
#include <string.h> -#include <ctype.h> /* to define isalpha(), isalnum(), isspace() */ +#include <ctype.h> /* to define isalpha(), isalnum(), isspace() */
+#include "debug.h" #include "entry.h" #include "read.h" #include "vstring.h"
Modified: ctags/parsers/ruby.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -17,10 +17,12 @@
#include <string.h>
+#include "debug.h" #include "entry.h" #include "parse.h" #include "nestlevel.h" #include "read.h" +#include "routines.h" #include "vstring.h"
/*
Modified: ctags/parsers/rust.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,7 @@ /* * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * This module contains functions for generating tags for Rust files. */ @@ -19,6 +19,7 @@ #include "entry.h" #include "options.h" #include "read.h" +#include "routines.h" #include "vstring.h"
/*
Modified: ctags/parsers/sh.c 6 lines changed, 4 insertions(+), 2 deletions(-) =================================================================== @@ -2,7 +2,7 @@ * Copyright (c) 2000-2002, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * This module contains functions for generating tags for scripts for the * Bourne shell (and its derivatives, the Korn and Z shells). @@ -11,14 +11,16 @@ /* * INCLUDE FILES */ -#include "general.h" /* must always come first */ +#include "general.h" /* must always come first */
#include <string.h>
#include "parse.h" #include "read.h" #include "main.h" +#include "routines.h" #include "vstring.h" +#include "xtag.h"
/* * DATA DEFINITIONS
Modified: ctags/parsers/sql.c 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -1,10 +1,8 @@ /* - * $Id$ - * * Copyright (c) 2002-2003, Darren Hiebert * * This source code is released for free distribution under the terms of the - * GNU General Public License. + * GNU General Public License version 2 or (at your option) any later version. * * This module contains functions for generating tags for PL/SQL language * files. @@ -21,11 +19,13 @@ #include <stdio.h> #endif
+#include "debug.h" #include "entry.h" #include "keyword.h" #include "parse.h" #include "main.h" #include "read.h" +#include "routines.h" #include "vstring.h"
/*
Modified: ctags/parsers/tcl.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -2,7 +2,7 @@ * Copyright (c) 2000-2003, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * This module contains functions for generating tags for TCL scripts. */ @@ -16,6 +16,7 @@
#include "parse.h" #include "read.h" +#include "routines.h" #include "vstring.h"
/*
Modified: ctags/parsers/verilog.c 11 lines changed, 7 insertions(+), 4 deletions(-) =================================================================== @@ -1,12 +1,12 @@ /* * Copyright (c) 2003, Darren Hiebert -* +* * This source code is released for free distribution under the terms of the -* GNU General Public License. -* +* GNU General Public License version 2 or (at your option) any later version. +* * This module contains functions for generating tags for the Verilog HDL * (Hardware Description Language). -* +* * Language definition documents: * http://www.eg.bucknell.edu/~cs320/verilog/verilog-manual.html * http://www.sutherland-hdl.com/on-line_ref_guide/vlog_ref_top.html @@ -22,11 +22,14 @@ #include <string.h> #include <setjmp.h>
+#include "debug.h" #include "keyword.h" #include "parse.h" #include "read.h" #include "vstring.h" #include "get.h" +#include "routines.h" +#include "xtag.h"
/* * DATA DECLARATIONS
Modified: ctags/parsers/vhdl.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -19,9 +19,11 @@ #include <string.h> #include <setjmp.h>
+#include "debug.h" #include "keyword.h" #include "parse.h" #include "read.h" +#include "routines.h" #include "vstring.h"
/*
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).