[svn-commits] r171 - branches/projectD/src/back/psf/psl
stromi01 at ingres.com
stromi01 at ingres.com
Sun Jul 27 18:26:13 PDT 2008
Author: stromi01
Date: 2008-07-27 18:26:12 -0700 (Sun, 27 Jul 2008)
New Revision: 171
Modified:
branches/projectD/src/back/psf/psl/psldgram.yi
branches/projectD/src/back/psf/psl/psldscan.c
Log:
#241 - removed unnecessary code
Modified: branches/projectD/src/back/psf/psl/psldgram.yi
===================================================================
--- branches/projectD/src/back/psf/psl/psldgram.yi 2008-07-27 20:01:04 UTC (rev 170)
+++ branches/projectD/src/back/psf/psl/psldgram.yi 2008-07-28 01:26:12 UTC (rev 171)
@@ -1874,13 +1874,7 @@
outer_attribute = pst_coldesc(outer_rngvar, &outer_var_sym.pst_atname);
if (outer_attribute == (DMT_ATT_ENTRY *) NULL)
{
- // TODO: error message details , error should never occour
- // i4 err_code;
- // (VOID) psf_error(2100L, 0L, PSF_USERERR, &err_code,
- // &psq_cb->psq_error, 4, (i4) sizeof(cb->pss_lineno),
- // &cb->pss_lineno, (i4) sizeof(DB_TAB_NAME),
- // &(outer_rngvar->pss_tabname), (i4) sizeof(DB_OWN_NAME),
- // &(outer_rngvar->pss_ownname), (i4) STlength(&join_col_name), &join_col_name);
+ // error should never occour
return (E_DB_ERROR);
}
@@ -1907,13 +1901,7 @@
inner_attribute = pst_coldesc(inner_rngvar, &inner_var_sym.pst_atname);
if (inner_attribute == (DMT_ATT_ENTRY *) NULL)
{
- // TODO: error message details , error should never occour
- // i4 err_code;
- // (VOID) psf_error(2100L, 0L, PSF_USERERR, &err_code,
- // &psq_cb->psq_error, 4, (i4) sizeof(cb->pss_lineno),
- // &cb->pss_lineno, (i4) sizeof(DB_TAB_NAME),
- // &(inner_rngvar->pss_tabname), (i4) sizeof(DB_OWN_NAME),
- // &(inner_rngvar->pss_ownname), (i4) STlength(&join_col_name), &join_col_name);
+ // error should never occour
return (E_DB_ERROR);
}
@@ -2366,8 +2354,8 @@
}
/* Create the corresponding result domain node */
- status = pst_adresdom((char *) &(*attribute)->att_name, resdom_ptr,
- var_ptr, cb, psq_cb, &resdom_ptr);
+ status = pst_adresdom((char *) &(*attribute)->att_name,
+ resdom_ptr, var_ptr, cb, psq_cb, &resdom_ptr);
if (status != E_DB_OK)
{
return (status);
@@ -2561,7 +2549,7 @@
{
if (attribute_node_ptr->resdom_ptr == (PST_QNODE *) NULL || attribute_node_ptr->next->resdom_ptr == (PST_QNODE *) NULL)
{
- // TODO: error message details , error should never occour
+ // error should never occour
return (E_DB_ERROR);
}
attribute_node_ptr->resdom_ptr->pst_left = attribute_node_ptr->next->resdom_ptr;
@@ -2635,6 +2623,7 @@
{
return (status);
}
+
$1->pst_right = newnode;
}
else
Modified: branches/projectD/src/back/psf/psl/psldscan.c
===================================================================
--- branches/projectD/src/back/psf/psl/psldscan.c 2008-07-27 20:01:04 UTC (rev 170)
+++ branches/projectD/src/back/psf/psl/psldscan.c 2008-07-28 01:26:12 UTC (rev 171)
@@ -52,35 +52,12 @@
** 12-feb-08 (strmi01)
** Open: Check numeric and string literal stuff
*/
-
+
/*
** Defines of other constants.
*/
-/*
- ** KEY_INFO_SIZE is the number of entries in the Key_info table.
- */
-#define KEY_INFO_SZ (sizeof(Key_info)/sizeof(KEYINFO)
-
-
/*}
- ** Name: AGGTOK - Table of aggregate token values.
- **
- ** Description:
- ** This structure is used to contain the set of aggregate token values
- ** for aggregate tokens. The number in the tokval field for keywords
- ** is used to find the text which is to be returned.
- **
- ** History:
- ** 13-oct-86 (daved)
- ** written
- */
-typedef struct _AGGTOK
-{
- char *stoken; /* A token value */
-}AGGTOK;
-
-/*}
** Name: SECONDARY - Table of second words for a keyword token.
**
** Description:
@@ -609,8 +586,6 @@
yacc_cb = (YACC_CB*) pss_cb->pss_yacc;
lineno = pss_cb->pss_lineno;
- //TRdisplay("scanner: enter pslscan()\n");
-
#ifdef BYTE_ALIGN
left = &pss_cb->pss_symblk->pss_symdata[PSS_SBSIZE] - pss_cb->pss_symnext;
/*
@@ -644,34 +619,26 @@
*/
pss_cb->pss_prvtok = next_char;
- while (next_char <= qry_end) {
-
- //TRdisplay("scanner: enter while(next_char <= qry_end) - %c\n", *next_char);
-
+ while (next_char <= qry_end)
+ {
/* remember the first non-white character of the token */
- if (non_white_char == (u_char *) NULL && !CMwhite(next_char)) {
+ if (non_white_char == (u_char *) NULL && !CMwhite(next_char))
+ {
non_white_char = next_char;
}
- switch (*next_char) {
-
- case '\t':
+ switch (*next_char)
{
- //TRdisplay("scanner: enter switch (*next_char) case '\\t'\n");
- }
-
+
+ case '\t':
case '\r':
{
- //TRdisplay("scanner: enter switch (*next_char) case '\\r'\n");
-
CMnext(next_char);
continue;
}
case '\n':
- {
- //TRdisplay("scanner: enter switch (*next_char) case '\\n'\n");
-
+ {
CMnext(next_char);
pss_cb->pss_lineno++;
continue;
@@ -679,12 +646,6 @@
case ',':
{
- //TRdisplay("scanner: enter switch (*next_char) case ','\n");
- /*
- ** Due to internationalization, we must determine whether either
- ** of the characters is the decimal point.
- */
-
if (pss_cb->pss_decimal != ','|| next_char >= qry_end
||!CMdigit(next_char + 1) || ret_val == NAME
||(pss_cb->pss_decimal == ','&&pss_cb->pss_stmt_flags
@@ -697,13 +658,11 @@
ret_val = COMMA;
goto tokreturn;
}
- /* This comma is part of a real number, fall through to that case */
}
case '.':
- //TRdisplay("scanner: enter switch (*next_char) case '.'\n");
- if (next_char >= qry_end || !CMdigit(next_char + 1)) {
- /* not a number of the form .ddd so must be a '.' */
+ if (next_char >= qry_end || !CMdigit(next_char + 1))
+ {
CMnext(next_char);
pss_cb->pss_nxtchar = next_char;
yacc_cb->yylval.psl_tytype = 0;
@@ -723,8 +682,6 @@
case '8':
case '9':
{
- //TRdisplay("scanner: enter switch (*next_char) case '0','1','2','3','4','5','6','7','8','9'\n");
-
register u_char *number = next_char;
register i4 type;
i4 c = *number;
@@ -754,10 +711,12 @@
// strmi01 - end of scan digits before possibly decimal marker
// srmi01 - scan digits after possibly decimal marker (fractional)
- if ( CMdigit(next_char)) {
+ if ( CMdigit(next_char))
+ {
type = (pss_cb->pss_parser_compat & PSQ_FLOAT_LITS) ? DB_FLT_TYPE : DB_DEC_TYPE;
- while (next_char <= qry_end) {
+ while (next_char <= qry_end)
+ {
c = *next_char;
CMnext(next_char);
if (!CMdigit(&c))
@@ -769,12 +728,15 @@
// strmi01 - end of scan digits after possibly decimal marker (fractional)
// strmi01 - scan possibly exponent
- if ((c == 'e'|| c == 'E') && next_char <= qry_end) {
+ if ((c == 'e'|| c == 'E') && next_char <= qry_end)
+ {
type = DB_FLT_TYPE;
c = *next_char;
CMnext(next_char);
- if (CMdigit(&c) || c == '-'|| c == '+') {
- while (next_char <= qry_end) {
+ if (CMdigit(&c) || c == '-'|| c == '+')
+ {
+ while (next_char <= qry_end)
+ {
c = *next_char;
CMnext(next_char);
if (!CMdigit(&c))
@@ -785,7 +747,8 @@
// strmi01 - end of scan possibly exponent
/* zero terminate the number for conversion */
- if (next_char <= qry_end + 1) {
+ if (next_char <= qry_end + 1)
+ {
CMprev(next_char, number);
*next_char = '\0';
}
@@ -840,7 +803,7 @@
}
}
- // strmi01 - maybe decimal literal - TODO: check
+ // strmi01 - maybe decimal literal
if ((((type == DB_INT_TYPE) && (pss_cb->pss_parser_compat & PSQ_FLOAT_LITS)==0)
|| (type == DB_DEC_TYPE)) && tot_digs <= DB_MAX_DECPREC)
@@ -884,11 +847,9 @@
}
// end of numeric literal
- // strmi01 - string literal - TODO: check
+ // strmi01 - string literal
case '"':
{
- //TRdisplay("scanner: enter switch (*next_char) case '\"'\n");
-
register u_char *string;
register i4 length;
register i4 esc;
@@ -1036,8 +997,6 @@
case '{':
{
- //TRdisplay("scanner: enter switch (*next_char) case '{'\n");
-
CMnext(next_char);
pss_cb->pss_nxtchar = next_char;
yacc_cb->yylval.psl_tytype = 0;
@@ -1047,8 +1006,6 @@
case '}':
{
- //TRdisplay("scanner: enter switch (*next_char) case '}'\n");
-
CMnext(next_char);
pss_cb->pss_nxtchar = next_char;
yacc_cb->yylval.psl_tytype = 0;
@@ -1058,8 +1015,6 @@
case '(':
{
- //TRdisplay("scanner: enter switch (*next_char) case '('\n");
-
CMnext(next_char);
pss_cb->pss_nxtchar = next_char;
yacc_cb->yylval.psl_tytype = 0;
@@ -1069,96 +1024,60 @@
case ')':
{
- //TRdisplay("scanner: enter switch (*next_char) case ')'\n");
-
CMnext(next_char);
pss_cb->pss_nxtchar = next_char;
yacc_cb->yylval.psl_tytype = 0;
ret_val = RIGHT_PARENTHESIS;
goto tokreturn;
}
-
- // strmi01 - case fully implemented
- // operator +
- // token ADDOP
+
case '+':
{
- //TRdisplay("scanner: enter switch (*next_char) case '+'\n");
-
CMnext(next_char);
pss_cb->pss_nxtchar = next_char;
yacc_cb->yylval.psl_tytype = ADI_ADD_OP;
ret_val = ADDOP;
goto tokreturn;
}
-
- // strmi01 - case fully implemented
- // operator -
- // token SUBOP
- case '-':
- {
- //TRdisplay("scanner: enter switch (*next_char) case '-'\n");
+ case '-':
+ {
CMnext(next_char);
pss_cb->pss_nxtchar = next_char;
yacc_cb->yylval.psl_tytype = ADI_SUB_OP;
ret_val = SUBOP;
goto tokreturn;
}
- // end of operator -
-
- // strmi01 - case fully implemented
- // operator *
- // token MULOP
+
case '*':
{
- TRdisplay("enter switch (*next_char) case '*'\n");
-
CMnext(next_char);
pss_cb->pss_nxtchar = next_char;
yacc_cb->yylval.psl_tytype = ADI_MUL_OP;
ret_val = MULOP;
goto tokreturn;
}
- // end of operator *
-
- // strmi01 - case fully implemented
- // operator /
- // token DIVOP
+
case '/':
{
- //TRdisplay("scanner: enter switch (*next_char) case '/'\n");
-
CMnext(next_char);
pss_cb->pss_nxtchar = next_char;
yacc_cb->yylval.psl_tytype = ADI_DIV_OP;
ret_val = DIVOP;
goto tokreturn;
}
- // end of operator /
-
- // strmi01 - case fully implemented
- // operator =
- // token EQUAL
+
case '=':
{
- //TRdisplay("scanner: enter switch (*next_char) case '='\n");
-
CMnext(next_char);
pss_cb->pss_nxtchar = next_char;
yacc_cb->yylval.psl_tytype = ADI_EQ_OP;
ret_val = EQUAL;
goto tokreturn;
}
- // end operator =
- // strmi01 - case fully implemented
- // operator !=
- // token NOT_EQUAL
case '!':
{
- //TRdisplay("scanner: enter switch (*next_char) case '!'\n");
-
char buf[3];
i4 error = 0;
@@ -1194,15 +1113,9 @@
ret_val = NOT_EQUAL;
goto tokreturn;
}
- // end operator !=
- // strmi01 - case fully implemented
- // operator <, operator <=
- // token LESS_THAN, token LESS_THAN_EQUAL
case '<':
{
- //TRdisplay("scanner: enter switch (*next_char) case '<'\n");
-
CMnext(next_char);
if (next_char <= qry_end && !CMcmpcase(next_char, "="))
{
@@ -1218,15 +1131,9 @@
pss_cb->pss_nxtchar = next_char;
goto tokreturn;
}
- // end operator <, operator <=
- // strmi01 - case fully implemented
- // operator >, operator >=
- // token GREATER_THAN, token GREATER_THAN_EQUAL
case '>':
{
- //TRdisplay("scanner: enter switch (*next_char) case '>'\n");
-
CMnext(next_char);
if (next_char <= qry_end && *next_char == '=')
{
@@ -1242,24 +1149,17 @@
pss_cb->pss_nxtchar = next_char;
goto tokreturn;
}
- // end operator >, operator >=
} /* end of switch */
- //TRdisplay("scanner: leave switch (*next_char)\n");
-
if (CMspace(next_char))
{
- //TRdisplay("scanner: next_char is space character)\n");
-
CMnext(next_char);
continue;
}
if (CMnmstart(next_char) || *next_char == '_')
{
- //TRdisplay("scanner: next_char is leading character in name)\n");
-
register u_char *word = pss_cb->pss_symnext;
register i4 length;
register u_char *key, *mark;
@@ -1351,17 +1251,11 @@
}
/* Check to see if this is a keyword */
- //TRdisplay("scanner: Check to see if this is a keyword\n");
-
key = (u_char *)Key_index[length]; /* find starting position by length */
-
- //TRdisplay("scanner: Keyword - Lengt: %i Char: %c", length, *key);
/* While there are more keywords of the same length */
-
while (*key++)
{
- //TRdisplay("scanner: Keyword - Char: %c\n", *key);
for (keylen = 0;; keylen++)
if (key[keylen] != word[keylen])
if (keylen == length)
@@ -1377,14 +1271,10 @@
SECONDARY *second;
i4 compval;
- //TRdisplay("scanner: match\n");
-
/* If there could be a 2nd word, look for it */
if ((second = tret->secondary) !=
(SECONDARY *) NULL)
{
- //TRdisplay("scanner: there could be a 2nd word, look for it\n");
-
for (this_char = next_char;
(*this_char == '\t' || *this_char == '\r' ||
CMspace(this_char) || *this_char == '\n')
@@ -1463,8 +1353,6 @@
if (high >= low) /* TRUE means found 2nd word */
{
- //TRdisplay("scanner: found 2nd word\n");
-
multi_reswd = TRUE;
pss_cb->pss_nxtchar = this_char;
*this_char = savechar;
@@ -1472,29 +1360,6 @@
yacc_cb->yylval.psl_tytype = second[ii_try].val2;
ret_val = second[ii_try].token2;
- /*
- ** if we are storing away the text of a QUEL repeat
- ** query, lowercase the second part of a double
- ** keyword, and add it to the text chain
- */
- if (pss_cb->pss_stmt_flags & PSS_QUEL_RPTQRY_TEXT)
- {
- u_char buf[DB_MAXNAME], *bufp = buf,
- *src = word2;
-
- for (; src < this_char; CMnext(src), CMnext(bufp))
- {
- CMtolower(src, bufp);
- }
-
- if (psq_rptqry_text(pss_cb->pss_tchain, buf,
- bufp - buf, &piece, &psq_cb->psq_error)
- != E_DB_OK)
- {
- return (-1);
- }
- }
-
goto tokreturn;
}
@@ -1506,8 +1371,6 @@
** not, it's a name.
*/
- //TRdisplay("scanner: 2nd word not found\n");
-
*this_char = savechar;
if (tret->token)
goto rettok;
@@ -1587,10 +1450,16 @@
}
pss_cb->pss_lineno += lineno;
- _VOID_ psf_error(2708L, 0L, PSF_USERERR, &err_code,
- &psq_cb->psq_error, 2,
- (i4) sizeof(pss_cb->pss_lineno), &pss_cb->pss_lineno,
- (i4) sizeof(char), next_char);
+ _VOID_ psf_error(2708L,
+ 0L,
+ PSF_USERERR,
+ &err_code,
+ &psq_cb->psq_error,
+ 2,
+ (i4) sizeof(pss_cb->pss_lineno),
+ &pss_cb->pss_lineno,
+ (i4) sizeof(char),
+ next_char);
return (-1);
} /* end of while */
@@ -1602,21 +1471,5 @@
tokreturn:
-/*
- ** if we are storing away the text of a QUEL repeat query and if there was
- ** text to be stored (note that text of keywords and NAMEs has already been
- ** lowercased and stored, so non_white_char will be set to NULL), try to
- ** store it
- */
-if (non_white_char != (u_char *) NULL
- && pss_cb->pss_stmt_flags & PSS_QUEL_RPTQRY_TEXT
- && psq_rptqry_text(pss_cb->pss_tchain, non_white_char,
- pss_cb->pss_nxtchar - non_white_char, &piece,
- &psq_cb->psq_error) != E_DB_OK)
-{
- return (-1);
-}
-
-//TRdisplay("scanner: return token\n");
return (ret_val);
}
More information about the svn-commits
mailing list