diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-09-13 14:56:15 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-13 14:56:32 +0200 |
| commit | fac03549291004a3ab64a0618a7119e2cc906409 (patch) | |
| tree | 06a47a15a1c7af8e2a67ba613cdc9c88af772356 /connectivity | |
| parent | 04e92a626ee01340bc8308566753719274b99edf (diff) | |
translate german comments in sqlbison.y
Change-Id: Ic573e5ae63fdfb3d4ff79eb6d81fe0f4b058d582
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/parse/sqlbison.y | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y index ae793e821d1d..fb3837303367 100644 --- a/connectivity/source/parse/sqlbison.y +++ b/connectivity/source/parse/sqlbison.y @@ -71,8 +71,8 @@ inline connectivity::OSQLInternalNode* newNode(const ::rtl::OUString& _NewValue, const sal_uInt32 nNodeID = 0); -// yyi ist die interne Nr. der Regel, die gerade reduziert wird. -// Ueber die Mapping-Tabelle yyrmap wird daraus eine externe Regel-Nr. +// yyi is the internal number of the rule that is currently being reduced +// This can be mapped to extrnal rule number via the yyrmap. #define SQL_NEW_RULE newNode("", SQL_NODE_RULE, yyr1[yyn]) #define SQL_NEW_LISTRULE newNode("", SQL_NODE_LISTRULE, yyr1[yyn]) #define SQL_NEW_COMMALISTRULE newNode("", SQL_NODE_COMMALISTRULE, yyr1[yyn]) @@ -4652,7 +4652,7 @@ OSQLParseNode* OSQLParser::parseTree(::rtl::OUString& rErrorMessage, m_pParseTree = NULL; m_sErrorMessage = ::rtl::OUString(); - // ... und den Parser anwerfen ... + // start parsing if (SQLyyparse() != 0) { // only set the error message, if it's not already set @@ -4671,16 +4671,12 @@ OSQLParseNode* OSQLParser::parseTree(::rtl::OUString& rErrorMessage, { (*s_pGarbageCollector)->clear(); - // Das Ergebnis liefern (den Root Parse Node): + // return result: + // to work around a bug in MKS YACC return the member m_pParseTree + // instead of Sdbyyval.pParseNode - // OSL_ENSURE(Sdbyyval.pParseNode != NULL,"OSQLParser: Parser hat keinen ParseNode geliefert"); - // return Sdbyyval.pParseNode; - // geht nicht wegen Bug in MKS YACC-erzeugtem Code (es wird ein falscher ParseNode - // geliefert). - - // Stattdessen setzt die Parse-Routine jetzt den Member pParseTree - // - einfach diesen zurueckliefern: - OSL_ENSURE(m_pParseTree != NULL,"OSQLParser: Parser hat keinen ParseTree geliefert"); + SAL_WARN_IF(!m_pParseTree, "connectivity", + "OSQLParser: Parser did not create ParseTree"); return m_pParseTree; } } |