[dba-cvs] CVS update [cws_src680_dba24b]: /dba/connectivity/source/parse/sqlflex.l

[oj]

Tag: cws_src680_dba24b
User: oj      
Date: 2007-08-23 13:10:02+0000
Modified:
   dba/connectivity/source/parse/sqlflex.l

Log:
 #i32900# correct scanner for parameter

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.30&r2=1.30.160.1
Delta lines:  +5 -7
-------------------
--- sqlflex.l   2006-07-25 07:45:46+0000        1.30
+++ sqlflex.l   2007-08-23 13:09:59+0000        1.30.160.1
@@ -6,9 +6,9 @@
 //
 //  $RCSfile: sqlflex.l,v $
 //
-//  $Revision: 1.30 $
+//  $Revision: 1.30.160.1 $
 //
-//  last change: $Author: rt $ $Date: 2006/07/25 07:45:46 $
+//  last change: $Author: oj $ $Date: 2007/08/23 13:09:59 $
 //
 //  The Contents of this file are made available subject to
 //  the terms of GNU Lesser General Public License Version 2.1.
@@ -249,7 +249,6 @@
 [Ll][Oo][Gg][Ff]                                                               
{SQL_NEW_KEYWORD(SQL_TOKEN_LOGF); return SQL_TOKEN_LOGF; }
 [Ll][Oo][Gg]10                                                                 
{SQL_NEW_KEYWORD(SQL_TOKEN_LOG10); return SQL_TOKEN_LOG10; }
 [Ll][Oo][Ww][Ee][Rr]                                                   
{SQL_NEW_KEYWORD(SQL_TOKEN_LOWER); return SQL_TOKEN_LOWER; }
-[Ll][Nn]                                                                       
        {SQL_NEW_KEYWORD(SQL_TOKEN_LN); return SQL_TOKEN_LN; }
 [Ll][Tt][Rr][Ii][Mm]                                                   
{SQL_NEW_KEYWORD(SQL_TOKEN_LTRIM); return SQL_TOKEN_LTRIM; }
 
 [Mm][Aa][Xx]                                                                   
{SQL_NEW_KEYWORD(SQL_TOKEN_MAX); return SQL_TOKEN_MAX; }
@@ -364,7 +363,6 @@
 [-+*/:(),.;?{}]    { return SQLyytext[0]; }
 
 
-
 
<SQL>[A-Za-z\200-\277\300-\337\340-\357\360-\367\370-\373\374-\375][A-Za-z\200-\277\300-\337\340-\357\360-\367\370-\373\374-\375_0-9]*
         {return gatherName( SQLyytext);}
 
 <SQL>([0-9]+) | 
@@ -619,7 +617,7 @@
                {
                        ::rtl::OString sStmt = 
xxx_pGLOBAL_SQLSCAN->getStatement();
                        sal_Int32 nLength = strlen(text);
-                       sal_Int32 nPos = sStmt.getLength() - nLength - 1;
+                       sal_Int32 nPos = xxx_pGLOBAL_SQLSCAN->GetCurrentPos() - 
nLength - 2;
                        if (sStmt.getStr()[nPos] == ':')
                        {
                                
SQL_NEW_NODE(::rtl::OUString(text,nLength,RTL_TEXTENCODING_UTF8), 
SQL_NODE_NAME); 




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]