Move exprType(), exprTypmod(), expression_tree_walker(), and related routines

into nodes/nodeFuncs, so as to reduce wanton cross-subsystem #includes inside
the backend.  There's probably more that should be done along this line,
but this is a start anyway.

3 files changed, 37 insertions, 42 deletions

diff --git a/src/include/nodes/nodeFuncs.h b/src/include/nodes/nodeFuncs.h
index 375301a0dc..f699fc1b68 100644
--- a/src/include/nodes/nodeFuncs.h
+++ b/src/include/nodes/nodeFuncs.h
@@ -1,23 +1,50 @@
 /*-------------------------------------------------------------------------
  *
  * nodeFuncs.h
- *
- *
+ *		Various general-purpose manipulations of Node trees
  *
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/nodes/nodeFuncs.h,v 1.26 2008/01/01 19:45:58 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/nodes/nodeFuncs.h,v 1.27 2008/08/25 22:42:34 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef NODEFUNCS_H
 #define NODEFUNCS_H
 
-#include "nodes/primnodes.h"
+#include "nodes/parsenodes.h"
+
+
+/* flags bits for query_tree_walker and query_tree_mutator */
+#define QTW_IGNORE_RT_SUBQUERIES	0x01		/* subqueries in rtable */
+#define QTW_IGNORE_JOINALIASES		0x02		/* JOIN alias var lists */
+#define QTW_DONT_COPY_QUERY			0x04		/* do not copy top Query */
+
+
+extern Oid	exprType(Node *expr);
+extern int32 exprTypmod(Node *expr);
+extern bool exprIsLengthCoercion(Node *expr, int32 *coercedTypmod);
+extern bool expression_returns_set(Node *clause);
+
+extern bool expression_tree_walker(Node *node, bool (*walker) (),
+											   void *context);
+extern Node *expression_tree_mutator(Node *node, Node *(*mutator) (),
+												 void *context);
+
+extern bool query_tree_walker(Query *query, bool (*walker) (),
+										  void *context, int flags);
+extern Query *query_tree_mutator(Query *query, Node *(*mutator) (),
+											 void *context, int flags);
+
+extern bool range_table_walker(List *rtable, bool (*walker) (),
+										   void *context, int flags);
+extern List *range_table_mutator(List *rtable, Node *(*mutator) (),
+											 void *context, int flags);
 
-extern bool single_node(Node *node);
-extern bool var_is_outer(Var *var);
-extern bool var_is_rel(Var *var);
+extern bool query_or_expression_tree_walker(Node *node, bool (*walker) (),
+												   void *context, int flags);
+extern Node *query_or_expression_tree_mutator(Node *node, Node *(*mutator) (),
+												   void *context, int flags);
 
 #endif   /* NODEFUNCS_H */
diff --git a/src/include/optimizer/clauses.h b/src/include/optimizer/clauses.h
index 1ea3d701fe..105924bb22 100644
--- a/src/include/optimizer/clauses.h
+++ b/src/include/optimizer/clauses.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/optimizer/clauses.h,v 1.93 2008/08/22 00:16:04 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/optimizer/clauses.h,v 1.94 2008/08/25 22:42:34 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -49,7 +49,6 @@ extern List *make_ands_implicit(Expr *clause);
 extern bool contain_agg_clause(Node *clause);
 extern void count_agg_clauses(Node *clause, AggClauseCounts *counts);
 
-extern bool expression_returns_set(Node *clause);
 extern double expression_returns_set_rows(Node *clause);
 
 extern bool contain_subplans(Node *clause);
@@ -80,29 +79,4 @@ extern Node *estimate_expression_value(PlannerInfo *root, Node *node);
 
 extern Query *inline_set_returning_function(PlannerInfo *root, Node *node);
 
-extern bool expression_tree_walker(Node *node, bool (*walker) (),
-											   void *context);
-extern Node *expression_tree_mutator(Node *node, Node *(*mutator) (),
-												 void *context);
-
-/* flags bits for query_tree_walker and query_tree_mutator */
-#define QTW_IGNORE_RT_SUBQUERIES	0x01		/* subqueries in rtable */
-#define QTW_IGNORE_JOINALIASES		0x02		/* JOIN alias var lists */
-#define QTW_DONT_COPY_QUERY			0x04		/* do not copy top Query */
-
-extern bool query_tree_walker(Query *query, bool (*walker) (),
-										  void *context, int flags);
-extern Query *query_tree_mutator(Query *query, Node *(*mutator) (),
-											 void *context, int flags);
-
-extern bool range_table_walker(List *rtable, bool (*walker) (),
-										   void *context, int flags);
-extern List *range_table_mutator(List *rtable, Node *(*mutator) (),
-											 void *context, int flags);
-
-extern bool query_or_expression_tree_walker(Node *node, bool (*walker) (),
-												   void *context, int flags);
-extern Node *query_or_expression_tree_mutator(Node *node, Node *(*mutator) (),
-												   void *context, int flags);
-
 #endif   /* CLAUSES_H */
diff --git a/src/include/parser/parse_expr.h b/src/include/parser/parse_expr.h
index 6e70583ba0..cb921fd2fb 100644
--- a/src/include/parser/parse_expr.h
+++ b/src/include/parser/parse_expr.h
@@ -1,13 +1,12 @@
 /*-------------------------------------------------------------------------
  *
  * parse_expr.h
- *
- *
+ *	  handle expressions in parser
  *
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/parser/parse_expr.h,v 1.38 2008/01/01 19:45:58 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/parser/parse_expr.h,v 1.39 2008/08/25 22:42:34 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,14 +15,9 @@
 
 #include "parser/parse_node.h"
 
-
 /* GUC parameters */
 extern bool Transform_null_equals;
 
-
 extern Node *transformExpr(ParseState *pstate, Node *expr);
-extern Oid	exprType(Node *expr);
-extern int32 exprTypmod(Node *expr);
-extern bool exprIsLengthCoercion(Node *expr, int32 *coercedTypmod);
 
 #endif   /* PARSE_EXPR_H */