Tag: cws_src680_dba24a
User: oj      
Date: 2007-08-10 10:43:05+0000
Modified:
   dba/connectivity/source/parse/sqlbison.y
   dba/connectivity/source/parse/sqlflex.l

Log:
 #i69054# fix log

File Changes:

Directory: /dba/connectivity/source/parse/
==========================================

File [changed]: sqlbison.y
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/parse/sqlbison.y?r1=1.56.56.3&r2=1.56.56.4
Delta lines:  +4 -3
-------------------
--- sqlbison.y  2007-08-09 11:04:30+0000        1.56.56.3
+++ sqlbison.y  2007-08-10 10:43:03+0000        1.56.56.4
@@ -1,7 +1,7 @@
 %{
 //--------------------------------------------------------------------------
 //
-// $Header: /cvs/dba/connectivity/source/parse/sqlbison.y,v 1.56.56.3 
2007/08/09 11:04:30 oj Exp $
+// $Header: /cvs/dba/connectivity/source/parse/sqlbison.y,v 1.56.56.4 
2007/08/10 10:43:03 oj Exp $
 //
 // Copyright 2000 Sun Microsystems, Inc. All Rights Reserved.
 //
@@ -9,7 +9,7 @@
 //     OJ
 //
 // Last change:
-//     $Author: oj $ $Date: 2007/08/09 11:04:30 $ $Revision: 1.56.56.3 $
+//     $Author: oj $ $Date: 2007/08/10 10:43:03 $ $Revision: 1.56.56.4 $
 //
 // Description:
 //
@@ -193,7 +193,7 @@
 
 /* numeric functions */
 %token <pParseNode> SQL_TOKEN_ABS SQL_TOKEN_ACOS SQL_TOKEN_ASIN SQL_TOKEN_ATAN 
SQL_TOKEN_ATAN2 SQL_TOKEN_CEILING 
-%token <pParseNode> SQL_TOKEN_COS SQL_TOKEN_COT SQL_TOKEN_DEGREES 
SQL_TOKEN_EXP SQL_TOKEN_DIV SQL_TOKEN_FLOOR SQL_TOKEN_LOGF  SQL_TOKEN_LN
+%token <pParseNode> SQL_TOKEN_COS SQL_TOKEN_COT SQL_TOKEN_DEGREES 
SQL_TOKEN_EXP SQL_TOKEN_DIV SQL_TOKEN_FLOOR SQL_TOKEN_LOGF  SQL_TOKEN_LOG 
SQL_TOKEN_LN
 %token <pParseNode> SQL_TOKEN_LOG10 SQL_TOKEN_MOD SQL_TOKEN_PI SQL_TOKEN_POWER 
SQL_TOKEN_RADIANS SQL_TOKEN_RAND    
 %token <pParseNode> SQL_TOKEN_ROUND   SQL_TOKEN_SIGN    SQL_TOKEN_SIN     
SQL_TOKEN_SQRT    SQL_TOKEN_TAN SQL_TOKEN_TRUNCATE
 
@@ -1845,6 +1845,7 @@
                SQL_TOKEN_ROUND
        |       SQL_TOKEN_WEEK
        |       SQL_TOKEN_LOGF
+       |       SQL_TOKEN_LOG
        ;
 function_name23:
                SQL_TOKEN_LOCATE

File [changed]: sqlflex.l
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/parse/sqlflex.l?r1=1.30.154.1&r2=1.30.154.2
Delta lines:  +3 -3
-------------------
--- sqlflex.l   2007-08-06 07:26:51+0000        1.30.154.1
+++ sqlflex.l   2007-08-10 10:43:03+0000        1.30.154.2
@@ -6,9 +6,9 @@
 //
 //  $RCSfile: sqlflex.l,v $
 //
-//  $Revision: 1.30.154.1 $
+//  $Revision: 1.30.154.2 $
 //
-//  last change: $Author: oj $ $Date: 2007/08/06 07:26:51 $
+//  last change: $Author: oj $ $Date: 2007/08/10 10:43:03 $
 //
 //  The Contents of this file are made available subject to
 //  the terms of GNU Lesser General Public License Version 2.1.
@@ -246,7 +246,7 @@
 [Ll][Nn]                                                               
{SQL_NEW_KEYWORD(SQL_TOKEN_LN); return SQL_TOKEN_LN; }
 [Ll][Oo][Cc][Aa][Ll]                                                   
{SQL_NEW_KEYWORD(SQL_TOKEN_LOCAL); return SQL_TOKEN_LOCAL; }
 [Ll][Oo][Cc][Aa][Tt][Ee]                                               
{SQL_NEW_KEYWORD(SQL_TOKEN_LOCATE); return SQL_TOKEN_LOCATE; }
-[Ll][Oo][Gg]                                                                   
{SQL_NEW_KEYWORD(SQL_TOKEN_LOGF); return SQL_TOKEN_LOGF; }
+[Ll][Oo][Gg]                                                                   
{SQL_NEW_KEYWORD(SQL_TOKEN_LOG); return SQL_TOKEN_LOG; }
 [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; }




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

Reply via email to