diff options
author | stuconnolly <stuart02@gmail.com> | 2011-03-07 20:12:52 +0000 |
---|---|---|
committer | stuconnolly <stuart02@gmail.com> | 2011-03-07 20:12:52 +0000 |
commit | 1e5288e9840e201a00bcb5ca3035d7aa807f1f8d (patch) | |
tree | 0c1a47953f57b71c41cc7a63e156629c6c9d645b /Source/SPSQLTokenizer.l | |
parent | 915a3831525bf3a9350648d82f86dd54ae366292 (diff) | |
download | sequelpro-1e5288e9840e201a00bcb5ca3035d7aa807f1f8d.tar.gz sequelpro-1e5288e9840e201a00bcb5ca3035d7aa807f1f8d.tar.bz2 sequelpro-1e5288e9840e201a00bcb5ca3035d7aa807f1f8d.zip |
Bring outline view branch up to date with trunk (r3203:r3224).
Diffstat (limited to 'Source/SPSQLTokenizer.l')
-rw-r--r-- | Source/SPSQLTokenizer.l | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/SPSQLTokenizer.l b/Source/SPSQLTokenizer.l index 61fb3b8a..1964c94d 100644 --- a/Source/SPSQLTokenizer.l +++ b/Source/SPSQLTokenizer.l @@ -29,8 +29,6 @@ int utf8strlenfortoken(const char * _s); int yyuoffset, yyuleng; -#define YY_NO_UNPUT - //keep track of the current utf-8 character (not byte) offset and token length #define YY_USER_ACTION { yyuoffset += yyuleng; yyuleng = utf8strlenfortoken(yytext); } //ignore the output of unmatched characters @@ -38,6 +36,7 @@ int yyuoffset, yyuleng; %} %option prefix="to" %option noyywrap +%option nounput %option case-insensitive %option nostdinit @@ -135,5 +134,5 @@ int utf8strlenfortoken(const char * _s) } done: - return ((s - _s) - count); + return (int)((s - _s) - count); } |