User: vg
Date: 2008-02-12 13:22:15+0000
Modified:
dba/connectivity/source/parse/sqlflex.l
Log:
INTEGRATION: CWS dba24g_SRC680 (1.32.58); FILE MERGED
2008/01/30 08:26:22 oj 1.32.58.2: #i85508# change ; into {} to make it work
again with 2.5.33
2008/01/29 08:47:12 oj 1.32.58.1: #i85371# change getc to increment pos
File Changes:
Directory: /dba/connectivity/source/parse/
==========================================
File [changed]: sqlflex.l
Url:
http://dba.openoffice.org/source/browse/dba/connectivity/source/parse/sqlflex.l?r1=1.32&r2=1.33
Delta lines: +5 -6
-------------------
--- sqlflex.l 2007-11-01 14:52:20+0000 1.32
+++ sqlflex.l 2008-02-12 13:22:12+0000 1.33
@@ -120,9 +120,6 @@
//=============================================================================
%}
-%e 2500
-%n 2900
-%p 8500
%s SQL
%s PREDICATE_ENG
@@ -416,9 +413,9 @@
\n {}
-[ \t\r]+ ;
+[ \t\r]+ {}
-"--".*$ ;
+"--".*$ {}
. {YY_FATAL_ERROR("Invalid symbol"); return
SQL_TOKEN_INVALIDSYMBOL;}
@@ -736,7 +733,9 @@
//------------------------------------------------------------------------------
sal_Int32 OSQLScanner::SQLyygetc(void)
{
- return (m_nCurrentPos >= m_sStatement.getLength()) ? -1 :
m_sStatement.getStr()[m_nCurrentPos++];
+ sal_Int32 nPos = (m_nCurrentPos >= m_sStatement.getLength()) ? -1 :
m_sStatement.getStr()[m_nCurrentPos];
+ m_nCurrentPos++;
+ return nPos;
}
//------------------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
