Tag: cws_src680_qiq User: fs Date: 2006/06/27 08:10:17 Modified: dba/connectivity/source/parse/sqlbison.y
Log: RESYNC: (1.51-1.52); FILE MERGED 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.4&r2=1.51.168.5 Delta lines: +207 -3 --------------------- --- sqlbison.y 7 Jun 2006 12:18:16 -0000 1.51.168.4 +++ sqlbison.y 27 Jun 2006 15:10:14 -0000 1.51.168.5 @@ -76,6 +76,15 @@ #include "connectivity/dbconversion.hxx" #endif +#if defined __GNUC__ + #pragma GCC system_header +#elif defined __SUNPRO_CC +#pragma disable_warn +#elif defined _MSC_VER +#pragma warning(push, 1) +#pragma warning(disable:4701) +#endif + static ::rtl::OUString aEmptyString; static connectivity::OSQLInternalNode* newNode(const sal_Char* pNewValue, @@ -3166,8 +3175,14 @@ 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; } @@ -3192,6 +3207,10 @@ case KEY_MAX: aKeyword = KEY_STR_MAX; break; case KEY_MIN: aKeyword = KEY_STR_MIN; break; case KEY_SUM: aKeyword = KEY_STR_SUM; break; + case KEY_NONE: break; + default: + OSL_ENSURE( false, "OParseContext::getIntlKeywordAscii: unknown key!" ); + break; } return aKeyword; } @@ -3492,6 +3511,187 @@ //----------------------------------------------------------------------------- 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]; } // ------------------------------------------------------------------------- @@ -3668,4 +3868,8 @@ return s_pScanner->SQLlex(); } - +#if defined __SUNPRO_CC +#pragma enable_warn +#elif defined _MSC_VER +#pragma warning(pop) +#endif --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
