Make parser functions static where possible.

9 files changed, 10 insertions, 72 deletions

diff --git a/src/include/parser/gramparse.h b/src/include/parser/gramparse.h
index 2fb04acd560..db400cb416a 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.5 1997/09/08 21:53:37 momjian Exp $
+ * $Id: gramparse.h,v 1.6 1997/11/26 03:43:05 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,6 +18,7 @@
 extern void init_io(void);
 
 /* from gram.y */
+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 fca928c9eea..9761aa94e17 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.2 1997/11/26 01:13:58 momjian Exp $
+ * $Id: parse_agg.h,v 1.3 1997/11/26 03:43:08 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,9 +20,6 @@
 
 extern void AddAggToParseState(ParseState *pstate, Aggreg *aggreg);
 extern void finalizeAggregates(ParseState *pstate, Query *qry);
-extern bool contain_agg_clause(Node *clause);
-extern bool exprIsAggOrGroupCol(Node *expr, List *groupClause);
-extern bool tleIsAggOrGroupCol(TargetEntry *tle, List *groupClause);
 extern void parseCheckAggregates(ParseState *pstate, Query *qry);
 extern Aggreg *ParseAgg(char *aggname, Oid basetype, Node *target);
 extern void agg_error(char *caller, char *aggname, Oid basetypeID);
diff --git a/src/include/parser/parse_clause.h b/src/include/parser/parse_clause.h
index 9c5fed19dd5..272bbc17b54 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.2 1997/11/26 01:14:00 momjian Exp $
+ * $Id: parse_clause.h,v 1.3 1997/11/26 03:43:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,11 +19,8 @@
 #include <nodes/primnodes.h>
 #include <parser/parse_node.h>
 
-extern void parseFromClause(ParseState *pstate, List *frmList);
 extern void makeRangeTable(ParseState *pstate, char *relname, List *frmList);
 extern Node *transformWhereClause(ParseState *pstate, Node *a_expr);
-extern TargetEntry *find_targetlist_entry(ParseState *pstate,
-			SortGroupBy *sortgroupby, List *tlist);
 extern List *transformGroupClause(ParseState *pstate, List *grouplist,
 			List *targetlist);
 extern List *transformSortClause(ParseState *pstate,
diff --git a/src/include/parser/parse_expr.h b/src/include/parser/parse_expr.h
index 4bc1d77b3f6..f26bf34acb9 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.2 1997/11/26 01:14:02 momjian Exp $
+ * $Id: parse_expr.h,v 1.3 1997/11/26 03:43:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,7 +22,6 @@ extern Node *transformExpr(ParseState *pstate, Node *expr, int precedence);
 extern Node *transformIdent(ParseState *pstate, Node *expr, int precedence);
 extern Oid exprType(Node *expr);
 extern Node *handleNestedDots(ParseState *pstate, Attr *attr, int *curr_resno);
-extern Node *parser_typecast(Value *expr, TypeName *typename, int typlen);
 extern Node *parser_typecast2(Node *expr, Oid exprType, Type tp, int typlen);
 
 #endif							/* PARSE_EXPR_H */
diff --git a/src/include/parser/parse_func.h b/src/include/parser/parse_func.h
index dbda5651a36..9ff6ee91b80 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.2 1997/11/26 01:14:04 momjian Exp $
+ * $Id: parse_func.h,v 1.3 1997/11/26 03:43:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -44,37 +44,7 @@ typedef struct _CandidateList
 
 extern Node *ParseFunc(ParseState *pstate, char *funcname, List *fargs,
 	int *curr_resno);
-extern Oid funcid_get_rettype(Oid funcid);
-extern CandidateList func_get_candidates(char *funcname, int nargs);
-extern bool can_coerce(int nargs, Oid *input_typeids, Oid *func_typeids);
-extern int match_argtypes(int nargs,
-				   Oid *input_typeids,
-				   CandidateList function_typeids,
-				   CandidateList *candidates);
-extern Oid * func_select_candidate(int nargs,
-						  Oid *input_typeids,
-						  CandidateList candidates);
-extern 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);
-extern Oid ** argtype_inherit(int nargs, Oid *oid_array);
-extern int findsupers(Oid relid, Oid **supervec);
-extern Oid **genxprod(InhPaths *arginh, int nargs);
-extern void make_arguments(int nargs,
-				   List *fargs,
-				   Oid *input_typeids,
-				   Oid *function_typeids);
 
-extern List *setup_tlist(char *attname, Oid relid);
-extern List *setup_base_tlist(Oid typeid);
-extern Node *ParseComplexProjection(ParseState *pstate,
-						   char *funcname,
-						   Node *first_arg,
-						   bool *attisset);
 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 1eb063b8ee8..de6b03a1ad0 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.2 1997/11/26 01:14:05 momjian Exp $
+ * $Id: parse_node.h,v 1.3 1997/11/26 03:43:13 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -42,11 +42,6 @@ typedef struct ParseState
 } ParseState;
 
 extern ParseState *make_parsestate(void);
-extern Node *make_operand(char *opname,
-			 Node *tree,
-			 Oid orig_typeId,
-			 Oid true_typeId);
-extern void disallow_setop(char *op, Type optype, Node *operand);
 extern Expr *make_op(char *opname, Node *ltree, Node *rtree);
 extern Var *make_var(ParseState *pstate, char *refname, char *attrname, Oid *type_id);
 extern ArrayRef   *make_array_ref(Node *expr,
diff --git a/src/include/parser/parse_oper.h b/src/include/parser/parse_oper.h
index dd32290ddeb..972f0991df7 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.2 1997/11/26 01:14:07 momjian Exp $
+ * $Id: parse_oper.h,v 1.3 1997/11/26 03:43:14 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,21 +20,8 @@ typedef HeapTuple Operator;
 
 extern Oid any_ordering_op(int restype);
 extern Oid oprid(Operator op);
-extern int binary_oper_get_candidates(char *opname,
-						   Oid leftTypeId,
-						   Oid rightTypeId,
-						   CandidateList *candidates);
-extern bool equivalentOpersAfterPromotion(CandidateList candidates);
-extern CandidateList binary_oper_select_candidate(Oid arg1,
-							 Oid arg2,
-							 CandidateList candidates);
 extern Operator oper(char *op, Oid arg1, Oid arg2, bool noWarnings);
-extern int unary_oper_get_candidates(char *op,
-						  Oid typeId,
-						  CandidateList *candidates,
-						  char rightleft);
 extern Operator right_oper(char *op, Oid arg);
 extern Operator left_oper(char *op, Oid arg);
-extern void op_error(char *op, Oid arg1, Oid arg2);
 
 #endif							/* PARSE_OPER_H */
diff --git a/src/include/parser/parse_relation.h b/src/include/parser/parse_relation.h
index 4dc909e594e..7c78757ac32 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.2 1997/11/26 01:14:08 momjian Exp $
+ * $Id: parse_relation.h,v 1.3 1997/11/26 03:43:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -38,7 +38,5 @@ extern Oid attnameTypeId(Oid relid, char *attrname);
 extern Oid attnumTypeId(Relation rd, int attid);
 extern void handleTargetColname(ParseState *pstate, char **resname,
 					char *refname, char *colname);
-extern void checkTargetTypes(ParseState *pstate, char *target_colname,
-				 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 6b7451d565b..31b2c1594d7 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.2 1997/11/26 01:14:10 momjian Exp $
+ * $Id: parse_target.h,v 1.3 1997/11/26 03:43:18 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,12 +23,6 @@
 #define EXPR_RELATION_FIRST	2
 
 extern List *transformTargetList(ParseState *pstate, List *targetlist);
-extern TargetEntry *make_targetlist_expr(ParseState *pstate,
-					 char *colname,
-					 Node *expr,
-					 List *arrayRef);
-extern List *expandAllTables(ParseState *pstate);
-extern char *figureColname(Node *expr, Node *resval);
 extern List *makeTargetNames(ParseState *pstate, List *cols);
 
 #endif							/* PARSE_TARGET_H */