Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Mon, 24 Jun 2013 16:04:46 UTC Commit: 76a7d3c902582b756c7db6283eb2bc23bb6dfdc9 https://github.com/geany/geany/commit/76a7d3c902582b756c7db6283eb2bc23bb6dfd...

Log Message: ----------- SQL: Update parser from upstream CTags

Modified Paths: -------------- tagmanager/ctags/read.c tagmanager/ctags/read.h tagmanager/ctags/sql.c tests/ctags/3184782.sql.tags tests/ctags/bug1938565.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/refcurs.sql.tags

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 3549 files changed, 2126 insertions(+), 1423 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 p_test�512�0 -process_this�256�0 +p_test.do_this_stuff�256�0 +p_test.myfn1�256�0 +p_test.myfn2�256�0 +p_test.process_this�256�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 +demo_pkg.func1�16�0 +demo_pkg.func2�16�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 +TEST.TestFunc1�256�0 +TEST.TestFunc2�256�0

Modified: tests/ctags/db-trig.sql.tags 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,2 +1,3 @@ # format=tagmanager +database.restrict_login�65536�0 database.startup_db�65536�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 random�512�0 -smaller�16�0 -srand�256�0 +random.Seed�16384�0 +random.get_rand�256�0 +random.get_rand_max�256�0 +random.increment�16384�0 +random.multiplier�16384�0 +random.rand�16�0 +random.rand_max�16�0 +random.rand_string�16�0 +random.smaller�16�0 +random.srand�256�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 test_ref_cursor�512�0 +test_ref_cursor.get_cursor_ref�16�0 +test_ref_cursor.main�256�0 +test_ref_cursor.process_cursor�256�0 types�512�0

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).