[geany/geany] d1f200: Merge branch 'sql-parser-update'
Colomban Wendling
git-noreply at xxxxx
Wed Jun 26 14:37:12 UTC 2013
Branch: refs/heads/master
Author: Colomban Wendling <ban at herbesfolles.org>
Committer: Colomban Wendling <ban at herbesfolles.org>
Date: Wed, 26 Jun 2013 14:37:12 UTC
Commit: d1f2005738fbf01694a9fd52521446b0fd755f01
https://github.com/geany/geany/commit/d1f2005738fbf01694a9fd52521446b0fd755f01
Log Message:
-----------
Merge branch 'sql-parser-update'
Modified Paths:
--------------
src/symbols.c
tagmanager/ctags/read.c
tagmanager/ctags/read.h
tagmanager/ctags/sql.c
tests/ctags/3184782.sql.tags
tests/ctags/bug1570779.sql.tags
tests/ctags/bug1938565.sql.tags
tests/ctags/bug1944150.sql.tags
tests/ctags/bug823000.sql.tags
tests/ctags/db-trig.sql.tags
tests/ctags/ingres_procedures.sql.tags
tests/ctags/random.sql.tags
tests/ctags/readlob.sql.tags
tests/ctags/readlong.sql.tags
tests/ctags/refcurs.sql.tags
Modified: src/symbols.c
1 files changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -985,6 +985,7 @@ static void add_top_level_items(GeanyDocument *doc)
&(tv_iters.tag_macro), _("Triggers"), "classviewer-macro",
&(tv_iters.tag_member), _("Views"), "classviewer-var",
&(tv_iters.tag_other), _("Other"), "classviewer-other",
+ &(tv_iters.tag_variable), _("Variables"), "classviewer-var",
NULL);
break;
}
Modified: tagmanager/ctags/read.c
10 files changed, 10 insertions(+), 0 deletions(-)
===================================================================
@@ -497,6 +497,16 @@ extern int fileGetc (void)
return c;
}
+extern int fileSkipToCharacter (int c)
+{
+ int d;
+ do
+ {
+ d = fileGetc ();
+ } while (d != EOF && d != c);
+ return d;
+}
+
/* An alternative interface to fileGetc (). Do not mix use of fileReadLine()
* and fileGetc() for the same file. The returned string does not contain
* the terminating newline. A NULL return value means that all lines in the
Modified: tagmanager/ctags/read.h
1 files changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -101,6 +101,7 @@ enum eCharacters {
extern boolean fileEOF (void);
extern void fileClose (void);
extern int fileGetc (void);
+extern int fileSkipToCharacter (int c);
extern void fileUngetc (int c);
extern const unsigned char *fileReadLine (void);
extern char *readLine (vString *const vLine, MIO *const mio);
Modified: tagmanager/ctags/sql.c
3554 files changed, 2127 insertions(+), 1427 deletions(-)
===================================================================
No diff available, check online
Modified: tests/ctags/3184782.sql.tags
9 files changed, 4 insertions(+), 5 deletions(-)
===================================================================
@@ -1,7 +1,6 @@
# format=tagmanager
-do_this_stuff�256�0
-elsif�16384�0
-myfn1�256�0
-myfn2�256�0
+do_this_stuff�256�p_test�0
+myfn1�256�p_test�0
+myfn2�256�p_test�0
p_test�512�0
-process_this�256�0
+process_this�256�p_test�0
Modified: tests/ctags/bug1570779.sql.tags
6 files changed, 3 insertions(+), 3 deletions(-)
===================================================================
@@ -1,5 +1,5 @@
# format=tagmanager
+address�8�employees�0
employees�1�0
-employees.address�8�0
-employees.id�8�0
-employees.name�8�0
+id�8�employees�0
+name�8�employees�0
Modified: tests/ctags/bug1938565.sql.tags
4 files changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -1,4 +1,4 @@
# format=tagmanager
demo_pkg�512�0
-func1�16�0
-func2�16�0
+func1�16�demo_pkg�0
+func2�16�demo_pkg�0
Modified: tests/ctags/bug1944150.sql.tags
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,2 +1,2 @@
# format=tagmanager
-cash_trade_comment.�65536�0
+tr_d_cash_trade_comment�65536�cash_trade_comment�0
Modified: tests/ctags/bug823000.sql.tags
4 files changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -1,4 +1,4 @@
# format=tagmanager
TEST�512�0
-TestFunc1�256�0
-TestFunc2�256�0
+TestFunc1�256�TEST�0
+TestFunc2�256�TEST�0
Modified: tests/ctags/db-trig.sql.tags
3 files changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -1,2 +1,3 @@
# format=tagmanager
-database.startup_db�65536�0
+restrict_login�65536�database�0
+startup_db�65536�database�0
Modified: tests/ctags/ingres_procedures.sql.tags
5 files changed, 5 insertions(+), 0 deletions(-)
===================================================================
@@ -1,2 +1,7 @@
# format=tagmanager
db0001�256�0
+db0002�256�0
+db0003�256�0
+err�16384�0
+n�16384�0
+x�16384�0
Modified: tests/ctags/random.sql.tags
20 files changed, 10 insertions(+), 10 deletions(-)
===================================================================
@@ -1,12 +1,12 @@
# format=tagmanager
-Seed�16384�0
-get_rand�256�0
-get_rand_max�256�0
-increment�16384�0
-multiplier�16384�0
-rand�16�0
-rand_max�16�0
-rand_string�16�0
+Seed�16384�random�0
+get_rand�256�random�0
+get_rand_max�256�random�0
+increment�16384�random�0
+multiplier�16384�random�0
+rand�16�random�0
+rand_max�16�random�0
+rand_string�16�random�0
random�512�0
-smaller�16�0
-srand�256�0
+smaller�16�random�0
+srand�256�random�0
Modified: tests/ctags/readlob.sql.tags
8 files changed, 4 insertions(+), 4 deletions(-)
===================================================================
@@ -1,10 +1,10 @@
# format=tagmanager
+b_file�8�lob_table�0
+b_lob�8�lob_table�0
+c_lob�8�lob_table�0
charbuf�16384�0
clob_locator�16384�0
+id�8�lob_table�0
lob_table�1�0
-lob_table.b_file�8�0
-lob_table.b_lob�8�0
-lob_table.c_lob�8�0
-lob_table.id�8�0
read_amount�16384�0
read_offset�16384�0
Modified: tests/ctags/readlong.sql.tags
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -3,7 +3,7 @@ cur1
long_len�16384�0
long_piece�16384�0
long_tab�16384�0
+longcol�8�longtable�0
longtable�1�0
-longtable.longcol�8�0
piece_len�16384�0
rc�16384�0
Modified: tests/ctags/refcurs.sql.tags
6 files changed, 3 insertions(+), 3 deletions(-)
===================================================================
@@ -1,6 +1,6 @@
# format=tagmanager
-get_cursor_ref�16�0
-main�256�0
-process_cursor�256�0
+get_cursor_ref�16�test_ref_cursor�0
+main�256�test_ref_cursor�0
+process_cursor�256�test_ref_cursor�0
test_ref_cursor�512�0
types�512�0
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
More information about the Commits
mailing list