Final cleanup.

13 files changed, 42 insertions, 43 deletions

diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index 68b38f1712..c2b3889a0d 100644
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: analyze.c,v 1.113 1999/07/15 22:39:33 momjian Exp $
+ *	$Id: analyze.c,v 1.114 1999/07/16 04:59:28 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,16 +16,16 @@
 #include <string.h>
 
 #include "postgres.h"
+
 #include "access/heapam.h"
+#include "catalog/pg_type.h"
 #include "nodes/makefuncs.h"
+#include "parse.h"
 #include "parser/analyze.h"
 #include "parser/parse_agg.h"
 #include "parser/parse_clause.h"
 #include "parser/parse_relation.h"
 #include "parser/parse_target.h"
-#include "catalog/pg_type.h"
-#include "parse.h"
-
 #include "utils/builtins.h"
 
 static Query *transformStmt(ParseState *pstate, Node *stmt);
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index b649f9e781..5e048a737f 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.90 1999/07/15 15:19:30 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.91 1999/07/16 04:59:29 momjian Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -37,18 +37,18 @@
 
 #include "postgres.h"
 #include "access/htup.h"
+#include "access/xact.h"
+#include "catalog/catname.h"
+#include "catalog/pg_type.h"
 #include "nodes/parsenodes.h"
 #include "nodes/print.h"
+#include "parser/analyze.h"
 #include "parser/gramparse.h"
 #include "parser/parse_type.h"
-#include "utils/acl.h"
-#include "catalog/catname.h"
-#include "access/xact.h"
+#include "storage/bufpage.h"
 #include "storage/lmgr.h"
+#include "utils/acl.h"
 #include "utils/numeric.h"
-#include "parser/analyze.h"
-#include "catalog/pg_type.h"
-#include "storage/bufpage.h"
 
 #ifdef MULTIBYTE
 #include "mb/pg_wchar.h"
diff --git a/src/backend/parser/parse_agg.c b/src/backend/parser/parse_agg.c
index e5b5ece549..7470476aaa 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.24 1999/07/15 22:39:33 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_agg.c,v 1.25 1999/07/16 04:59:31 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,10 +19,10 @@
 #include "catalog/pg_aggregate.h"
 #include "optimizer/clauses.h"
 #include "parser/parse_agg.h"
-#include "parser/parse_expr.h"
 #include "parser/parse_coerce.h"
-#include "utils/syscache.h"
+#include "parser/parse_expr.h"
 #include "utils/lsyscache.h"
+#include "utils/syscache.h"
 
 static bool contain_agg_clause(Node *clause);
 static bool contain_agg_clause_walker(Node *node, void *context);
diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c
index 7f0e1509bf..4fb6369951 100644
--- a/src/backend/parser/parse_clause.c
+++ b/src/backend/parser/parse_clause.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.39 1999/07/15 22:39:34 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.40 1999/07/16 04:59:31 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,14 +17,14 @@
 
 #include "postgres.h"
 #include "access/heapam.h"
+#include "nodes/relation.h"
+#include "parse.h"
 #include "parser/parse_clause.h"
+#include "parser/parse_coerce.h"
 #include "parser/parse_expr.h"
 #include "parser/parse_oper.h"
 #include "parser/parse_relation.h"
 #include "parser/parse_target.h"
-#include "parser/parse_coerce.h"
-#include "nodes/relation.h"
-#include "parse.h"
 
 
 #define ORDER_CLAUSE 0
diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c
index 610dfa232d..c8208da3fc 100644
--- a/src/backend/parser/parse_coerce.c
+++ b/src/backend/parser/parse_coerce.c
@@ -7,19 +7,19 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.19 1999/07/15 22:39:34 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.20 1999/07/16 04:59:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <string.h>
 #include "postgres.h"
-#include "utils/builtins.h"
 
-#include "parser/parse_expr.h"
 
+#include "parser/parse_coerce.h"
+#include "parser/parse_expr.h"
 #include "parser/parse_func.h"
 #include "parser/parse_target.h"
-#include "parser/parse_coerce.h"
+#include "utils/builtins.h"
 #include "utils/syscache.h"
 
 Oid			DemoteType(Oid inType);
diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c
index bccad445b5..b3ec1f7935 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.51 1999/07/15 22:39:34 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.52 1999/07/16 04:59:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,11 +22,11 @@
 #include "parse.h"
 #include "parser/analyze.h"
 #include "parser/gramparse.h"
+#include "parser/parse_coerce.h"
 #include "parser/parse_expr.h"
 #include "parser/parse_func.h"
 #include "parser/parse_relation.h"
 #include "parser/parse_target.h"
-#include "parser/parse_coerce.h"
 #include "utils/builtins.h"
 
 static Node *parser_typecast(Value *expr, TypeName *typename, int32 atttypmod);
diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c
index 083e1c070b..1116304500 100644
--- a/src/backend/parser/parse_func.c
+++ b/src/backend/parser/parse_func.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.48 1999/07/15 22:39:35 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.49 1999/07/16 04:59:33 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,19 +19,19 @@
 #include "access/heapam.h"
 #include "catalog/catname.h"
 #include "catalog/indexing.h"
+#include "catalog/pg_aggregate.h"
 #include "catalog/pg_inherits.h"
 #include "catalog/pg_proc.h"
-#include "catalog/pg_aggregate.h"
 #include "lib/dllist.h"
 #include "miscadmin.h"
 #include "nodes/makefuncs.h"
 #include "nodes/relation.h"
 #include "parser/parse_agg.h"
+#include "parser/parse_coerce.h"
 #include "parser/parse_expr.h"
 #include "parser/parse_func.h"
 #include "parser/parse_relation.h"
 #include "parser/parse_target.h"
-#include "parser/parse_coerce.h"
 #include "utils/acl.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
diff --git a/src/backend/parser/parse_node.c b/src/backend/parser/parse_node.c
index 0e56276a0c..25c34a4e8a 100644
--- a/src/backend/parser/parse_node.c
+++ b/src/backend/parser/parse_node.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_node.c,v 1.26 1999/05/22 04:12:27 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_node.c,v 1.27 1999/07/16 04:59:34 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,15 +20,15 @@
 #include "catalog/pg_type.h"
 #include "fmgr.h"
 #include "nodes/makefuncs.h"
+#include "parser/parse_coerce.h"
 #include "parser/parse_expr.h"
 #include "parser/parse_node.h"
 #include "parser/parse_oper.h"
 #include "parser/parse_relation.h"
 #include "parser/parse_type.h"
-#include "parser/parse_coerce.h"
 #include "utils/builtins.h"
-#include "utils/syscache.h"
 #include "utils/lsyscache.h"
+#include "utils/syscache.h"
 
 static void disallow_setop(char *op, Type optype, Node *operand);
 static Node *make_operand(char *opname,
diff --git a/src/backend/parser/parse_oper.c b/src/backend/parser/parse_oper.c
index 672ff26974..cfb822f40e 100644
--- a/src/backend/parser/parse_oper.c
+++ b/src/backend/parser/parse_oper.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.27 1999/07/15 22:39:35 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.28 1999/07/16 04:59:34 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,11 +18,11 @@
 #include "access/heapam.h"
 #include "catalog/catname.h"
 #include "catalog/pg_operator.h"
+#include "parser/parse_coerce.h"
+#include "parser/parse_func.h"
 #include "parser/parse_oper.h"
 #include "parser/parse_type.h"
-#include "parser/parse_coerce.h"
 #include "utils/syscache.h"
-#include "parser/parse_func.h"
 
 static Oid *oper_select_candidate(int nargs, Oid *input_typeids,
 					  CandidateList candidates);
diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c
index 323334dddc..219d4ff35e 100644
--- a/src/backend/parser/parse_relation.c
+++ b/src/backend/parser/parse_relation.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.23 1999/07/15 15:19:32 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.24 1999/07/16 04:59:34 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,12 +19,12 @@
 #include "access/htup.h"
 #include "catalog/pg_type.h"
 #include "nodes/makefuncs.h"
-#include "parser/parse_relation.h"
 #include "parser/parse_coerce.h"
+#include "parser/parse_relation.h"
+#include "parser/parse_type.h"
 #include "utils/acl.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
-#include "parser/parse_type.h"
 
 static void checkTargetTypes(ParseState *pstate, char *target_colname,
 				 char *refname, char *colname);
diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c
index 7c8e824858..4ebb28a05b 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.43 1999/07/15 22:39:35 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.44 1999/07/16 04:59:34 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,11 +17,11 @@
 
 #include "postgres.h"
 #include "nodes/makefuncs.h"
+#include "parser/parse_coerce.h"
 #include "parser/parse_expr.h"
 #include "parser/parse_func.h"
 #include "parser/parse_relation.h"
 #include "parser/parse_target.h"
-#include "parser/parse_coerce.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
 #include "utils/syscache.h"
diff --git a/src/backend/parser/parser.c b/src/backend/parser/parser.c
index bce28bd5af..50e633a750 100644
--- a/src/backend/parser/parser.c
+++ b/src/backend/parser/parser.c
@@ -6,7 +6,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parser.c,v 1.40 1999/07/15 22:39:36 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parser.c,v 1.41 1999/07/16 04:59:35 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,7 +20,6 @@
 
 #if defined(FLEX_SCANNER)
 extern void DeleteBuffer(void);
-
 #endif	 /* FLEX_SCANNER */
 
 char	   *parseString;		/* the char* which holds the string to be
diff --git a/src/backend/parser/scan.l b/src/backend/parser/scan.l
index 6389f0bfe4..881c7132c7 100644
--- a/src/backend/parser/scan.l
+++ b/src/backend/parser/scan.l
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.50 1999/07/08 00:00:43 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.51 1999/07/16 04:59:35 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,12 +24,12 @@
 
 #include "postgres.h"
 #include "miscadmin.h"
-#include "nodes/pg_list.h"
 #include "nodes/parsenodes.h"
+#include "nodes/pg_list.h"
+#include "parse.h"
 #include "parser/gramparse.h"
 #include "parser/keywords.h"
 #include "parser/scansup.h"
-#include "parse.h"
 #include "utils/builtins.h"
 
 #ifdef  YY_READ_BUF_SIZE