database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-10 17:42:29 +03:00
Code Activity

Renaming cleanup, no pgindent yet.

Browse Source
This commit is contained in:
Bruce Momjian
1998-09-01 03:29:17 +00:00
parent 2aa080fc93
commit af74855a60
329 changed files with 4380 additions and 4388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/backend/parser/analyze.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.83 1998/08/26 05:22:40 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.84 1998/09/01 03:24:02 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -264,7 +264,7 @@ transformInsertStmt(ParseState *pstate, InsertStmt *stmt)
pstate->p_target_relation->rd_att->constr &&
pstate->p_target_relation->rd_att->constr->num_defval > 0)
{
AttributeTupleForm *att = pstate->p_target_relation->rd_att->attrs;
Form_pg_attribute *att = pstate->p_target_relation->rd_att->attrs;
AttrDefault *defval = pstate->p_target_relation->rd_att->constr->defval;
int ndef = pstate->p_target_relation->rd_att->constr->num_defval;
@@ -390,7 +390,7 @@ makeTableName(void *elem,...)
{
/* not enough room for next part? then return nothing */
if ((strlen(buf) + strlen(name)) >= (sizeof(buf) - 1))
return (NULL);
return NULL;
if (strlen(buf) > 0)
strcat(buf, "_");
@@ -404,7 +404,7 @@ makeTableName(void *elem,...)
name = palloc(strlen(buf) + 1);
strcpy(name, buf);
return (name);
return name;
}
static char *
@@ -445,7 +445,7 @@ CreateIndexName(char *table_name, char *column_name, char *label, List *indices)
sprintf(name2, "%s_%d", column_name, (pass + 1));
}
return (iname);
return iname;
}
/*

8
src/backend/parser/gram.c
View File

@@ -221,7 +221,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.31 1998/08/26 16:43:43 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.32 1998/09/01 03:24:04 momjian Exp $
*
* HISTORY
* AUTHOR DATE MAJOR EVENT
@@ -10153,7 +10153,7 @@ FlattenStringList(List *list)
elog(DEBUG, "flattened string is \"%s\"\n", s);
#endif
return (s);
return s;
} /* FlattenStringList() */
@@ -10204,7 +10204,7 @@ makeConstantList( A_Const *n)
elog(DEBUG, "AexprConst argument is \"%s\"\n", defval);
#endif
return (result);
return result;
} /* makeConstantList() */
@@ -10234,7 +10234,7 @@ fmtId(char *rawid)
((cp == rawid)? "do not ": ""), rawid, cp);
#endif
return (cp);
return cp;
}
/*

8
src/backend/parser/gram.y
View File

@@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.27 1998/08/26 05:22:49 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.28 1998/09/01 03:24:08 momjian Exp $
*
* HISTORY
* AUTHOR DATE MAJOR EVENT
@@ -4915,7 +4915,7 @@ FlattenStringList(List *list)
elog(DEBUG, "flattened string is \"%s\"\n", s);
#endif
return (s);
return s;
} /* FlattenStringList() */
@@ -4966,7 +4966,7 @@ makeConstantList( A_Const *n)
elog(DEBUG, "AexprConst argument is \"%s\"\n", defval);
#endif
return (result);
return result;
} /* makeConstantList() */
@@ -4996,7 +4996,7 @@ fmtId(char *rawid)
((cp == rawid)? "do not ": ""), rawid, cp);
#endif
return (cp);
return cp;
}
/*

6
src/backend/parser/keywords.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/keywords.c,v 1.42 1998/08/25 21:36:55 scrappy Exp $
* $Header: /cvsroot/pgsql/src/backend/parser/keywords.c,v 1.43 1998/09/01 03:24:10 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -242,12 +242,12 @@ ScanKeywordLookup(char *text)
middle = low + (high - low) / 2;
difference = strcmp(middle->name, text);
if (difference == 0)
return (middle);
return middle;
else if (difference < 0)
low = middle + 1;
else
high = middle - 1;
}
return (NULL);
return NULL;
}

22
src/backend/parser/parse_coerce.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.4 1998/08/14 16:06:52 thomas Exp $
* $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.5 1998/09/01 03:24:11 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -306,7 +306,7 @@ TypeCategory(Oid inType)
result = USER_TYPE;
break;
}
return (result);
return result;
} /* TypeCategory() */
@@ -316,7 +316,7 @@ TypeCategory(Oid inType)
bool
IsPreferredType(CATEGORY category, Oid type)
{
return (type == PreferredType(category, type));
return type == PreferredType(category, type);
} /* IsPreferredType() */
@@ -365,7 +365,7 @@ PreferredType(CATEGORY category, Oid type)
#ifdef PARSEDEBUG
printf("PreferredType- (%d) preferred type is %s\n", category, typeidTypeName(result));
#endif
return (result);
return result;
} /* PreferredType() */
@@ -417,7 +417,7 @@ PromoteTypeToNext(Oid inType)
result = inType;
break;
}
return (result);
return result;
} /* PromoteTypeToNext() */
@@ -437,7 +437,7 @@ DemoteType(Oid inType)
result = inType;
break;
}
return (result);
return result;
} /* DemoteType() */
@@ -451,7 +451,7 @@ PromoteLesserType(Oid inType1, Oid inType2, Oid *newType1, Oid *newType2)
result = PromoteTypeToNext(inType1);
inType1 = result;
*arg2 = result;
return (result);
return result;
}
kind1 = ClassifyType(inType1);
@@ -505,12 +505,12 @@ PromoteLesserType(Oid inType1, Oid inType2, Oid *newType1, Oid *newType2)
if ((promotedType = PromoteBuiltInType(*arg1)) != *arg1)
{
*arg1 = promotedType;
return (promotedType);
return promotedType;
}
else if (CanCoerceType(*arg1, *arg2))
{
*arg1 = *arg2;
return (*arg2);
return *arg2;
}
}
else if (!isBuiltIn1 && isBuiltIn2)
@@ -518,12 +518,12 @@ PromoteLesserType(Oid inType1, Oid inType2, Oid *newType1, Oid *newType2)
if ((promotedType = PromoteBuiltInType(*arg2)) != *arg2)
{
*arg2 = promotedType;
return (promotedType);
return promotedType;
}
else if (CanCoerceType(*arg2, *arg1))
{
*arg2 = *arg1;
return (*arg1);
return *arg1;
}
}

6
src/backend/parser/parse_expr.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.32 1998/07/12 21:29:18 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.33 1998/09/01 03:24:12 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -597,7 +597,7 @@ parser_typecast2(Node *expr, Oid exprType, Type tp, int32 atttypmod)
false, /* was omitted */
false, /* not a set */
true /* is cast */ );
return ((Node *) adt);
return (Node *) adt;
}
cp = stringTypeString(tp, const_string, atttypmod);
@@ -638,5 +638,5 @@ parser_typecast2(Node *expr, Oid exprType, Type tp, int32 atttypmod)
if (string_palloced)
pfree(const_string);
return ((Node *) adt);
return (Node *) adt;
}

36
src/backend/parser/parse_func.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.26 1998/08/25 21:25:42 scrappy Exp $
* $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.27 1998/09/01 03:24:13 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -128,7 +128,7 @@ ParseNestedFuncOrColumn(ParseState *pstate, Attr *attr, int *curr_resno, int pre
precedence);
}
return (retval);
return retval;
}
/*
@@ -483,7 +483,7 @@ ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs,
retval = (Node *) iter;
}
return (retval);
return retval;
}
static Oid
@@ -502,7 +502,7 @@ funcid_get_rettype(Oid funcid)
funcrettype = (Oid)
((Form_pg_proc) GETSTRUCT(func_tuple))->prorettype;
return (funcrettype);
return funcrettype;
}
@@ -672,7 +672,7 @@ func_select_candidate(int nargs,
}
if ((nmatch + nident) == nargs)
return (current_candidate->args);
return current_candidate->args;
#ifdef PARSEDEBUG
printf("func_select_candidate- candidate has %d matches\n", nmatch);
@@ -789,9 +789,9 @@ printf("func_select_candidate- column #%d input type is %s\n",
}
if (ncandidates == 1)
return (candidates->args);
return candidates->args;
return (NULL);
return NULL;
} /* func_select_candidate() */
@@ -920,11 +920,11 @@ func_get_detail(char *funcname,
*rettype = pform->prorettype;
*retset = pform->proretset;
return (true);
return true;
}
/* shouldn't reach here */
return (false);
return false;
} /* func_get_detail() */
/*
@@ -978,7 +978,7 @@ argtype_inherit(int nargs, Oid *oid_array)
}
/* return an ordered cross-product of the classes involved */
return (gen_cross_product(arginh, nargs));
return gen_cross_product(arginh, nargs);
}
static int
@@ -1010,7 +1010,7 @@ find_inheritors(Oid relid, Oid **supervec)
inhrel = heap_openr(InheritsRelationName);
RelationSetLockForRead(inhrel);
inhtupdesc = RelationGetTupleDescriptor(inhrel);
inhtupdesc = RelationGetDescr(inhrel);
/*
* Use queue to do a breadth-first traversal of the inheritance graph
@@ -1094,7 +1094,7 @@ find_inheritors(Oid relid, Oid **supervec)
else
*supervec = (Oid *) NULL;
return (nvisited);
return nvisited;
}
static Oid **
@@ -1130,7 +1130,7 @@ gen_cross_product(InhPaths *arginh, int nargs)
if (i < 0)
{
*iter = NULL;
return (result);
return result;
}
/* no, increment this column and zero the ones after it */
@@ -1237,7 +1237,7 @@ setup_tlist(char *attname, Oid relid)
varnode = makeVar(-1, attno, typeid, type_mod, 0, -1, attno);
tle = makeTargetEntry(resnode, (Node *) varnode);
return (lcons(tle, NIL));
return lcons(tle, NIL);
}
/*
@@ -1262,7 +1262,7 @@ setup_base_tlist(Oid typeid)
varnode = makeVar(-1, 1, typeid, -1, 0, -1, 1);
tle = makeTargetEntry(resnode, (Node *) varnode);
return (lcons(tle, NIL));
return lcons(tle, NIL);
}
/*
@@ -1315,7 +1315,7 @@ ParseComplexProjection(ParseState *pstate,
func->func_tlist =
setup_tlist(funcname, argrelid);
iter->itertype = attnumTypeId(rd, attnum);
return ((Node *) iter);
return (Node *) iter;
}
else
{
@@ -1382,7 +1382,7 @@ ParseComplexProjection(ParseState *pstate,
newexpr->oper = (Node *) funcnode;
newexpr->args = lcons(first_arg, NIL);
return ((Node *) newexpr);
return (Node *) newexpr;
}
}
@@ -1409,7 +1409,7 @@ ParseComplexProjection(ParseState *pstate,
{
param->paramtype = attnumTypeId(rd, attnum);
param->param_tlist = setup_tlist(funcname, relid);
return ((Node *) param);
return (Node *) param;
}
}
break;

28
src/backend/parser/parse_node.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parse_node.c,v 1.19 1998/08/19 02:02:23 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/parser/parse_node.c,v 1.20 1998/09/01 03:24:15 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -52,7 +52,7 @@ make_parsestate(ParseState *parentParseState)
pstate->p_last_resno = 1;
pstate->parentParseState = parentParseState;
return (pstate);
return pstate;
}
@@ -134,7 +134,7 @@ make_op(char *opname, Node *ltree, Node *rtree)
Oid ltypeId,
rtypeId;
Operator tup;
OperatorTupleForm opform;
Form_pg_operator opform;
Oper *newop;
Node *left,
*right;
@@ -145,7 +145,7 @@ make_op(char *opname, Node *ltree, Node *rtree)
{
ltypeId = (ltree == NULL) ? UNKNOWNOID : exprType(ltree);
tup = right_oper(opname, ltypeId);
opform = (OperatorTupleForm) GETSTRUCT(tup);
opform = (Form_pg_operator) GETSTRUCT(tup);
left = make_operand(opname, ltree, ltypeId, opform->oprleft);
right = NULL;
@@ -159,7 +159,7 @@ make_op(char *opname, Node *ltree, Node *rtree)
#ifdef PARSEDEBUG
printf("make_op: returned from left_oper() with structure at %p\n", (void *)tup);
#endif
opform = (OperatorTupleForm) GETSTRUCT(tup);
opform = (Form_pg_operator) GETSTRUCT(tup);
#ifdef PARSEDEBUG
printf("make_op: calling make_operand()\n");
#endif
@@ -187,7 +187,7 @@ printf("make_op: calling make_operand()\n");
/* Won't return from oper_inexact() without a candidate... */
}
opform = (OperatorTupleForm) GETSTRUCT(tup);
opform = (Form_pg_operator) GETSTRUCT(tup);
left = make_operand(opname, ltree, ltypeId, opform->oprleft);
right = make_operand(opname, rtree, rtypeId, opform->oprright);
}
@@ -258,7 +258,7 @@ make_array_ref(Node *expr,
{
Oid typearray;
HeapTuple type_tuple;
TypeTupleForm type_struct_array,
Form_pg_type type_struct_array,
type_struct_element;
ArrayRef *aref;
Oid reftype;
@@ -276,7 +276,7 @@ make_array_ref(Node *expr,
typearray);
/* get the array type struct from the type tuple */
type_struct_array = (TypeTupleForm) GETSTRUCT(type_tuple);
type_struct_array = (Form_pg_type) GETSTRUCT(type_tuple);
if (type_struct_array->typelem == InvalidOid)
elog(ERROR, "make_array_ref: type %s is not an array",
@@ -290,7 +290,7 @@ make_array_ref(Node *expr,
elog(ERROR, "make_array_ref: Cache lookup failed for type %d\n",
typearray);
type_struct_element = (TypeTupleForm) GETSTRUCT(type_tuple);
type_struct_element = (Form_pg_type) GETSTRUCT(type_tuple);
while (indirection != NIL)
{
@@ -342,8 +342,8 @@ make_array_set(Expr *target_expr,
{
Oid typearray;
HeapTuple type_tuple;
TypeTupleForm type_struct_array;
TypeTupleForm type_struct_element;
Form_pg_type type_struct_array;
Form_pg_type type_struct_element;
ArrayRef *aref;
Oid reftype;
@@ -358,7 +358,7 @@ make_array_set(Expr *target_expr,
typearray);
/* get the array type struct from the type tuple */
type_struct_array = (TypeTupleForm) GETSTRUCT(type_tuple);
type_struct_array = (Form_pg_type) GETSTRUCT(type_tuple);
if (type_struct_array->typelem == InvalidOid)
elog(ERROR, "make_array_ref: type %s is not an array",
@@ -372,7 +372,7 @@ make_array_set(Expr *target_expr,
elog(ERROR, "make_array_ref: Cache lookup failed for type %d\n",
typearray);
type_struct_element = (TypeTupleForm) GETSTRUCT(type_tuple);
type_struct_element = (Form_pg_type) GETSTRUCT(type_tuple);
aref = makeNode(ArrayRef);
aref->refattrlength = type_struct_array->typlen;
@@ -461,5 +461,5 @@ make_const(Value *value)
false, /* not a set */
false);
return (con);
return con;
}

44
src/backend/parser/parse_oper.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.15 1998/08/19 02:02:24 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.16 1998/09/01 03:24:16 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -65,7 +65,7 @@ any_ordering_op(int restype)
Oid
oprid(Operator op)
{
return (op->t_oid);
return op->t_oid;
}
@@ -85,7 +85,7 @@ binary_oper_get_candidates(char *opname,
Relation pg_operator_desc;
HeapScanDesc pg_operator_scan;
HeapTuple tup;
OperatorTupleForm oper;
Form_pg_operator oper;
int nkeys;
int ncandidates = 0;
ScanKeyData opKey[3];
@@ -116,7 +116,7 @@ binary_oper_get_candidates(char *opname,
current_candidate = (CandidateList) palloc(sizeof(struct _CandidateList));
current_candidate->args = (Oid *) palloc(2 * sizeof(Oid));
oper = (OperatorTupleForm) GETSTRUCT(tup);
oper = (Form_pg_operator) GETSTRUCT(tup);
current_candidate->args[0] = oper->oprleft;
current_candidate->args[1] = oper->oprright;
current_candidate->next = *candidates;
@@ -250,7 +250,7 @@ printf("oper_select_candidate- reject candidate as possible match\n");
if (!can_coerce_type(1, &input_typeids[0], &candidates->args[0])
|| !can_coerce_type(1, &input_typeids[1], &candidates->args[1]))
ncandidates = 0;
return ((ncandidates == 1)? candidates->args: NULL);
return (ncandidates == 1)? candidates->args: NULL;
}
/*
@@ -321,7 +321,7 @@ printf("oper_select_candidate- reject candidate as possible match\n");
printf("oper_select_candidate- unable to coerce preferred candidate\n");
#endif
}
return ((ncandidates == 1)? candidates->args: NULL);
return (ncandidates == 1)? candidates->args: NULL;
}
/*
@@ -354,7 +354,7 @@ printf("oper_select_candidate- unable to coerce preferred candidate\n");
nmatch++;
}
if (nmatch == nargs)
return (candidates->args);
return candidates->args;
}
}
@@ -436,7 +436,7 @@ printf("oper_select_candidate- column #%d input type is %s\n",
ncandidates++;
}
return ((ncandidates == 1)? candidates->args: NULL);
return (ncandidates == 1)? candidates->args: NULL;
} /* oper_select_candidate() */
@@ -472,12 +472,12 @@ oper_exact(char *op, Oid arg1, Oid arg2, Node **ltree, Node **rtree, bool noWarn
if (HeapTupleIsValid(tup))
{
OperatorTupleForm opform;
Form_pg_operator opform;
#if PARSEDEBUG
printf("oper_exact: found possible commutative operator candidate\n");
#endif
opform = (OperatorTupleForm) GETSTRUCT(tup);
opform = (Form_pg_operator) GETSTRUCT(tup);
if (opform->oprcom == tup->t_oid)
{
#if PARSEDEBUG
@@ -529,7 +529,7 @@ oper_inexact(char *op, Oid arg1, Oid arg2, Node **ltree, Node **rtree, bool noWa
{
if (!noWarnings)
op_error(op, arg1, arg2);
return (NULL);
return NULL;
}
/* Or found exactly one? Then proceed... */
@@ -577,10 +577,10 @@ printf("oper_inexact: found candidate\n");
"\n\tYou will have to retype this query using an explicit cast",
op, typeTypeName(typeidType(arg1)), typeTypeName(typeidType(arg2)));
}
return (NULL);
return NULL;
}
}
return ((Operator) tup);
return (Operator) tup;
} /* oper_inexact() */
@@ -608,7 +608,7 @@ oper(char *opname, Oid ltypeId, Oid rtypeId, bool noWarnings)
opname, typeTypeName(typeidType(ltypeId)), typeTypeName(typeidType(rtypeId)));
}
return ((Operator) tup);
return (Operator) tup;
} /* oper() */
@@ -627,7 +627,7 @@ unary_oper_get_candidates(char *op,
Relation pg_operator_desc;
HeapScanDesc pg_operator_scan;
HeapTuple tup;
OperatorTupleForm oper;
Form_pg_operator oper;
int ncandidates = 0;
static ScanKeyData opKey[2] = {
@@ -656,7 +656,7 @@ printf("unary_oper_get_candidates: start scan for '%s'\n", op);
current_candidate = (CandidateList) palloc(sizeof(struct _CandidateList));
current_candidate->args = (Oid *) palloc(sizeof(Oid));
oper = (OperatorTupleForm) GETSTRUCT(tup);
oper = (Form_pg_operator) GETSTRUCT(tup);
if (rightleft == 'r')
current_candidate->args[0] = oper->oprleft;
else
@@ -702,7 +702,7 @@ right_oper(char *op, Oid arg)
if (ncandidates == 0)
{
elog(ERROR, "Can't find right op '%s' for type %d", op, arg);
return (NULL);
return NULL;
}
else if (ncandidates == 1)
{
@@ -732,11 +732,11 @@ right_oper(char *op, Oid arg)
{
elog(ERROR, "Unable to convert right operator '%s' from type %s to %s",
op, typeidTypeName(arg), typeidTypeName(*targetOid));
return (NULL);
return NULL;
}
}
}
return ((Operator) tup);
return (Operator) tup;
} /* right_oper() */
@@ -762,7 +762,7 @@ left_oper(char *op, Oid arg)
if (ncandidates == 0)
{
elog(ERROR, "Can't find left op '%s' for type %d", op, arg);
return (NULL);
return NULL;
}
else if (ncandidates == 1)
{
@@ -790,7 +790,7 @@ printf("left_oper: searched cache for single left oper candidate '%s %s'\n",
{
elog(ERROR, "Unable to convert left operator '%s' from type %s to %s",
op, typeidTypeName(arg), typeidTypeName(*targetOid));
return (NULL);
return NULL;
}
#ifdef PARSEDEBUG
printf("left_oper: searched cache for best left oper candidate '%s %s'\n",
@@ -798,7 +798,7 @@ printf("left_oper: searched cache for best left oper candidate '%s %s'\n",
#endif
}
}
return ((Operator) tup);
return (Operator) tup;
} /* left_oper() */

18
src/backend/parser/parse_relation.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.14 1998/08/19 02:02:25 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.15 1998/09/01 03:24:17 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -291,7 +291,7 @@ expandAll(ParseState *pstate, char *relname, char *refname, int *this_resno)
heap_close(rel);
return (te_head);
return te_head;
}
/*
@@ -308,11 +308,11 @@ attnameAttNum(Relation rd, char *a)
for (i = 0; i < rd->rd_rel->relnatts; i++)
if (!namestrcmp(&(rd->rd_att->attrs[i]->attname), a))
return (i + 1);
return i + 1;
for (i = 0; i < SPECIALS; i++)
if (!strcmp(special_attr[i].field, a))
return (special_attr[i].code);
return special_attr[i].code;
/* on failure */
elog(ERROR, "Relation %s does not have attribute %s",
@@ -340,10 +340,10 @@ attnameIsSet(Relation rd, char *name)
{
if (!strcmp(special_attr[i].field, name))
{
return (false); /* no sys attr is a set */
return false; /* no sys attr is a set */
}
}
return (get_attisset(RelationGetRelid(rd), name));
return get_attisset(RelationGetRelid(rd), name);
}
/*
@@ -354,7 +354,7 @@ attnameIsSet(Relation rd, char *name)
int
attnumAttNelems(Relation rd, int attid)
{
return (rd->rd_att->attrs[attid - 1]->attnelems);
return rd->rd_att->attrs[attid - 1]->attnelems;
}
/* given attribute id, return type of that attribute */
@@ -368,13 +368,13 @@ attnumTypeId(Relation rd, int attid)
{
if (attid < 0)
return (typeTypeId(typenameType(attnum_type[-attid - 1])));
return typeTypeId(typenameType(attnum_type[-attid - 1]));
/*
* -1 because varattno (where attid comes from) returns one more than
* index
*/
return (rd->rd_att->attrs[attid - 1]->atttypid);
return rd->rd_att->attrs[attid - 1]->atttypid;
}
/* handleTargetColname()

8
src/backend/parser/parse_target.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.25 1998/08/26 03:17:32 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.26 1998/09/01 03:24:19 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -94,7 +94,7 @@ MakeTargetEntryIdent(ParseState *pstate,
/* this looks strange to me, returning an empty TargetEntry bjm 1998/08/24 */
if (target_colname == NULL || colname == NULL)
return (tent);
return tent;
if (refname != NULL)
rte = refnameRangeTableEntry(pstate, refname);
@@ -183,7 +183,7 @@ printf("MakeTargetEntryIdent- attrtype_target = %d; type_mod = %d\n", attrtype_t
tent->expr = expr;
}
return (tent);
return tent;
} /* MakeTargetEntryIdent() */
@@ -759,7 +759,7 @@ makeTargetNames(ParseState *pstate, List *cols)
{
int numcol;
int i;
AttributeTupleForm *attr = pstate->p_target_relation->rd_att->attrs;
Form_pg_attribute *attr = pstate->p_target_relation->rd_att->attrs;
numcol = pstate->p_target_relation->rd_rel->relnatts;
for (i = 0; i < numcol; i++)

80
src/backend/parser/parse_type.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.14 1998/08/19 02:02:27 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.15 1998/09/01 03:24:20 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -45,16 +45,16 @@ char *
typeidTypeName(Oid id)
{
HeapTuple tup;
TypeTupleForm typetuple;
Form_pg_type typetuple;
if (!(tup = SearchSysCacheTuple(TYPOID,
ObjectIdGetDatum(id),
0, 0, 0)))
{
elog(ERROR, "type id lookup of %u failed", id);
return (NULL);
return NULL;
}
typetuple = (TypeTupleForm) GETSTRUCT(tup);
typetuple = (Form_pg_type) GETSTRUCT(tup);
return (typetuple->typname).data;
}
@@ -69,9 +69,9 @@ typeidType(Oid id)
0, 0, 0)))
{
elog(ERROR, "type id lookup of %u failed", id);
return (NULL);
return NULL;
}
return ((Type) tup);
return (Type) tup;
}
/* return a Type structure, given type name */
@@ -87,7 +87,7 @@ typenameType(char *s)
PointerGetDatum(s),
0, 0, 0)))
elog(ERROR, "type name lookup of %s failed", s);
return ((Type) tup);
return (Type) tup;
}
/* given type, return the type OID */
@@ -96,36 +96,36 @@ typeTypeId(Type tp)
{
if (tp == NULL)
elog(ERROR, "typeTypeId() called with NULL type struct");
return (tp->t_oid);
return tp->t_oid;
}
/* given type (as type struct), return the length of type */
int16
typeLen(Type t)
{
TypeTupleForm typ;
Form_pg_type typ;
typ = (TypeTupleForm) GETSTRUCT(t);
return (typ->typlen);
typ = (Form_pg_type) GETSTRUCT(t);
return typ->typlen;
}
/* given type (as type struct), return the value of its 'byval' attribute.*/
bool
typeByVal(Type t)
{
TypeTupleForm typ;
Form_pg_type typ;
typ = (TypeTupleForm) GETSTRUCT(t);
return (typ->typbyval);
typ = (Form_pg_type) GETSTRUCT(t);
return typ->typbyval;
}
/* given type (as type struct), return the name of type */
char *
typeTypeName(Type t)
{
TypeTupleForm typ;
Form_pg_type typ;
typ = (TypeTupleForm) GETSTRUCT(t);
typ = (Form_pg_type) GETSTRUCT(t);
return (typ->typname).data;
}
@@ -133,10 +133,10 @@ typeTypeName(Type t)
char
typeTypeFlag(Type t)
{
TypeTupleForm typ;
Form_pg_type typ;
typ = (TypeTupleForm) GETSTRUCT(t);
return (typ->typtype);
typ = (Form_pg_type) GETSTRUCT(t);
return typ->typtype;
}
/* Given a type structure and a string, returns the internal form of
@@ -147,10 +147,10 @@ stringTypeString(Type tp, char *string, int32 atttypmod)
Oid op;
Oid typelem;
op = ((TypeTupleForm) GETSTRUCT(tp))->typinput;
typelem = ((TypeTupleForm) GETSTRUCT(tp))->typelem; /* XXX - used for
op = ((Form_pg_type) GETSTRUCT(tp))->typinput;
typelem = ((Form_pg_type) GETSTRUCT(tp))->typelem; /* XXX - used for
* array_in */
return ((char *) fmgr(op, string, typelem, atttypmod));
return (char *) fmgr(op, string, typelem, atttypmod);
}
/* Given a type id, returns the out-conversion function of the type */
@@ -158,7 +158,7 @@ Oid
typeidOutfunc(Oid type_id)
{
HeapTuple typeTuple;
TypeTupleForm type;
Form_pg_type type;
Oid outfunc;
typeTuple = SearchSysCacheTuple(TYPOID,
@@ -167,16 +167,16 @@ typeidOutfunc(Oid type_id)
if (!HeapTupleIsValid(typeTuple))
elog(ERROR, "typeidOutfunc: Invalid type - oid = %u", type_id);
type = (TypeTupleForm) GETSTRUCT(typeTuple);
type = (Form_pg_type) GETSTRUCT(typeTuple);
outfunc = type->typoutput;
return (outfunc);
return outfunc;
}
Oid
typeidTypeRelid(Oid type_id)
{
HeapTuple typeTuple;
TypeTupleForm type;
Form_pg_type type;
Oid infunc;
typeTuple = SearchSysCacheTuple(TYPOID,
@@ -185,34 +185,34 @@ typeidTypeRelid(Oid type_id)
if (!HeapTupleIsValid(typeTuple))
elog(ERROR, "typeidTypeRelid: Invalid type - oid = %u", type_id);
type = (TypeTupleForm) GETSTRUCT(typeTuple);
type = (Form_pg_type) GETSTRUCT(typeTuple);
infunc = type->typrelid;
return (infunc);
return infunc;
}
Oid
typeTypeRelid(Type typ)
{
TypeTupleForm typtup;
Form_pg_type typtup;
typtup = (TypeTupleForm) GETSTRUCT(typ);
typtup = (Form_pg_type) GETSTRUCT(typ);
return (typtup->typrelid);
return typtup->typrelid;
}
Oid
typeidTypElem(Oid type_id)
{
HeapTuple typeTuple;
TypeTupleForm type;
Form_pg_type type;
if (!(typeTuple = SearchSysCacheTuple(TYPOID,
ObjectIdGetDatum(type_id),
0, 0, 0)))
elog(ERROR, "type id lookup of %u failed", type_id);
type = (TypeTupleForm) GETSTRUCT(typeTuple);
type = (Form_pg_type) GETSTRUCT(typeTuple);
return (type->typelem);
return type->typelem;
}
/* Given the attribute type of an array return the arrtribute type of
@@ -222,7 +222,7 @@ Oid
GetArrayElementType(Oid typearray)
{
HeapTuple type_tuple;
TypeTupleForm type_struct_array;
Form_pg_type type_struct_array;
type_tuple = SearchSysCacheTuple(TYPOID,
ObjectIdGetDatum(typearray),
@@ -233,7 +233,7 @@ GetArrayElementType(Oid typearray)
typearray);
/* get the array type struct from the type tuple */
type_struct_array = (TypeTupleForm) GETSTRUCT(type_tuple);
type_struct_array = (Form_pg_type) GETSTRUCT(type_tuple);
if (type_struct_array->typelem == InvalidOid)
{
@@ -241,7 +241,7 @@ GetArrayElementType(Oid typearray)
type_struct_array->typname);
}
return (type_struct_array->typelem);
return type_struct_array->typelem;
}
/* Given a type id, returns the in-conversion function of the type */
@@ -249,7 +249,7 @@ Oid
typeidInfunc(Oid type_id)
{
HeapTuple typeTuple;
TypeTupleForm type;
Form_pg_type type;
Oid infunc;
typeTuple = SearchSysCacheTuple(TYPOID,
@@ -258,7 +258,7 @@ typeidInfunc(Oid type_id)
if (!HeapTupleIsValid(typeTuple))
elog(ERROR, "typeidInfunc: Invalid type - oid = %u", type_id);
type = (TypeTupleForm) GETSTRUCT(typeTuple);
type = (Form_pg_type) GETSTRUCT(typeTuple);
infunc = type->typinput;
return (infunc);
return infunc;
}

4
src/backend/parser/parser.c
View File

@@ -6,7 +6,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parser.c,v 1.34 1998/06/15 19:28:56 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/parser/parser.c,v 1.35 1998/09/01 03:24:21 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -59,7 +59,7 @@ parser(char *str, Oid *typev, int nargs)
clearerr(stdin);
if (yyresult) /* error */
return ((QueryTreeList *) NULL);
return (QueryTreeList *) NULL;
queryList = parse_analyze(parsetree, NULL);

45
src/backend/parser/scan.c
View File

@@ -1,7 +1,7 @@
/* A lexical scanner generated by flex */
/* Scanner skeleton version:
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.25 1998/08/30 23:25:56 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.26 1998/09/01 03:24:22 momjian Exp $
*/
#define FLEX_SCANNER
@@ -555,7 +555,7 @@ char *yytext;
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.25 1998/08/30 23:25:56 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.26 1998/09/01 03:24:22 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -974,7 +974,7 @@ YY_RULE_SETUP
yylval.ival = strtol((char *)literal,&endptr,2);
if (*endptr != '\0' || errno == ERANGE)
elog(ERROR,"Bad binary integer input '%s'",literal);
return (ICONST);
return ICONST;
}
YY_BREAK
case 9:
@@ -1017,7 +1017,7 @@ YY_RULE_SETUP
yylval.ival = strtol((char *)literal,&endptr,16);
if (*endptr != '\0' || errno == ERANGE)
elog(ERROR,"Bad hexadecimal integer input '%s'",literal);
return (ICONST);
return ICONST;
}
YY_BREAK
case 15:
@@ -1035,7 +1035,7 @@ YY_RULE_SETUP
{
BEGIN(INITIAL);
yylval.str = pstrdup(scanstr(literal));
return (SCONST);
return SCONST;
}
YY_BREAK
case 17:
@@ -1092,7 +1092,7 @@ YY_RULE_SETUP
{
BEGIN(INITIAL);
yylval.str = pstrdup(literal);
return (IDENT);
return IDENT;
}
YY_BREAK
case 24:
@@ -1115,7 +1115,7 @@ YY_RULE_SETUP
#line 287 "scan.l"
{
BEGIN(INITIAL);
return (yytext[0]);
return yytext[0];
}
YY_BREAK
case 27:
@@ -1131,13 +1131,14 @@ YY_RULE_SETUP
#line 295 "scan.l"
{
BEGIN(xm);
return (yytext[0]);
return yytext[0];
}
YY_BREAK
case 29:
YY_RULE_SETUP
#line 299 "scan.l"
{ return (yytext[0]); }
{ return yytext[0]; }
{ return yytext[0]; }
YY_BREAK
case 30:
*yy_cp = yy_hold_char; /* undo effects of setting up yytext */
@@ -1147,7 +1148,7 @@ YY_RULE_SETUP
#line 300 "scan.l"
{
yylval.str = pstrdup((char*)yytext);
return (Op);
return Op;
}
YY_BREAK
case 31:
@@ -1158,7 +1159,7 @@ YY_RULE_SETUP
yylval.str = pstrdup("<>"); /* compatability */
else
yylval.str = pstrdup((char*)yytext);
return (Op);
return Op;
}
YY_BREAK
case 32:
@@ -1166,7 +1167,7 @@ YY_RULE_SETUP
#line 311 "scan.l"
{
yylval.ival = atoi((char*)&yytext[1]);
return (PARAM);
return PARAM;
}
YY_BREAK
case 33:
@@ -1186,12 +1187,12 @@ YY_RULE_SETUP
keyword = ScanKeywordLookup((char*)yytext);
if (keyword != NULL) {
return (keyword->value);
return keyword->value;
}
else
{
yylval.str = pstrdup((char*)yytext);
return (IDENT);
return IDENT;
}
}
YY_BREAK
@@ -1212,9 +1213,9 @@ YY_RULE_SETUP
elog(ERROR,"Bad integer input '%s'",yytext);
CheckFloat8Val(yylval.dval);
elog(NOTICE,"Integer input '%s' is out of range; promoted to float", yytext);
return (FCONST);
return FCONST;
}
return (ICONST);
return ICONST;
}
YY_BREAK
case 35:
@@ -1229,7 +1230,7 @@ YY_RULE_SETUP
if (*endptr != '\0' || errno == ERANGE)
elog(ERROR,"Bad float8 input '%s'",yytext);
CheckFloat8Val(yylval.dval);
return (FCONST);
return FCONST;
}
YY_BREAK
case 36:
@@ -1248,9 +1249,9 @@ YY_RULE_SETUP
elog(ERROR,"Bad integer input '%s'",yytext);
CheckFloat8Val(yylval.dval);
elog(NOTICE,"Integer input '%s' is out of range; promoted to float", yytext);
return (FCONST);
return FCONST;
}
return (ICONST);
return ICONST;
}
YY_BREAK
case 37:
@@ -1264,7 +1265,7 @@ YY_RULE_SETUP
if (*endptr != '\0' || errno == ERANGE)
elog(ERROR,"Bad float input '%s'",yytext);
CheckFloat8Val(yylval.dval);
return (FCONST);
return FCONST;
}
YY_BREAK
case 38:
@@ -1283,12 +1284,12 @@ YY_RULE_SETUP
keyword = ScanKeywordLookup((char*)yytext);
if (keyword != NULL) {
return (keyword->value);
return keyword->value;
}
else
{
yylval.str = pstrdup((char*)yytext);
return (IDENT);
return IDENT;
}
}
YY_BREAK

45
src/backend/parser/scan.l
View File

@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.42 1998/08/29 05:27:17 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.43 1998/09/01 03:24:23 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -201,7 +201,7 @@ other .
yylval.ival = strtol((char *)literal,&endptr,2);
if (*endptr != '\0' || errno == ERANGE)
elog(ERROR,"Bad binary integer input '%s'",literal);
return (ICONST);
return ICONST;
}
<xh>{xhinside} |
<xb>{xbinside} {
@@ -227,7 +227,7 @@ other .
yylval.ival = strtol((char *)literal,&endptr,16);
if (*endptr != '\0' || errno == ERANGE)
elog(ERROR,"Bad hexadecimal integer input '%s'",literal);
return (ICONST);
return ICONST;
}
{xqstart} {
@@ -238,7 +238,7 @@ other .
<xq>{xqstop} {
BEGIN(INITIAL);
yylval.str = pstrdup(scanstr(literal));
return (SCONST);
return SCONST;
}
<xq>{xqdouble} |
<xq>{xqinside} {
@@ -273,7 +273,7 @@ other .
<xd>{xdstop} {
BEGIN(INITIAL);
yylval.str = pstrdup(literal);
return (IDENT);
return IDENT;
}
<xd>{xdinside} {
if ((llen+yyleng) > (MAX_PARSE_BUFFER - 1))
@@ -286,7 +286,7 @@ other .
<xm>{space}* { /* ignore */ }
<xm>{xmstop} {
BEGIN(INITIAL);
return (yytext[0]);
return yytext[0];
}
@@ -294,23 +294,24 @@ other .
{self}/{space}*-[\.0-9] {
BEGIN(xm);
return (yytext[0]);
return yytext[0];
}
{self} { return (yytext[0]); }
{self} { return yytext[0]; }
{self} { return yytext[0]; }
{operator}/-[\.0-9] {
yylval.str = pstrdup((char*)yytext);
return (Op);
return Op;
}
{operator} {
if (strcmp((char*)yytext,"!=") == 0)
yylval.str = pstrdup("<>"); /* compatability */
else
yylval.str = pstrdup((char*)yytext);
return (Op);
return Op;
}
{param} {
yylval.ival = atoi((char*)&yytext[1]);
return (PARAM);
return PARAM;
}
@@ -328,12 +329,12 @@ other .
keyword = ScanKeywordLookup((char*)yytext);
if (keyword != NULL) {
return (keyword->value);
return keyword->value;
}
else
{
yylval.str = pstrdup((char*)yytext);
return (IDENT);
return IDENT;
}
}
{integer}/{space}*-{number} {
@@ -350,9 +351,9 @@ other .
elog(ERROR,"Bad integer input '%s'",yytext);
CheckFloat8Val(yylval.dval);
elog(NOTICE,"Integer input '%s' is out of range; promoted to float", yytext);
return (FCONST);
return FCONST;
}
return (ICONST);
return ICONST;
}
{real}/{space}*-{number} {
char* endptr;
@@ -363,7 +364,7 @@ other .
if (*endptr != '\0' || errno == ERANGE)
elog(ERROR,"Bad float8 input '%s'",yytext);
CheckFloat8Val(yylval.dval);
return (FCONST);
return FCONST;
}
{integer} {
char* endptr;
@@ -378,9 +379,9 @@ other .
elog(ERROR,"Bad integer input '%s'",yytext);
CheckFloat8Val(yylval.dval);
elog(NOTICE,"Integer input '%s' is out of range; promoted to float", yytext);
return (FCONST);
return FCONST;
}
return (ICONST);
return ICONST;
}
{real} {
char* endptr;
@@ -390,7 +391,7 @@ other .
if (*endptr != '\0' || errno == ERANGE)
elog(ERROR,"Bad float input '%s'",yytext);
CheckFloat8Val(yylval.dval);
return (FCONST);
return FCONST;
}
@@ -407,17 +408,17 @@ other .
keyword = ScanKeywordLookup((char*)yytext);
if (keyword != NULL) {
return (keyword->value);
return keyword->value;
}
else
{
yylval.str = pstrdup((char*)yytext);
return (IDENT);
return IDENT;
}
}
{space} { /* ignore */ }
{other} { return (yytext[0]); }
{other} { return yytext[0]; }
%%