Tag: cws_src680_dba24b User: oj Date: 2007-08-24 06:48:18+0000 Modified: dba/connectivity/source/parse/sqlbison.y dba/connectivity/source/parse/sqlflex.l dba/connectivity/source/parse/sqlnode.cxx
Log: #i59211# add concat || 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.57.6.1&r2=1.57.6.2 Delta lines: +13 -5 -------------------- --- sqlbison.y 2007-08-23 11:01:57+0000 1.57.6.1 +++ sqlbison.y 2007-08-24 06:48:15+0000 1.57.6.2 @@ -1,7 +1,7 @@ %{ //-------------------------------------------------------------------------- // -// $Header: /cvs/dba/connectivity/source/parse/sqlbison.y,v 1.57.6.1 2007/08/23 11:01:57 oj Exp $ +// $Header: /cvs/dba/connectivity/source/parse/sqlbison.y,v 1.57.6.2 2007/08/24 06:48:15 oj Exp $ // // Copyright 2000 Sun Microsystems, Inc. All Rights Reserved. // @@ -9,7 +9,7 @@ // OJ // // Last change: -// $Author: oj $ $Date: 2007/08/23 11:01:57 $ $Revision: 1.57.6.1 $ +// $Author: oj $ $Date: 2007/08/24 06:48:15 $ $Revision: 1.57.6.2 $ // // Description: // @@ -204,7 +204,7 @@ %left <pParseNode> SQL_TOKEN_AND %left <pParseNode> SQL_LESSEQ SQL_GREATEQ SQL_NOTEQUAL SQL_LESS SQL_GREAT SQL_EQUAL /* '<' '>' = <> < > <= >= != */ -%left <pParseNode> '+' '-' +%left <pParseNode> '+' '-' SQL_CONCAT %left <pParseNode> '*' '/' %left SQL_TOKEN_NATURAL SQL_TOKEN_CROSS SQL_TOKEN_FULL SQL_TOKEN_LEFT SQL_TOKEN_RIGHT %left ')' @@ -1377,6 +1377,7 @@ $$->append($1); $$->append($2); $$->append($3); + // hello } else YYERROR; @@ -2608,6 +2609,13 @@ $$->append($2 = newNode("+", SQL_NODE_PUNCTUATION)); $$->append($3); } + | value_exp SQL_CONCAT value_exp + { + $$ = SQL_NEW_RULE; + $$->append($1); + $$->append($2); + $$->append($3); + } ; char_primary: @@ -3028,7 +3036,7 @@ $$->append($1 = newNode(":", SQL_NODE_PUNCTUATION)); $$->append($2);} | '?' - {$$ = SQL_NEW_RULE; + {$$ = SQL_NEW_RULE; // test $$->append($1 = newNode("?", SQL_NODE_PUNCTUATION));} | '[' SQL_TOKEN_NAME ']' {$$ = SQL_NEW_RULE; File [changed]: sqlflex.l Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/parse/sqlflex.l?r1=1.30.160.1&r2=1.30.160.2 Delta lines: +3 -2 ------------------- --- sqlflex.l 2007-08-23 13:09:59+0000 1.30.160.1 +++ sqlflex.l 2007-08-24 06:48:15+0000 1.30.160.2 @@ -6,9 +6,9 @@ // // $RCSfile: sqlflex.l,v $ // -// $Revision: 1.30.160.1 $ +// $Revision: 1.30.160.2 $ // -// last change: $Author: oj $ $Date: 2007/08/23 13:09:59 $ +// last change: $Author: oj $ $Date: 2007/08/24 06:48:15 $ // // The Contents of this file are made available subject to // the terms of GNU Lesser General Public License Version 2.1. @@ -358,6 +358,7 @@ ">=" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQL_NODE_GREATEQ);return SQL_GREATEQ;} "<>" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQL_NODE_NOTEQUAL);return SQL_NOTEQUAL;} "!=" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQL_NODE_NOTEQUAL);return SQL_NOTEQUAL;} +"||" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQL_NODE_CONCAT);return SQL_CONCAT;} [-+*/:(),.;?{}] { return SQLyytext[0]; } File [changed]: sqlnode.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/parse/sqlnode.cxx?r1=1.47.26.3&r2=1.47.26.4 Delta lines: +6 -6 ------------------- --- sqlnode.cxx 2007-08-23 12:10:27+0000 1.47.26.3 +++ sqlnode.cxx 2007-08-24 06:48:15+0000 1.47.26.4 @@ -4,9 +4,9 @@ * * $RCSfile: sqlnode.cxx,v $ * - * $Revision: 1.47.26.3 $ + * $Revision: 1.47.26.4 $ * - * last change: $Author: oj $ $Date: 2007/08/23 12:10:27 $ + * last change: $Author: oj $ $Date: 2007/08/24 06:48:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1617,7 +1617,7 @@ ,m_nNodeID(nNewNodeID) { - OSL_ENSURE(m_eNodeType >= SQL_NODE_RULE && m_eNodeType <= SQL_NODE_ACCESS_DATE,"OSQLParseNode: mit unzulaessigem NodeType konstruiert"); + OSL_ENSURE(m_eNodeType >= SQL_NODE_RULE && m_eNodeType <= SQL_NODE_CONCAT,"OSQLParseNode: mit unzulaessigem NodeType konstruiert"); } //----------------------------------------------------------------------------- OSQLParseNode::OSQLParseNode(const ::rtl::OString &_rNewValue, @@ -1629,7 +1629,7 @@ ,m_nNodeID(nNewNodeID) { - OSL_ENSURE(m_eNodeType >= SQL_NODE_RULE && m_eNodeType <= SQL_NODE_ACCESS_DATE,"OSQLParseNode: mit unzulaessigem NodeType konstruiert"); + OSL_ENSURE(m_eNodeType >= SQL_NODE_RULE && m_eNodeType <= SQL_NODE_CONCAT,"OSQLParseNode: mit unzulaessigem NodeType konstruiert"); } //----------------------------------------------------------------------------- OSQLParseNode::OSQLParseNode(const sal_Unicode * pNewValue, @@ -1641,7 +1641,7 @@ ,m_nNodeID(nNewNodeID) { - OSL_ENSURE(m_eNodeType >= SQL_NODE_RULE && m_eNodeType <= SQL_NODE_ACCESS_DATE,"OSQLParseNode: mit unzulaessigem NodeType konstruiert"); + OSL_ENSURE(m_eNodeType >= SQL_NODE_RULE && m_eNodeType <= SQL_NODE_CONCAT,"OSQLParseNode: mit unzulaessigem NodeType konstruiert"); } //----------------------------------------------------------------------------- OSQLParseNode::OSQLParseNode(const ::rtl::OUString &_rNewValue, @@ -1653,7 +1653,7 @@ ,m_nNodeID(nNewNodeID) { - OSL_ENSURE(m_eNodeType >= SQL_NODE_RULE && m_eNodeType <= SQL_NODE_ACCESS_DATE,"OSQLParseNode: mit unzulaessigem NodeType konstruiert"); + OSL_ENSURE(m_eNodeType >= SQL_NODE_RULE && m_eNodeType <= SQL_NODE_CONCAT,"OSQLParseNode: mit unzulaessigem NodeType konstruiert"); } //----------------------------------------------------------------------------- OSQLParseNode::OSQLParseNode(const OSQLParseNode& rParseNode) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
