Tag: cws_src680_dba24a User: oj Date: 2007-08-28 05:28:49+0000 Modified: dba/connectivity/source/parse/sqlbison.y dba/connectivity/source/parse/sqlflex.l dba/connectivity/source/parse/sqlnode.cxx
Log: #i81031# impl roundmagic 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.5&r2=1.56.56.6 Delta lines: +6 -5 ------------------- --- sqlbison.y 2007-08-13 05:28:55+0000 1.56.56.5 +++ sqlbison.y 2007-08-28 05:28:46+0000 1.56.56.6 @@ -1,7 +1,7 @@ %{ //-------------------------------------------------------------------------- // -// $Header: /cvs/dba/connectivity/source/parse/sqlbison.y,v 1.56.56.5 2007/08/13 05:28:55 oj Exp $ +// $Header: /cvs/dba/connectivity/source/parse/sqlbison.y,v 1.56.56.6 2007/08/28 05:28:46 oj Exp $ // // Copyright 2000 Sun Microsystems, Inc. All Rights Reserved. // @@ -9,7 +9,7 @@ // OJ // // Last change: -// $Author: oj $ $Date: 2007/08/13 05:28:55 $ $Revision: 1.56.56.5 $ +// $Author: oj $ $Date: 2007/08/28 05:28:46 $ $Revision: 1.56.56.6 $ // // Description: // @@ -194,7 +194,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_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_LOG10 SQL_TOKEN_MOD SQL_TOKEN_PI SQL_TOKEN_POWER SQL_TOKEN_RADIANS SQL_TOKEN_RAND SQL_TOKEN_ROUNDMAGIC %token <pParseNode> SQL_TOKEN_ROUND SQL_TOKEN_SIGN SQL_TOKEN_SIN SQL_TOKEN_SQRT SQL_TOKEN_TAN SQL_TOKEN_TRUNCATE @@ -1938,6 +1938,7 @@ | SQL_TOKEN_LOG10 | SQL_TOKEN_LN | SQL_TOKEN_RADIANS + | SQL_TOKEN_ROUNDMAGIC ; numeric_function_2Argument: SQL_TOKEN_ATAN2 File [changed]: sqlflex.l Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/parse/sqlflex.l?r1=1.30.154.2&r2=1.30.154.3 Delta lines: +3 -2 ------------------- --- sqlflex.l 2007-08-10 10:43:03+0000 1.30.154.2 +++ sqlflex.l 2007-08-28 05:28:46+0000 1.30.154.3 @@ -6,9 +6,9 @@ // // $RCSfile: sqlflex.l,v $ // -// $Revision: 1.30.154.2 $ +// $Revision: 1.30.154.3 $ // -// last change: $Author: oj $ $Date: 2007/08/10 10:43:03 $ +// last change: $Author: oj $ $Date: 2007/08/28 05:28:46 $ // // The Contents of this file are made available subject to // the terms of GNU Lesser General Public License Version 2.1. @@ -295,6 +295,7 @@ [Rr][Ee][Pp][Ll][Aa][Cc][Ee] {SQL_NEW_KEYWORD(SQL_TOKEN_REPLACE); return SQL_TOKEN_REPLACE; } [Rr][Oo][Ll][Ll][Bb][Aa][Cc][Kk] {SQL_NEW_KEYWORD(SQL_TOKEN_ROLLBACK); return SQL_TOKEN_ROLLBACK; } [Rr][Oo][Uu][Nn][Dd] {SQL_NEW_KEYWORD(SQL_TOKEN_ROUND); return SQL_TOKEN_ROUND; } +[Rr][Oo][Uu][Nn][Dd][Mm][Aa][Gg][Ii][Cc] {SQL_NEW_KEYWORD(SQL_TOKEN_ROUNDMAGIC); return SQL_TOKEN_ROUNDMAGIC; } [Rr][Ii][Gg][Hh][Tt] {SQL_NEW_KEYWORD(SQL_TOKEN_RIGHT); return SQL_TOKEN_RIGHT; } [Rr][Tt][Rr][Ii][Mm] {SQL_NEW_KEYWORD(SQL_TOKEN_RTRIM); return SQL_TOKEN_RTRIM; } File [changed]: sqlnode.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/parse/sqlnode.cxx?r1=1.47.20.1&r2=1.47.20.2 Delta lines: +3 -2 ------------------- --- sqlnode.cxx 2007-08-06 07:26:51+0000 1.47.20.1 +++ sqlnode.cxx 2007-08-28 05:28:46+0000 1.47.20.2 @@ -4,9 +4,9 @@ * * $RCSfile: sqlnode.cxx,v $ * - * $Revision: 1.47.20.1 $ + * $Revision: 1.47.20.2 $ * - * last change: $Author: oj $ $Date: 2007/08/06 07:26:51 $ + * last change: $Author: oj $ $Date: 2007/08/28 05:28:46 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -2565,6 +2565,7 @@ else if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_RADIANS,pContext))) nType = DataType::DOUBLE; else if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_RAND,pContext))) nType = DataType::DOUBLE; else if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_ROUND,pContext))) nType = DataType::DOUBLE; + else if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_ROUNDMAGIC,pContext))) nType = DataType::DOUBLE; else if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_SIGN,pContext))) nType = DataType::DOUBLE; else if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_SIN,pContext))) nType = DataType::DOUBLE; else if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_SQRT,pContext))) nType = DataType::DOUBLE; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
