Tag: cws_src680_qiq User: fs Date: 2006/06/28 00:39:22 Modified: dba/connectivity/source/parse/sqlbison.y dba/connectivity/source/parse/sqliterator.cxx dba/connectivity/source/parse/sqlnode.cxx
Log: #i10000# 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.51.168.5&r2=1.51.168.6 Delta lines: +2 -186 --------------------- --- sqlbison.y 27 Jun 2006 15:10:14 -0000 1.51.168.5 +++ sqlbison.y 28 Jun 2006 07:39:19 -0000 1.51.168.6 @@ -1,7 +1,7 @@ %{ //-------------------------------------------------------------------------- // -// $Header: dba/connectivity/source/parse/sqlbison.y,v 1.51.168.5 2006/06/27 15:10:14 fs Exp $ +// $Header: dba/connectivity/source/parse/sqlbison.y,v 1.51.168.6 2006/06/28 07:39:19 fs Exp $ // // Copyright 2000 Sun Microsystems, Inc. All Rights Reserved. // @@ -9,7 +9,7 @@ // OJ // // Last change: -// $Author: fs $ $Date: 2006/06/27 15:10:14 $ $Revision: 1.51.168.5 $ +// $Author: fs $ $Date: 2006/06/28 07:39:19 $ $Revision: 1.51.168.6 $ // // Description: // @@ -3175,14 +3175,11 @@ case ERROR_INVALID_TABLE: aMsg = ERROR_STR_INVALID_TABLE; break; case ERROR_INVALID_TABLE_OR_QUERY: aMsg = ERROR_STR_INVALID_TABLE_OR_QUERY; break; case ERROR_INVALID_COLUMN: aMsg = ERROR_STR_INVALID_COLUMN; break; -<<<<<<< sqlbison.y case ERROR_INVALID_TABLE_EXIST: aMsg = ERROR_STR_INVALID_TABLE_EXIST; break; case ERROR_INVALID_QUERY_EXIST: aMsg = ERROR_STR_INVALID_QUERY_EXIST; break; -======= default: OSL_ENSURE( false, "OParseContext::getErrorMessage: unknown error code!" ); break; ->>>>>>> 1.52 } return aMsg; } @@ -3511,187 +3508,6 @@ //----------------------------------------------------------------------------- sal_uInt32 OSQLParser::RuleID(OSQLParseNode::Rule eRule) { -<<<<<<< sqlbison.y -======= - if (!s_nRuleIDs[eRule]) - { - switch (eRule) - { - case OSQLParseNode::select_statement: - s_nRuleIDs[eRule] = StrToRuleID("select_statement"); break; - case OSQLParseNode::from_clause: - s_nRuleIDs[eRule] = StrToRuleID("from_clause"); break; - case OSQLParseNode::table_ref_commalist: - s_nRuleIDs[eRule] = StrToRuleID("table_ref_commalist"); break; - case OSQLParseNode::table_exp: - s_nRuleIDs[eRule] = StrToRuleID("table_exp"); break; - case OSQLParseNode::table_ref: - s_nRuleIDs[eRule] = StrToRuleID("table_ref"); break; - case OSQLParseNode::catalog_name: - s_nRuleIDs[eRule] = StrToRuleID("catalog_name"); break; - case OSQLParseNode::schema_name: - s_nRuleIDs[eRule] = StrToRuleID("schema_name"); break; - case OSQLParseNode::table_name: - s_nRuleIDs[eRule] = StrToRuleID("table_name"); break; - case OSQLParseNode::opt_column_commalist: - s_nRuleIDs[eRule] = StrToRuleID("opt_column_commalist"); break; - case OSQLParseNode::column_commalist: - s_nRuleIDs[eRule] = StrToRuleID("column_commalist"); break; - case OSQLParseNode::column_ref_commalist: - s_nRuleIDs[eRule] = StrToRuleID("column_ref_commalist"); break; - case OSQLParseNode::column_ref: - s_nRuleIDs[eRule] = StrToRuleID("column_ref"); break; - case OSQLParseNode::opt_order_by_clause: - s_nRuleIDs[eRule] = StrToRuleID("opt_order_by_clause"); break; - case OSQLParseNode::ordering_spec_commalist: - s_nRuleIDs[eRule] = StrToRuleID("ordering_spec_commalist"); break; - case OSQLParseNode::ordering_spec: - s_nRuleIDs[eRule] = StrToRuleID("ordering_spec"); break; - case OSQLParseNode::opt_asc_desc: - s_nRuleIDs[eRule] = StrToRuleID("opt_asc_desc"); break; - case OSQLParseNode::where_clause: - s_nRuleIDs[eRule] = StrToRuleID("where_clause"); break; - case OSQLParseNode::opt_where_clause: - s_nRuleIDs[eRule] = StrToRuleID("opt_where_clause"); break; - case OSQLParseNode::search_condition: - s_nRuleIDs[eRule] = StrToRuleID("search_condition"); break; - case OSQLParseNode::comparison_predicate: - s_nRuleIDs[eRule] = StrToRuleID("comparison_predicate"); break; - case OSQLParseNode::between_predicate: - s_nRuleIDs[eRule] = StrToRuleID("between_predicate"); break; - case OSQLParseNode::like_predicate: - s_nRuleIDs[eRule] = StrToRuleID("like_predicate"); break; - case OSQLParseNode::opt_escape: - s_nRuleIDs[eRule] = StrToRuleID("opt_escape"); break; - case OSQLParseNode::test_for_null: - s_nRuleIDs[eRule] = StrToRuleID("test_for_null"); break; - case OSQLParseNode::scalar_exp_commalist: - s_nRuleIDs[eRule] = StrToRuleID("scalar_exp_commalist"); break; - case OSQLParseNode::scalar_exp: - s_nRuleIDs[eRule] = StrToRuleID("scalar_exp"); break; - case OSQLParseNode::parameter_ref: - s_nRuleIDs[eRule] = StrToRuleID("parameter_ref"); break; - case OSQLParseNode::parameter: - s_nRuleIDs[eRule] = StrToRuleID("parameter"); break; - case OSQLParseNode::general_set_fct: - s_nRuleIDs[eRule] = StrToRuleID("general_set_fct"); break; - case OSQLParseNode::range_variable: - s_nRuleIDs[eRule] = StrToRuleID("range_variable"); break; - case OSQLParseNode::column: - s_nRuleIDs[eRule] = StrToRuleID("column"); break; -// case OSQLParseNode::delete_statement_positioned: -// s_nRuleIDs[eRule] = StrToRuleID("delete_statement_positioned"); break; - case OSQLParseNode::delete_statement_searched: - s_nRuleIDs[eRule] = StrToRuleID("delete_statement_searched"); break; -// case OSQLParseNode::update_statement_positioned: -// s_nRuleIDs[eRule] = StrToRuleID("update_statement_positioned"); break; - case OSQLParseNode::update_statement_searched: - s_nRuleIDs[eRule] = StrToRuleID("update_statement_searched"); break; - case OSQLParseNode::assignment_commalist: - s_nRuleIDs[eRule] = StrToRuleID("assignment_commalist"); break; - case OSQLParseNode::assignment: - s_nRuleIDs[eRule] = StrToRuleID("assignment"); break; - case OSQLParseNode::values_or_query_spec: - s_nRuleIDs[eRule] = StrToRuleID("values_or_query_spec"); break; - case OSQLParseNode::insert_statement: - s_nRuleIDs[eRule] = StrToRuleID("insert_statement"); break; - case OSQLParseNode::insert_atom_commalist: - s_nRuleIDs[eRule] = StrToRuleID("insert_atom_commalist"); break; - case OSQLParseNode::insert_atom: - s_nRuleIDs[eRule] = StrToRuleID("insert_atom"); break; - case OSQLParseNode::predicate_check: - s_nRuleIDs[eRule] = StrToRuleID("predicate_check"); break; - case OSQLParseNode::qualified_join: - s_nRuleIDs[eRule] = StrToRuleID("qualified_join"); break; - case OSQLParseNode::cross_union: - s_nRuleIDs[eRule] = StrToRuleID("cross_union"); break; - case OSQLParseNode::select_sublist: - s_nRuleIDs[eRule] = StrToRuleID("select_sublist"); break; - case OSQLParseNode::derived_column: - s_nRuleIDs[eRule] = StrToRuleID("derived_column"); break; - case OSQLParseNode::column_val: - s_nRuleIDs[eRule] = StrToRuleID("column_val"); break; - case OSQLParseNode::set_fct_spec: - s_nRuleIDs[eRule] = StrToRuleID("set_fct_spec"); break; - case OSQLParseNode::boolean_term: - s_nRuleIDs[eRule] = StrToRuleID("boolean_term"); break; - case OSQLParseNode::boolean_primary: - s_nRuleIDs[eRule] = StrToRuleID("boolean_primary"); break; - case OSQLParseNode::num_value_exp: - s_nRuleIDs[eRule] = StrToRuleID("num_value_exp"); break; - case OSQLParseNode::join_type: - s_nRuleIDs[eRule] = StrToRuleID("join_type"); break; - case OSQLParseNode::position_exp: - s_nRuleIDs[eRule] = StrToRuleID("position_exp"); break; - case OSQLParseNode::extract_exp: - s_nRuleIDs[eRule] = StrToRuleID("extract_exp"); break; - case OSQLParseNode::length_exp: - s_nRuleIDs[eRule] = StrToRuleID("length_exp"); break; - case OSQLParseNode::char_value_fct: - s_nRuleIDs[eRule] = StrToRuleID("char_value_fct"); break; - case OSQLParseNode::odbc_call_spec: - s_nRuleIDs[eRule] = StrToRuleID("odbc_call_spec"); break; - case OSQLParseNode::in_predicate: - s_nRuleIDs[eRule] = StrToRuleID("in_predicate"); break; - case OSQLParseNode::existence_test: - s_nRuleIDs[eRule] = StrToRuleID("existence_test"); break; - case OSQLParseNode::unique_test: - s_nRuleIDs[eRule] = StrToRuleID("unique_test"); break; - case OSQLParseNode::all_or_any_predicate: - s_nRuleIDs[eRule] = StrToRuleID("all_or_any_predicate"); break; - case OSQLParseNode::named_columns_join: - s_nRuleIDs[eRule] = StrToRuleID("named_columns_join"); break; - case OSQLParseNode::join_condition: - s_nRuleIDs[eRule] = StrToRuleID("join_condition"); break; - case OSQLParseNode::joined_table: - s_nRuleIDs[eRule] = StrToRuleID("joined_table"); break; - case OSQLParseNode::boolean_factor: - s_nRuleIDs[eRule] = StrToRuleID("boolean_factor"); break; - case OSQLParseNode::factor: - s_nRuleIDs[eRule] = StrToRuleID("factor"); break; - case OSQLParseNode::sql_not: - s_nRuleIDs[eRule] = StrToRuleID("not"); break; - case OSQLParseNode::boolean_test: - s_nRuleIDs[eRule] = StrToRuleID("boolean_test"); break; - case OSQLParseNode::manipulative_statement: - s_nRuleIDs[eRule] = StrToRuleID("manipulative_statement"); break; - case OSQLParseNode::subquery: - s_nRuleIDs[eRule] = StrToRuleID("subquery"); break; - case OSQLParseNode::value_exp_commalist: - s_nRuleIDs[eRule] = StrToRuleID("value_exp_commalist"); break; - case OSQLParseNode::odbc_fct_spec: - s_nRuleIDs[eRule] = StrToRuleID("odbc_fct_spec"); break; - case OSQLParseNode::union_statement: - s_nRuleIDs[eRule] = StrToRuleID("union_statement"); break; - case OSQLParseNode::outer_join_type: - s_nRuleIDs[eRule] = StrToRuleID("outer_join_type"); break; - case OSQLParseNode::char_value_exp: - s_nRuleIDs[eRule] = StrToRuleID("char_value_exp"); break; - case OSQLParseNode::term: - s_nRuleIDs[eRule] = StrToRuleID("term"); break; - case OSQLParseNode::value_exp_primary: - s_nRuleIDs[eRule] = StrToRuleID("value_exp_primary"); break; - case OSQLParseNode::value_exp: - s_nRuleIDs[eRule] = StrToRuleID("value_exp"); break; - case OSQLParseNode::fold: - s_nRuleIDs[eRule] = StrToRuleID("fold"); break; - case OSQLParseNode::char_substring_fct: - s_nRuleIDs[eRule] = StrToRuleID("char_substring_fct"); break; - case OSQLParseNode::selection: - s_nRuleIDs[eRule] = StrToRuleID("selection"); break; - case OSQLParseNode::base_table_def: - s_nRuleIDs[eRule] = StrToRuleID("base_table_def"); break; - case OSQLParseNode::base_table_element_commalist: - s_nRuleIDs[eRule] = StrToRuleID("base_table_element_commalist"); break; - case OSQLParseNode::data_type: - s_nRuleIDs[eRule] = StrToRuleID("data_type"); break; - case OSQLParseNode::column_def: - s_nRuleIDs[eRule] = StrToRuleID("column_def"); break; - default: - OSL_ENSURE(0,"interner Fehler: Regel nicht bekannt, in OSQLParser::RuleID nachtragen!"); - } - } ->>>>>>> 1.52 return s_nRuleIDs[(sal_uInt16)eRule]; } // ------------------------------------------------------------------------- File [changed]: sqliterator.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/parse/sqliterator.cxx?r1=1.46.78.9&r2=1.46.78.10 Delta lines: +3 -12 -------------------- --- sqliterator.cxx 27 Jun 2006 15:10:24 -0000 1.46.78.9 +++ sqliterator.cxx 28 Jun 2006 07:39:19 -0000 1.46.78.10 @@ -4,9 +4,9 @@ * * $RCSfile: sqliterator.cxx,v $ * - * $Revision: 1.46.78.9 $ + * $Revision: 1.46.78.10 $ * - * last change: $Author: fs $ $Date: 2006/06/27 15:10:24 $ + * last change: $Author: fs $ $Date: 2006/06/28 07:39:19 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1779,15 +1779,6 @@ << (bAscending ? "sal_True" : "sal_False") << "\n"; #endif - OSL_UNUSED( rColumnName ); - OSL_UNUSED( rTableRange ); - OSL_UNUSED( ePredicateType ); - OSL_UNUSED( rValue ); - OSL_UNUSED( rParameterName ); - OSL_UNUSED( rColumnName ); - OSL_UNUSED( rValue ); - OSL_UNUSED( bsetNull ); - OSL_UNUSED( rParameterName ); } //----------------------------------------------------------------------------- File [changed]: sqlnode.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/parse/sqlnode.cxx?r1=1.38.62.8&r2=1.38.62.9 Delta lines: +8 -5 ------------------- --- sqlnode.cxx 27 Jun 2006 15:10:33 -0000 1.38.62.8 +++ sqlnode.cxx 28 Jun 2006 07:39:19 -0000 1.38.62.9 @@ -4,9 +4,9 @@ * * $RCSfile: sqlnode.cxx,v $ * - * $Revision: 1.38.62.8 $ + * $Revision: 1.38.62.9 $ * - * last change: $Author: fs $ $Date: 2006/06/27 15:10:33 $ + * last change: $Author: fs $ $Date: 2006/06/28 07:39:19 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -163,7 +163,7 @@ return bRet; } // ----------------------------------------------------------------------------- - void replaceAndReset(OSQLParseNode*& _pResetNode,OSQLParseNode* _pNewNode) + void replaceAndReset(connectivity::OSQLParseNode*& _pResetNode,connectivity::OSQLParseNode* _pNewNode) { _pResetNode->getParent()->replace(_pResetNode, _pNewNode); delete _pResetNode; @@ -403,6 +403,7 @@ { const OSQLParseNode* pChildNode = pTableRef->getChild( i ); OSQLParseNode::Rule eRuleID = pChildNode->getKnownRuleID(); + OSL_UNUSED( eRuleID ); } #endif OSL_ENSURE( false, "lcl_isAliasNamePresent: unreachable code - except you extended the production rules for table_ref!" ); @@ -511,6 +512,8 @@ bHandled = true; } break; + default: + break; } // switch ( getKnownRuleID() ) if ( !bHandled ) @@ -2300,7 +2303,7 @@ if (rString.getLength()) rString += ::rtl::OUString::createFromAscii(" "); - ::rtl::OString sT = OSQLParser::TokenIDToStr(m_nNodeID, rParam.m_pContext); + ::rtl::OString sT = OSQLParser::TokenIDToStr(m_nNodeID, &rParam.m_rContext); rString += ::rtl::OUString(sT,sT.getLength(),RTL_TEXTENCODING_UTF8); } break; case SQL_NODE_STRING: --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
