Merge branch 'sql-parser-update'

src/symbols.c

@@ -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;
 		}

tagmanager/ctags/read.c

@@ -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

tagmanager/ctags/read.h

@@ -101,6 +101,7 @@ extern boolean fileOpen (const char *const fileName, const langType language);
 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);

tests/ctags/3184782.sql.tags

@@ -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

tests/ctags/bug1570779.sql.tags

@@ -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

tests/ctags/bug1938565.sql.tags

@@ -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

tests/ctags/bug1944150.sql.tags

@@ -1,2 +1,2 @@
 # format=tagmanager
-cash_trade_comment.Ì65536Ö0
+tr_d_cash_trade_commentÌ65536Îcash_trade_commentÖ0

tests/ctags/bug823000.sql.tags

@@ -1,4 +1,4 @@
 # format=tagmanager
 TESTÌ512Ö0
-TestFunc1Ì256Ö0
-TestFunc2Ì256Ö0
+TestFunc1Ì256ÎTESTÖ0
+TestFunc2Ì256ÎTESTÖ0

tests/ctags/db-trig.sql.tags

@@ -1,2 +1,3 @@
 # format=tagmanager
-database.startup_dbĚ65536Ö0
+restrict_loginÌ65536ÎdatabaseÖ0
+startup_dbÌ65536ÎdatabaseÖ0

tests/ctags/ingres_procedures.sql.tags

@@ -1,2 +1,7 @@
 # format=tagmanager
 db0001Ì256Ö0
+db0002ﾌ256ﾖ0
+db0003ﾌ256ﾖ0
+errﾌ16384ﾖ0
+nﾌ16384ﾖ0
+xﾌ16384ﾖ0

tests/ctags/random.sql.tags

@@ -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

tests/ctags/readlob.sql.tags

@@ -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

tests/ctags/readlong.sql.tags

@@ -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

tests/ctags/refcurs.sql.tags

@@ -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