Make parser functions static where possible.

Author: bmomjian

src/backend/parser/parse_agg.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_agg.c,v 1.2 1997/11/26 01:11:14 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_agg.c,v 1.3 1997/11/26 03:42:37 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,6 +27,10 @@
 #include "parser/parse_target.h"
 #include "utils/syscache.h"
 
+static bool contain_agg_clause(Node *clause);
+static bool exprIsAggOrGroupCol(Node *expr, List *groupClause);
+static bool tleIsAggOrGroupCol(TargetEntry *tle, List *groupClause);
+
 /*
  * AddAggToParseState -
  *	  add the aggregate to the list of unique aggregates in pstate.
@@ -93,7 +97,7 @@ finalizeAggregates(ParseState *pstate, Query *qry)
  *
  *	  Returns true if any aggregate found.
  */
-bool
+static bool
 contain_agg_clause(Node *clause)
 {
 	if (clause == NULL)
@@ -151,7 +155,7 @@ contain_agg_clause(Node *clause)
  * exprIsAggOrGroupCol -
  *	  returns true if the expression does not contain non-group columns.
  */
-bool
+static bool
 exprIsAggOrGroupCol(Node *expr, List *groupClause)
 {
 	List	   *gl;
@@ -185,7 +189,7 @@ exprIsAggOrGroupCol(Node *expr, List *groupClause)
  * tleIsAggOrGroupCol -
  *	  returns true if the TargetEntry is Agg or GroupCol.
  */
-bool
+static bool
 tleIsAggOrGroupCol(TargetEntry *tle, List *groupClause)
 {
 	Node	   *expr = tle->expr;

src/backend/parser/parse_clause.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.2 1997/11/26 01:11:16 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.3 1997/11/26 03:42:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,45 +25,9 @@
 #include "parser/parse_relation.h"
 #include "parser/parse_target.h"
 
-/*
- * parseFromClause -
- *	  turns the table references specified in the from-clause into a
- *	  range table. The range table may grow as we transform the expressions
- *	  in the target list. (Note that this happens because in POSTQUEL, we
- *	  allow references to relations not specified in the from-clause. We
- *	  also allow that in our POST-SQL)
- *
- */
-void
-parseFromClause(ParseState *pstate, List *frmList)
-{
-	List	   *fl;
-
-	foreach(fl, frmList)
-	{
-		RangeVar   *r = lfirst(fl);
-		RelExpr    *baserel = r->relExpr;
-		char	   *relname = baserel->relname;
-		char	   *refname = r->name;
-		RangeTblEntry *rte;
-
-		if (refname == NULL)
-			refname = relname;
-
-		/*
-		 * marks this entry to indicate it comes from the FROM clause. In
-		 * SQL, the target list can only refer to range variables
-		 * specified in the from clause but we follow the more powerful
-		 * POSTQUEL semantics and automatically generate the range
-		 * variable if not specified. However there are times we need to
-		 * know whether the entries are legitimate.
-		 *
-		 * eg. select * from foo f where f.x = 1; will generate wrong answer
-		 * if we expand * to foo.x.
-		 */
-		rte = addRangeTableEntry(pstate, relname, refname, baserel->inh, TRUE);
-	}
-}
+static TargetEntry *find_targetlist_entry(ParseState *pstate,
+			SortGroupBy *sortgroupby, List *tlist);
+static void parseFromClause(ParseState *pstate, List *frmList);
 
 /*
  * makeRangeTable -
@@ -92,12 +56,6 @@ makeRangeTable(ParseState *pstate, char *relname, List *frmList)
 	/* will close relation later */
 }
 
-/*****************************************************************************
- *
- * Where Clause
- *
- *****************************************************************************/
-
 /*
  * transformWhereClause -
  *	  transforms the qualification and make sure it is of type Boolean
@@ -123,19 +81,53 @@ transformWhereClause(ParseState *pstate, Node *a_expr)
 	return qual;
 }
 
-/*****************************************************************************
- *
- * Sort Clause
+/*
+ * parseFromClause -
+ *	  turns the table references specified in the from-clause into a
+ *	  range table. The range table may grow as we transform the expressions
+ *	  in the target list. (Note that this happens because in POSTQUEL, we
+ *	  allow references to relations not specified in the from-clause. We
+ *	  also allow that in our POST-SQL)
  *
- *****************************************************************************/
+ */
+static void
+parseFromClause(ParseState *pstate, List *frmList)
+{
+	List	   *fl;
+
+	foreach(fl, frmList)
+	{
+		RangeVar   *r = lfirst(fl);
+		RelExpr    *baserel = r->relExpr;
+		char	   *relname = baserel->relname;
+		char	   *refname = r->name;
+		RangeTblEntry *rte;
+
+		if (refname == NULL)
+			refname = relname;
+
+		/*
+		 * marks this entry to indicate it comes from the FROM clause. In
+		 * SQL, the target list can only refer to range variables
+		 * specified in the from clause but we follow the more powerful
+		 * POSTQUEL semantics and automatically generate the range
+		 * variable if not specified. However there are times we need to
+		 * know whether the entries are legitimate.
+		 *
+		 * eg. select * from foo f where f.x = 1; will generate wrong answer
+		 * if we expand * to foo.x.
+		 */
+		rte = addRangeTableEntry(pstate, relname, refname, baserel->inh, TRUE);
+	}
+}
 
 /*
  *	find_targetlist_entry -
  *	  returns the Resdom in the target list matching the specified varname
  *	  and range
  *
  */
-TargetEntry *
+static TargetEntry *
 find_targetlist_entry(ParseState *pstate, SortGroupBy *sortgroupby, List *tlist)
 {
 	List	   *i;

src/backend/parser/parse_expr.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.2 1997/11/26 01:11:17 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.3 1997/11/26 03:42:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,14 +22,15 @@
 #include "nodes/params.h"
 #include "nodes/relation.h"
 #include "parse.h"
+#include "parser/gramparse.h"
 #include "parser/parse_expr.h"
 #include "parser/parse_func.h"
 #include "parser/parse_node.h"
 #include "parser/parse_relation.h"
 #include "parser/parse_target.h"
 #include "utils/builtins.h"
 
-Oid param_type(int t); /* from gram.y */
+static Node *parser_typecast(Value *expr, TypeName *typename, int typlen);
 
 /*
  * transformExpr -
@@ -397,7 +398,7 @@ handleNestedDots(ParseState *pstate, Attr *attr, int *curr_resno)
 	return (retval);
 }
 
-Node	   *
+static Node	   *
 parser_typecast(Value *expr, TypeName *typename, int typlen)
 {
 	/* check for passing non-ints */

src/backend/parser/parse_func.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.2 1997/11/26 01:11:21 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.3 1997/11/26 03:42:42 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -42,6 +42,37 @@
 #include "utils/lsyscache.h"
 #include "utils/syscache.h"
 
+static Node *ParseComplexProjection(ParseState *pstate,
+						   char *funcname,
+						   Node *first_arg,
+						   bool *attisset);
+static Oid ** argtype_inherit(int nargs, Oid *oid_array);
+static bool can_coerce(int nargs, Oid *input_typeids, Oid *func_typeids);
+static int find_inheritors(Oid relid, Oid **supervec);
+static CandidateList func_get_candidates(char *funcname, int nargs);
+static bool func_get_detail(char *funcname,
+					int nargs,
+					Oid *oid_array,
+					Oid *funcid,	/* return value */
+					Oid *rettype,	/* return value */
+					bool *retset,	/* return value */
+					Oid **true_typeids);
+static Oid * func_select_candidate(int nargs,
+						  Oid *input_typeids,
+						  CandidateList candidates);
+static Oid funcid_get_rettype(Oid funcid);
+static Oid **gen_cross_product(InhPaths *arginh, int nargs);
+static void make_arguments(int nargs,
+				   List *fargs,
+				   Oid *input_typeids,
+				   Oid *function_typeids);
+static int match_argtypes(int nargs,
+				   Oid *input_typeids,
+				   CandidateList function_typeids,
+				   CandidateList *candidates);
+static List *setup_tlist(char *attname, Oid relid);
+static List *setup_base_tlist(Oid typeid);
+
 #define ISCOMPLEX(type) (typeidTypeRelid(type) ? true : false)
 
 #define MAXFARGS 8				/* max # args to a c or postquel function */
@@ -400,7 +431,7 @@ ParseFunc(ParseState *pstate, char *funcname, List *fargs, int *curr_resno)
 	return (retval);
 }
 
-Oid
+static Oid
 funcid_get_rettype(Oid funcid)
 {
 	HeapTuple	func_tuple = NULL;
@@ -422,7 +453,7 @@ funcid_get_rettype(Oid funcid)
  * get a list of all argument type vectors for which a function named
  * funcname taking nargs arguments exists
  */
-CandidateList
+static CandidateList
 func_get_candidates(char *funcname, int nargs)
 {
 	Relation	heapRelation;
@@ -500,7 +531,7 @@ func_get_candidates(char *funcname, int nargs)
 /*
  * can input_typeids be coerced to func_typeids?
  */
-bool
+static bool
 can_coerce(int nargs, Oid *input_typeids, Oid *func_typeids)
 {
 	int			i;
@@ -539,7 +570,7 @@ can_coerce(int nargs, Oid *input_typeids, Oid *func_typeids)
  * that match the input typeids (either exactly or by coercion), and
  * return the number of such arrays
  */
-int
+static int
 match_argtypes(int nargs,
 			   Oid *input_typeids,
 			   CandidateList function_typeids,
@@ -577,7 +608,7 @@ match_argtypes(int nargs,
  * returns the selected argtype array if the conflict can be resolved,
  * otherwise returns NULL
  */
-Oid *
+static Oid *
 func_select_candidate(int nargs,
 					  Oid *input_typeids,
 					  CandidateList candidates)
@@ -586,7 +617,7 @@ func_select_candidate(int nargs,
 	return (NULL);
 }
 
-bool
+static bool
 func_get_detail(char *funcname,
 				int nargs,
 				Oid *oid_array,
@@ -731,7 +762,7 @@ func_get_detail(char *funcname,
  *		not defined.  There are lots of these (mostly builtins) in the
  *		catalogs.
  */
-Oid **
+static Oid **
 argtype_inherit(int nargs, Oid *oid_array)
 {
 	Oid			relid;
@@ -745,7 +776,7 @@ argtype_inherit(int nargs, Oid *oid_array)
 			arginh[i].self = oid_array[i];
 			if ((relid = typeidTypeRelid(oid_array[i])) != InvalidOid)
 			{
-				arginh[i].nsupers = findsupers(relid, &(arginh[i].supervec));
+				arginh[i].nsupers = find_inheritors(relid, &(arginh[i].supervec));
 			}
 			else
 			{
@@ -762,10 +793,10 @@ argtype_inherit(int nargs, Oid *oid_array)
 	}
 
 	/* return an ordered cross-product of the classes involved */
-	return (genxprod(arginh, nargs));
+	return (gen_cross_product(arginh, nargs));
 }
 
-int findsupers(Oid relid, Oid **supervec)
+static int find_inheritors(Oid relid, Oid **supervec)
 {
 	Oid		   *relidvec;
 	Relation	inhrel;
@@ -885,8 +916,8 @@ int findsupers(Oid relid, Oid **supervec)
 	return (nvisited);
 }
 
-Oid **
-genxprod(InhPaths *arginh, int nargs)
+static Oid **
+gen_cross_product(InhPaths *arginh, int nargs)
 {
 	int			nanswers;
 	Oid		  **result,
@@ -946,7 +977,7 @@ genxprod(InhPaths *arginh, int nargs)
  **   Given the number and types of arguments to a function, and the
  **   actual arguments and argument types, do the necessary typecasting.
  */
-void
+static void
 make_arguments(int nargs,
 			   List *fargs,
 			   Oid *input_typeids,
@@ -987,7 +1018,7 @@ make_arguments(int nargs,
  **		on a tuple parameter or return value.  Due to a bug in 4.0,
  **		it's not possible to refer to system attributes in this case.
  */
-List *
+static List *
 setup_tlist(char *attname, Oid relid)
 {
 	TargetEntry *tle;
@@ -1021,7 +1052,7 @@ setup_tlist(char *attname, Oid relid)
  **		Build a tlist that extracts a base type from the tuple
  **		returned by the executor.
  */
-List *
+static List *
 setup_base_tlist(Oid typeid)
 {
 	TargetEntry *tle;
@@ -1048,7 +1079,7 @@ setup_base_tlist(Oid typeid)
  *	  handles function calls with a single argument that is of complex type.
  *	  This routine returns NULL if it can't handle the projection (eg. sets).
  */
-Node *
+static Node *
 ParseComplexProjection(ParseState *pstate,
 					   char *funcname,
 					   Node *first_arg,