Remove some // comments, which are not ANSI C last I heard.
This commit is contained in:
parent
f770a61cfa
commit
1204c3e964
|
@ -8,7 +8,7 @@
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* IDENTIFICATION
|
||||||
* $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.52 2000/02/15 03:37:47 thomas Exp $
|
* $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.53 2000/02/15 07:47:37 tgl Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
|
@ -198,15 +198,11 @@ makeUniqueAttrList(List *attrs, List *filter)
|
||||||
{
|
{
|
||||||
List *fmember;
|
List *fmember;
|
||||||
bool match = FALSE;
|
bool match = FALSE;
|
||||||
// char *field;
|
|
||||||
Attr *cattr = lfirst(candidate);
|
Attr *cattr = lfirst(candidate);
|
||||||
|
|
||||||
Assert(IsA(cattr, Attr));
|
Assert(IsA(cattr, Attr));
|
||||||
Assert(length(cattr->attrs) == 1);
|
Assert(length(cattr->attrs) == 1);
|
||||||
|
|
||||||
// field = strVal(lfirst(ccol));
|
|
||||||
// bool match = FALSE;
|
|
||||||
|
|
||||||
foreach(fmember, filter)
|
foreach(fmember, filter)
|
||||||
{
|
{
|
||||||
Attr *fattr = lfirst(fmember);
|
Attr *fattr = lfirst(fmember);
|
||||||
|
@ -438,10 +434,6 @@ transformTableEntry(ParseState *pstate, RangeVar *r)
|
||||||
static void
|
static void
|
||||||
parseFromClause(ParseState *pstate, List *frmList)
|
parseFromClause(ParseState *pstate, List *frmList)
|
||||||
{
|
{
|
||||||
// List *shape, *alias;
|
|
||||||
// Node **qual;
|
|
||||||
// char *lname, *rname;
|
|
||||||
|
|
||||||
List *fl;
|
List *fl;
|
||||||
|
|
||||||
foreach(fl, frmList)
|
foreach(fl, frmList)
|
||||||
|
@ -470,9 +462,8 @@ parseFromClause(ParseState *pstate, List *frmList)
|
||||||
else if (IsA(n, JoinExpr))
|
else if (IsA(n, JoinExpr))
|
||||||
{
|
{
|
||||||
#ifndef DISABLE_JOIN_SYNTAX
|
#ifndef DISABLE_JOIN_SYNTAX
|
||||||
// char *lname, *rname;
|
|
||||||
RangeTblEntry *l_rte, *r_rte;
|
RangeTblEntry *l_rte, *r_rte;
|
||||||
Attr *l_name, *r_name;
|
Attr *l_name, *r_name = NULL;
|
||||||
JoinExpr *j = (JoinExpr *) n;
|
JoinExpr *j = (JoinExpr *) n;
|
||||||
|
|
||||||
if (j->alias != NULL)
|
if (j->alias != NULL)
|
||||||
|
@ -493,7 +484,6 @@ parseFromClause(ParseState *pstate, List *frmList)
|
||||||
|
|
||||||
if (IsA(j->rarg, JoinExpr))
|
if (IsA(j->rarg, JoinExpr))
|
||||||
{
|
{
|
||||||
// elog(ERROR, "Nested JOINs are not yet supported");
|
|
||||||
parseFromClause(pstate, lcons(j->rarg, NIL));
|
parseFromClause(pstate, lcons(j->rarg, NIL));
|
||||||
l_name = ((JoinExpr *)j->larg)->alias;
|
l_name = ((JoinExpr *)j->larg)->alias;
|
||||||
}
|
}
|
||||||
|
@ -525,7 +515,6 @@ parseFromClause(ParseState *pstate, List *frmList)
|
||||||
Value *r_col = lfirst(rx);
|
Value *r_col = lfirst(rx);
|
||||||
Assert(IsA(r_col, String));
|
Assert(IsA(r_col, String));
|
||||||
|
|
||||||
// if (equal(l_col, r_col))
|
|
||||||
if (strcmp(strVal(l_col), strVal(r_col)) == 0)
|
if (strcmp(strVal(l_col), strVal(r_col)) == 0)
|
||||||
{
|
{
|
||||||
id = (Ident *) makeNode(Ident);
|
id = (Ident *) makeNode(Ident);
|
||||||
|
@ -564,7 +553,6 @@ parseFromClause(ParseState *pstate, List *frmList)
|
||||||
* List of Ident nodes means column names from a real USING
|
* List of Ident nodes means column names from a real USING
|
||||||
* clause. Determine the shape of the joined table.
|
* clause. Determine the shape of the joined table.
|
||||||
*/
|
*/
|
||||||
// List *ltable, *rtable;
|
|
||||||
List *ucols, *ucol;
|
List *ucols, *ucol;
|
||||||
List *shape = NULL;
|
List *shape = NULL;
|
||||||
List *alias = NULL;
|
List *alias = NULL;
|
||||||
|
|
Loading…
Reference in New Issue