Tag: cws_src680_dba24b User: oj Date: 2007-08-23 11:02:00+0000 Modified: dba/connectivity/source/parse/sqlbison.y dba/connectivity/source/parse/sqlnode.cxx
Log: #i22582# little change boolean_factor 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&r2=1.57.6.1 Delta lines: +5 -37 -------------------- --- sqlbison.y 2007-07-31 13:38:53+0000 1.57 +++ sqlbison.y 2007-08-23 11:01:57+0000 1.57.6.1 @@ -1,7 +1,7 @@ %{ //-------------------------------------------------------------------------- // -// $Header: /cvs/dba/connectivity/source/parse/sqlbison.y,v 1.57 2007/07/31 13:38:53 hr Exp $ +// $Header: /cvs/dba/connectivity/source/parse/sqlbison.y,v 1.57.6.1 2007/08/23 11:01:57 oj Exp $ // // Copyright 2000 Sun Microsystems, Inc. All Rights Reserved. // @@ -9,7 +9,7 @@ // OJ // // Last change: -// $Author: hr $ $Date: 2007/07/31 13:38:53 $ $Revision: 1.57 $ +// $Author: oj $ $Date: 2007/08/23 11:01:57 $ $Revision: 1.57.6.1 $ // // Description: // @@ -1045,54 +1045,22 @@ boolean_test: boolean_primary - | boolean_primary SQL_TOKEN_IS truth_value + | boolean_primary SQL_TOKEN_IS sql_not truth_value { $$ = SQL_NEW_RULE; $$->append($1); $$->append($2); $$->append($3); - } - | boolean_primary SQL_TOKEN_IS SQL_TOKEN_NOT truth_value %prec SQL_TOKEN_IS - { - $$ = SQL_NEW_RULE; - $$->append($1); - $$->append($2); - $$->append($3); - $$->append($4); - } -/* | sql_not SQL_TOKEN_LIKE string_value_exp opt_escape - { - if (xxx_pGLOBAL_SQLPARSER->inPredicateCheck()) - { - OSQLParseNode* pColumnRef = newNode(aEmptyString, SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::column_ref)); - pColumnRef->append(newNode(xxx_pGLOBAL_SQLPARSER->getFieldName(),SQL_NODE_NAME)); - - $$ = SQL_NEW_RULE; - $$->append(pColumnRef); - $$->append($1); - $$->append($2); - if (xxx_pGLOBAL_SQLPARSER->buildLikeRule($$,$3,$4)) $$->append($4); - else - { - delete $$; - YYABORT; - } } - else - YYERROR; - } -*/ ; boolean_factor: boolean_test - | SQL_TOKEN_NOT '(' boolean_test ')' + | SQL_TOKEN_NOT boolean_test { $$ = SQL_NEW_RULE; $$->append($1); - $$->append($2 = newNode("(", SQL_NODE_PUNCTUATION)); - $$->append($3); - $$->append($4 = newNode(")", SQL_NODE_PUNCTUATION)); + $$->append($2); } ; boolean_term: File [changed]: sqlnode.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/parse/sqlnode.cxx?r1=1.47.26.1&r2=1.47.26.2 Delta lines: +3 -3 ------------------- --- sqlnode.cxx 2007-08-23 07:24:58+0000 1.47.26.1 +++ sqlnode.cxx 2007-08-23 11:01:57+0000 1.47.26.2 @@ -4,9 +4,9 @@ * * $RCSfile: sqlnode.cxx,v $ * - * $Revision: 1.47.26.1 $ + * $Revision: 1.47.26.2 $ * - * last change: $Author: oj $ $Date: 2007/08/23 07:24:58 $ + * last change: $Author: oj $ $Date: 2007/08/23 11:01:57 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1954,7 +1954,7 @@ { OSQLParseNode *pNot = pSearchCondition->removeAt((sal_uInt32)0); delete pNot; - OSQLParseNode *pBooleanTest = pSearchCondition->removeAt((sal_uInt32)1); + OSQLParseNode *pBooleanTest = pSearchCondition->removeAt((sal_uInt32)0); pBooleanTest->setParent(NULL); replaceAndReset(pSearchCondition,pBooleanTest); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
