4 files changed, 21 insertions, 21 deletions

diff --git a/src/backend/parser/gram.c b/src/backend/parser/gram.c
index 311f113f0a3..66dffb71a26 100644
--- a/src/backend/parser/gram.c
+++ b/src/backend/parser/gram.c
@@ -239,7 +239,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.61 1999/01/22 19:35:49 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.62 1999/01/24 00:28:23 momjian Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
diff --git a/src/backend/parser/parse_agg.c b/src/backend/parser/parse_agg.c
index 8aa94041322..2e810927dc5 100644
--- a/src/backend/parser/parse_agg.c
+++ b/src/backend/parser/parse_agg.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_agg.c,v 1.15 1998/12/08 06:18:56 thomas Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_agg.c,v 1.16 1999/01/24 00:28:29 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -37,7 +37,7 @@ static bool tleIsAggOrGroupCol(TargetEntry *tle, List *groupClause);
 
 /*
  * contain_agg_clause--
- *	  Recursively find aggreg nodes from a clause.
+ *	  Recursively find aggref nodes from a clause.
  *
  *	  Returns true if any aggregate found.
  */
@@ -46,7 +46,7 @@ contain_agg_clause(Node *clause)
 {
 	if (clause == NULL)
 		return FALSE;
-	else if (IsA(clause, Aggreg))
+	else if (IsA(clause, Aggref))
 		return TRUE;
 	else if (IsA(clause, Iter))
 		return contain_agg_clause(((Iter *) clause)->iterexpr);
@@ -105,7 +105,7 @@ exprIsAggOrGroupCol(Node *expr, List *groupClause)
 	List	   *gl;
 
 	if (expr == NULL || IsA(expr, Const) ||
-		IsA(expr, Param) || IsA(expr, Aggreg) || 
+		IsA(expr, Param) || IsA(expr, Aggref) || 
 		IsA(expr, SubLink))		/* can't handle currently !!! */
 		return TRUE;
 
@@ -155,7 +155,7 @@ tleIsAggOrGroupCol(TargetEntry *tle, List *groupClause)
 		}
 	}
 
-	if (IsA(expr, Aggreg))
+	if (IsA(expr, Aggref))
 		return TRUE;
 
 	if (IsA(expr, Expr))
@@ -217,7 +217,7 @@ parseCheckAggregates(ParseState *pstate, Query *qry)
 }
 
 
-Aggreg *
+Aggref *
 ParseAgg(ParseState *pstate, char *aggname, Oid basetype,
 		 List *target, int precedence)
 {
@@ -225,7 +225,7 @@ ParseAgg(ParseState *pstate, char *aggname, Oid basetype,
 	Oid			vartype;
 	Oid			xfn1;
 	Form_pg_aggregate aggform;
-	Aggreg	   *aggreg;
+	Aggref	   *aggref;
 	HeapTuple	theAggTuple;
 	bool		usenulls = false;
 
@@ -324,18 +324,18 @@ ParseAgg(ParseState *pstate, char *aggname, Oid basetype,
 		}
 	}
 
-	aggreg = makeNode(Aggreg);
-	aggreg->aggname = pstrdup(aggname);
-	aggreg->basetype = aggform->aggbasetype;
-	aggreg->aggtype = fintype;
+	aggref = makeNode(Aggref);
+	aggref->aggname = pstrdup(aggname);
+	aggref->basetype = aggform->aggbasetype;
+	aggref->aggtype = fintype;
 
-	aggreg->target = lfirst(target);
+	aggref->target = lfirst(target);
 	if (usenulls)
-		aggreg->usenulls = true;
+		aggref->usenulls = true;
 
 	pstate->p_hasAggs = true;
 
-	return aggreg;
+	return aggref;
 }
 
 /*
diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c
index acdf2d7d03d..894ab9b4984 100644
--- a/src/backend/parser/parse_expr.c
+++ b/src/backend/parser/parse_expr.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.38 1998/12/13 23:56:43 thomas Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.39 1999/01/24 00:28:29 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -586,8 +586,8 @@ exprType(Node *expr)
 		case T_ArrayRef:
 			type = ((ArrayRef *) expr)->refelemtype;
 			break;
-		case T_Aggreg:
-			type = ((Aggreg *) expr)->aggtype;
+		case T_Aggref:
+			type = ((Aggref *) expr)->aggtype;
 			break;
 		case T_Param:
 			type = ((Param *) expr)->paramtype;
diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c
index 35d0db803a2..c400ef89bc4 100644
--- a/src/backend/parser/parse_target.c
+++ b/src/backend/parser/parse_target.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.32 1998/12/13 23:56:44 thomas Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.33 1999/01/24 00:28:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -872,8 +872,8 @@ FigureColname(Node *expr, Node *resval)
 {
 	switch (nodeTag(expr))
 	{
-		case T_Aggreg:
-			return (char *) ((Aggreg *) expr)->aggname;
+		case T_Aggref:
+			return (char *) ((Aggref *) expr)->aggname;
 		case T_Expr:
 			if (((Expr *) expr)->opType == FUNC_EXPR)
 			{