pgindent run before 6.3 release, with Thomas' requested changes.

11 files changed, 65 insertions, 59 deletions

diff --git a/src/include/parser/gramparse.h b/src/include/parser/gramparse.h
index db400cb416..bb650d3f27 100644
--- a/src/include/parser/gramparse.h
+++ b/src/include/parser/gramparse.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: gramparse.h,v 1.6 1997/11/26 03:43:05 momjian Exp $
+ * $Id: gramparse.h,v 1.7 1998/02/26 04:42:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,7 +18,7 @@
 extern void init_io(void);
 
 /* from gram.y */
-extern Oid param_type(int t);
+extern Oid	param_type(int t);
 extern void parser_init(Oid *typev, int nargs);
 extern int	yyparse(void);
 
diff --git a/src/include/parser/parse_agg.h b/src/include/parser/parse_agg.h
index 1381f14f8c..5f6987253b 100644
--- a/src/include/parser/parse_agg.h
+++ b/src/include/parser/parse_agg.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_agg.h,v 1.5 1998/01/20 05:04:41 momjian Exp $
+ * $Id: parse_agg.h,v 1.6 1998/02/26 04:42:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,9 +20,9 @@
 
 extern void AddAggToParseState(ParseState *pstate, Aggreg *aggreg);
 extern void parseCheckAggregates(ParseState *pstate, Query *qry);
-extern Aggreg *ParseAgg(ParseState *pstate, char *aggname, Oid basetype,
-			List *target, int precedence);
+extern Aggreg *
+ParseAgg(ParseState *pstate, char *aggname, Oid basetype,
+		 List *target, int precedence);
 extern void agg_error(char *caller, char *aggname, Oid basetypeID);
 
 #endif							/* PARSE_AGG_H */
-
diff --git a/src/include/parser/parse_clause.h b/src/include/parser/parse_clause.h
index 4c04a41cb3..0a232fecd0 100644
--- a/src/include/parser/parse_clause.h
+++ b/src/include/parser/parse_clause.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_clause.h,v 1.5 1997/12/29 04:31:50 momjian Exp $
+ * $Id: parse_clause.h,v 1.6 1998/02/26 04:42:40 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,12 +21,13 @@
 
 extern void makeRangeTable(ParseState *pstate, char *relname, List *frmList);
 extern Node *transformWhereClause(ParseState *pstate, Node *a_expr);
-extern List *transformGroupClause(ParseState *pstate, List *grouplist,
-			List *targetlist);
-extern List *transformSortClause(ParseState *pstate,
+extern List *
+transformGroupClause(ParseState *pstate, List *grouplist,
+					 List *targetlist);
+extern List *
+transformSortClause(ParseState *pstate,
 					List *orderlist, List *sortClause,
 					List *targetlist, char *uniqueFlag);
 extern List *transformUnionClause(List *unionClause, List *targetlist);
 
 #endif							/* PARSE_CLAUSE_H */
-
diff --git a/src/include/parser/parse_expr.h b/src/include/parser/parse_expr.h
index e533741ec2..1a990e4518 100644
--- a/src/include/parser/parse_expr.h
+++ b/src/include/parser/parse_expr.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_expr.h,v 1.7 1998/02/10 16:04:30 momjian Exp $
+ * $Id: parse_expr.h,v 1.8 1998/02/26 04:42:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,8 +20,7 @@
 
 extern Node *transformExpr(ParseState *pstate, Node *expr, int precedence);
 extern Node *transformIdent(ParseState *pstate, Node *expr, int precedence);
-extern Oid exprType(Node *expr);
+extern Oid	exprType(Node *expr);
 extern Node *parser_typecast2(Node *expr, Oid exprType, Type tp, int16 attypmod);
 
 #endif							/* PARSE_EXPR_H */
-
diff --git a/src/include/parser/parse_func.h b/src/include/parser/parse_func.h
index 4b03e0ced5..8b59613363 100644
--- a/src/include/parser/parse_func.h
+++ b/src/include/parser/parse_func.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_func.h,v 1.7 1998/02/05 04:08:44 scrappy Exp $
+ * $Id: parse_func.h,v 1.8 1998/02/26 04:42:45 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -42,12 +42,13 @@ typedef struct _CandidateList
 	struct _CandidateList *next;
 }		   *CandidateList;
 
-extern Node *ParseNestedFuncOrColumn(ParseState *pstate, Attr *attr,
-		int *curr_resno, int precedence);
-extern Node *ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs,
-	int *curr_resno, int precedence);
+extern Node *
+ParseNestedFuncOrColumn(ParseState *pstate, Attr *attr,
+						int *curr_resno, int precedence);
+extern Node *
+ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs,
+				  int *curr_resno, int precedence);
 
 extern void func_error(char *caller, char *funcname, int nargs, Oid *argtypes);
 
 #endif							/* PARSE_FUNC_H */
-
diff --git a/src/include/parser/parse_node.h b/src/include/parser/parse_node.h
index 5300db1e86..e77b3789b0 100644
--- a/src/include/parser/parse_node.h
+++ b/src/include/parser/parse_node.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_node.h,v 1.9 1998/02/10 04:02:47 momjian Exp $
+ * $Id: parse_node.h,v 1.10 1998/02/26 04:42:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -44,14 +44,17 @@ typedef struct ParseState
 
 extern ParseState *make_parsestate(ParseState *parentParseState);
 extern Expr *make_op(char *opname, Node *ltree, Node *rtree);
-extern Var *make_var(ParseState *pstate, Oid relid, char *refname,
-										char *attrname);
-extern ArrayRef   *make_array_ref(Node *expr,
+extern Var *
+make_var(ParseState *pstate, Oid relid, char *refname,
+		 char *attrname);
+extern ArrayRef *
+make_array_ref(Node *expr,
 			   List *indirection);
-extern ArrayRef   *make_array_set(Expr *target_expr,
-						   List *upperIndexpr,
-						   List *lowerIndexpr,
-						   Expr *expr);
+extern ArrayRef *
+make_array_set(Expr *target_expr,
+			   List *upperIndexpr,
+			   List *lowerIndexpr,
+			   Expr *expr);
 extern Const *make_const(Value *value);
-			   
+
 #endif							/* PARSE_NODE_H */
diff --git a/src/include/parser/parse_oper.h b/src/include/parser/parse_oper.h
index 972f0991df..01f21adc1e 100644
--- a/src/include/parser/parse_oper.h
+++ b/src/include/parser/parse_oper.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_oper.h,v 1.3 1997/11/26 03:43:14 momjian Exp $
+ * $Id: parse_oper.h,v 1.4 1998/02/26 04:42:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,8 +18,8 @@
 
 typedef HeapTuple Operator;
 
-extern Oid any_ordering_op(int restype);
-extern Oid oprid(Operator op);
+extern Oid	any_ordering_op(int restype);
+extern Oid	oprid(Operator op);
 extern Operator oper(char *op, Oid arg1, Oid arg2, bool noWarnings);
 extern Operator right_oper(char *op, Oid arg);
 extern Operator left_oper(char *op, Oid arg);
diff --git a/src/include/parser/parse_relation.h b/src/include/parser/parse_relation.h
index 506fdad46b..5fc882e75d 100644
--- a/src/include/parser/parse_relation.h
+++ b/src/include/parser/parse_relation.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_relation.h,v 1.6 1998/01/20 22:12:17 momjian Exp $
+ * $Id: parse_relation.h,v 1.7 1998/02/26 04:42:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,21 +21,25 @@
 #include <utils/rel.h>
 
 extern RangeTblEntry *refnameRangeTableEntry(ParseState *pstate, char *refname);
-extern int refnameRangeTablePosn(ParseState *pstate,
-										char *refname, int *sublevels_up);
+extern int
+refnameRangeTablePosn(ParseState *pstate,
+					  char *refname, int *sublevels_up);
 extern RangeTblEntry *colnameRangeTableEntry(ParseState *pstate, char *colname);
-extern RangeTblEntry *addRangeTableEntry(ParseState *pstate,
-								   char *relname,
-								   char *refname,
-								   bool inh,
-								   bool inFromCl);
-extern List *expandAll(ParseState *pstate, char *relname, char *refname,
-						int *this_resno);
-extern int attnameAttNum(Relation rd, char *a);
+extern RangeTblEntry *
+addRangeTableEntry(ParseState *pstate,
+				   char *relname,
+				   char *refname,
+				   bool inh,
+				   bool inFromCl);
+extern List *
+expandAll(ParseState *pstate, char *relname, char *refname,
+		  int *this_resno);
+extern int	attnameAttNum(Relation rd, char *a);
 extern bool attnameIsSet(Relation rd, char *name);
-extern int attnumAttNelems(Relation rd, int attid);
-extern Oid attnumTypeId(Relation rd, int attid);
-extern void handleTargetColname(ParseState *pstate, char **resname,
+extern int	attnumAttNelems(Relation rd, int attid);
+extern Oid	attnumTypeId(Relation rd, int attid);
+extern void
+handleTargetColname(ParseState *pstate, char **resname,
 					char *refname, char *colname);
 
 #endif							/* PARSE_RANGE_H */
diff --git a/src/include/parser/parse_target.h b/src/include/parser/parse_target.h
index 31b2c1594d..98dd31f68c 100644
--- a/src/include/parser/parse_target.h
+++ b/src/include/parser/parse_target.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_target.h,v 1.3 1997/11/26 03:43:18 momjian Exp $
+ * $Id: parse_target.h,v 1.4 1998/02/26 04:42:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,10 +20,9 @@
 #include <parser/parse_node.h>
 
 #define EXPR_COLUMN_FIRST	1
-#define EXPR_RELATION_FIRST	2
+#define EXPR_RELATION_FIRST 2
 
 extern List *transformTargetList(ParseState *pstate, List *targetlist);
 extern List *makeTargetNames(ParseState *pstate, List *cols);
 
 #endif							/* PARSE_TARGET_H */
-
diff --git a/src/include/parser/parse_type.h b/src/include/parser/parse_type.h
index da92efe984..12b489839a 100644
--- a/src/include/parser/parse_type.h
+++ b/src/include/parser/parse_type.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_type.h,v 1.5 1998/02/13 19:46:18 momjian Exp $
+ * $Id: parse_type.h,v 1.6 1998/02/26 04:42:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,17 +21,17 @@ extern bool typeidIsValid(Oid id);
 extern Type typeidType(Oid id);
 extern Type typenameType(char *s);
 extern char *typeidTypeName(Oid id);
-extern Oid typeTypeId(Type tp);
+extern Oid	typeTypeId(Type tp);
 extern int16 typeLen(Type t);
 extern bool typeByVal(Type t);
 extern char *typeTypeName(Type t);
 extern char typeTypeFlag(Type t);
 extern char *stringTypeString(Type tp, char *string, int16 atttypmod);
-extern Oid typeidOutfunc(Oid type_id);
-extern Oid typeidTypeRelid(Oid type_id);
-extern Oid typeTypeRelid(Type typ);
-extern Oid typeidTypElem(Oid type_id);
-extern Oid GetArrayElementType(Oid typearray);
-extern Oid typeidInfunc(Oid type_id);
+extern Oid	typeidOutfunc(Oid type_id);
+extern Oid	typeidTypeRelid(Oid type_id);
+extern Oid	typeTypeRelid(Type typ);
+extern Oid	typeidTypElem(Oid type_id);
+extern Oid	GetArrayElementType(Oid typearray);
+extern Oid	typeidInfunc(Oid type_id);
 
 #endif							/* PARSE_TYPE_H */
diff --git a/src/include/parser/parser.h b/src/include/parser/parser.h
index 820d7f960a..17867623e0 100644
--- a/src/include/parser/parser.h
+++ b/src/include/parser/parser.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parser.h,v 1.2 1997/11/26 01:14:17 momjian Exp $
+ * $Id: parser.h,v 1.3 1998/02/26 04:42:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,4 +18,3 @@
 extern QueryTreeList *parser(char *str, Oid *typev, int nargs);
 
 #endif							/* PARSER_H */
-