diff options
| author | Bruce Momjian | 1998-09-01 04:40:42 +0000 |
|---|---|---|
| committer | Bruce Momjian | 1998-09-01 04:40:42 +0000 |
| commit | fa1a8d6a97068295fe30ac646aec7493a6305bc2 (patch) | |
| tree | 645f7cef3c78fbab4d6d7bbc7c9a61ad2893d273 /src/include/parser | |
| parent | af74855a608da4cd7ef88ceb2241ec1c75537f39 (diff) | |
OK, folks, here is the pgindent output.
Diffstat (limited to 'src/include/parser')
| -rw-r--r-- | src/include/parser/analyze.h | 4 | ||||
| -rw-r--r-- | src/include/parser/gramparse.h | 4 | ||||
| -rw-r--r-- | src/include/parser/keywords.h | 4 | ||||
| -rw-r--r-- | src/include/parser/parse_agg.h | 7 | ||||
| -rw-r--r-- | src/include/parser/parse_clause.h | 10 | ||||
| -rw-r--r-- | src/include/parser/parse_coerce.h | 17 | ||||
| -rw-r--r-- | src/include/parser/parse_expr.h | 4 | ||||
| -rw-r--r-- | src/include/parser/parse_func.h | 14 | ||||
| -rw-r--r-- | src/include/parser/parse_node.h | 13 | ||||
| -rw-r--r-- | src/include/parser/parse_oper.h | 4 | ||||
| -rw-r--r-- | src/include/parser/parse_relation.h | 16 | ||||
| -rw-r--r-- | src/include/parser/parse_target.h | 20 | ||||
| -rw-r--r-- | src/include/parser/parse_type.h | 4 | ||||
| -rw-r--r-- | src/include/parser/parser.h | 4 | ||||
| -rw-r--r-- | src/include/parser/parsetree.h | 4 | ||||
| -rw-r--r-- | src/include/parser/scansup.h | 4 |
16 files changed, 60 insertions, 73 deletions
diff --git a/src/include/parser/analyze.h b/src/include/parser/analyze.h index 85191a60c1b..0c4f838d135 100644 --- a/src/include/parser/analyze.h +++ b/src/include/parser/analyze.h @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: analyze.h,v 1.3 1998/01/19 05:06:39 momjian Exp $ + * $Id: analyze.h,v 1.4 1998/09/01 04:37:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,4 +16,4 @@ extern QueryTreeList *parse_analyze(List *pl, ParseState *parentParseState); -#endif /* ANALYZE_H */ +#endif /* ANALYZE_H */ diff --git a/src/include/parser/gramparse.h b/src/include/parser/gramparse.h index bb650d3f27c..cdf11cc1742 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.7 1998/02/26 04:42:36 momjian Exp $ + * $Id: gramparse.h,v 1.8 1998/09/01 04:37:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,4 +22,4 @@ extern Oid param_type(int t); extern void parser_init(Oid *typev, int nargs); extern int yyparse(void); -#endif /* GRAMPARSE_H */ +#endif /* GRAMPARSE_H */ diff --git a/src/include/parser/keywords.h b/src/include/parser/keywords.h index 7feda88a089..437cf694895 100644 --- a/src/include/parser/keywords.h +++ b/src/include/parser/keywords.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: keywords.h,v 1.4 1997/09/08 21:53:38 momjian Exp $ + * $Id: keywords.h,v 1.5 1998/09/01 04:37:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,4 +23,4 @@ typedef struct ScanKeyword extern ScanKeyword *ScanKeywordLookup(char *text); extern char *AtomValueGetString(int atomval); -#endif /* KEYWORDS_H */ +#endif /* KEYWORDS_H */ diff --git a/src/include/parser/parse_agg.h b/src/include/parser/parse_agg.h index 5f6987253b8..d7f2e08c4f1 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.6 1998/02/26 04:42:39 momjian Exp $ + * $Id: parse_agg.h,v 1.7 1998/09/01 04:37:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,9 +20,8 @@ extern void AddAggToParseState(ParseState *pstate, Aggreg *aggreg); extern void parseCheckAggregates(ParseState *pstate, Query *qry); -extern Aggreg * -ParseAgg(ParseState *pstate, char *aggname, Oid basetype, +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 */ +#endif /* PARSE_AGG_H */ diff --git a/src/include/parser/parse_clause.h b/src/include/parser/parse_clause.h index 0a232fecd06..3306330c136 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.6 1998/02/26 04:42:40 momjian Exp $ + * $Id: parse_clause.h,v 1.7 1998/09/01 04:37:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,13 +21,11 @@ extern void makeRangeTable(ParseState *pstate, char *relname, List *frmList); extern Node *transformWhereClause(ParseState *pstate, Node *a_expr); -extern List * -transformGroupClause(ParseState *pstate, List *grouplist, +extern List *transformGroupClause(ParseState *pstate, List *grouplist, List *targetlist); -extern List * -transformSortClause(ParseState *pstate, +extern List *transformSortClause(ParseState *pstate, List *orderlist, List *sortClause, List *targetlist, char *uniqueFlag); extern List *transformUnionClause(List *unionClause, List *targetlist); -#endif /* PARSE_CLAUSE_H */ +#endif /* PARSE_CLAUSE_H */ diff --git a/src/include/parser/parse_coerce.h b/src/include/parser/parse_coerce.h index cf701a4c95f..7531e5c7542 100644 --- a/src/include/parser/parse_coerce.h +++ b/src/include/parser/parse_coerce.h @@ -6,14 +6,15 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_coerce.h,v 1.4 1998/08/14 16:07:00 thomas Exp $ + * $Id: parse_coerce.h,v 1.5 1998/09/01 04:37:32 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef PARSE_COERCE_H #define PARSE_COERCE_H -typedef enum CATEGORY { +typedef enum CATEGORY +{ INVALID_TYPE, UNKNOWN_TYPE, BOOLEAN_TYPE, @@ -24,13 +25,13 @@ typedef enum CATEGORY { GEOMETRIC_TYPE, USER_TYPE, MIXED_TYPE -} CATEGORY; +} CATEGORY; /* IS_BUILTIN_TYPE() * Check for types which are in the core distribution. * The built-in types can have more explicit support for type coersion, etc, - * since we know apriori how they should behave. + * since we know apriori how they should behave. * - thomas 1998-05-13 */ #define IS_BUILTIN_TYPE(t) \ @@ -61,7 +62,7 @@ typedef enum CATEGORY { /* IS_BINARY_COMPATIBLE() * Check for types with the same underlying binary representation. * This allows us to cheat and directly exchange values without - * going through the trouble of calling a conversion function. + * going through the trouble of calling a conversion function. */ #define IS_BINARY_COMPATIBLE(a,b) \ (((a) == BPCHAROID && (b) == TEXTOID) \ @@ -97,7 +98,7 @@ typedef enum CATEGORY { /* IS_HIGHEST_TYPE() * These types are the most general in each of the type categories. * Since timespan and datetime overload so many functions, let's - * give datetime the preference. + * give datetime the preference. * Since text is a generic string type let's leave it out too. */ #define IS_HIGHEST_TYPE(t) \ @@ -107,10 +108,10 @@ typedef enum CATEGORY { extern bool IsPreferredType(CATEGORY category, Oid type); -extern Oid PreferredType(CATEGORY category, Oid type); +extern Oid PreferredType(CATEGORY category, Oid type); extern CATEGORY TypeCategory(Oid type); extern bool can_coerce_type(int nargs, Oid *input_typeids, Oid *func_typeids); extern Node *coerce_type(ParseState *pstate, Node *node, Oid inputTypeId, Oid targetTypeId); -#endif /* PARSE_COERCE_H */ +#endif /* PARSE_COERCE_H */ diff --git a/src/include/parser/parse_expr.h b/src/include/parser/parse_expr.h index 9e02458c8e2..1d4b594f320 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.9 1998/07/12 21:29:34 momjian Exp $ + * $Id: parse_expr.h,v 1.10 1998/09/01 04:37:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,4 +23,4 @@ extern Node *transformIdent(ParseState *pstate, Node *expr, int precedence); extern Oid exprType(Node *expr); extern Node *parser_typecast2(Node *expr, Oid exprType, Type tp, int32 attypmod); -#endif /* PARSE_EXPR_H */ +#endif /* PARSE_EXPR_H */ diff --git a/src/include/parser/parse_func.h b/src/include/parser/parse_func.h index 655a979dd1e..eab4b06aded 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.10 1998/05/29 14:03:08 thomas Exp $ + * $Id: parse_func.h,v 1.11 1998/09/01 04:37:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -42,17 +42,15 @@ typedef struct _CandidateList struct _CandidateList *next; } *CandidateList; -extern Node * -ParseNestedFuncOrColumn(ParseState *pstate, Attr *attr, +extern Node *ParseNestedFuncOrColumn(ParseState *pstate, Attr *attr, int *curr_resno, int precedence); -extern Node * -ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs, +extern Node *ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs, int *curr_resno, int precedence); extern Oid * -func_select_candidate(int nargs, Oid *input_typeids, CandidateList candidates); + func_select_candidate(int nargs, Oid *input_typeids, CandidateList candidates); extern void -func_error(char *caller, char *funcname, int nargs, Oid *argtypes, char *msg); + func_error(char *caller, char *funcname, int nargs, Oid *argtypes, char *msg); -#endif /* PARSE_FUNC_H */ +#endif /* PARSE_FUNC_H */ diff --git a/src/include/parser/parse_node.h b/src/include/parser/parse_node.h index e77b3789b0e..23040b57239 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.10 1998/02/26 04:42:46 momjian Exp $ + * $Id: parse_node.h,v 1.11 1998/09/01 04:37:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -44,17 +44,14 @@ 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, +extern Var *make_var(ParseState *pstate, Oid relid, char *refname, char *attrname); -extern ArrayRef * -make_array_ref(Node *expr, +extern ArrayRef *make_array_ref(Node *expr, List *indirection); -extern ArrayRef * -make_array_set(Expr *target_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 */ +#endif /* PARSE_NODE_H */ diff --git a/src/include/parser/parse_oper.h b/src/include/parser/parse_oper.h index 7a0c9cd97f4..56d43b8b11e 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.5 1998/05/29 14:07:50 thomas Exp $ + * $Id: parse_oper.h,v 1.6 1998/09/01 04:37:37 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,4 +27,4 @@ extern Operator left_oper(char *op, Oid arg); extern Operator oper_exact(char *op, Oid arg1, Oid arg2, Node **ltree, Node **rtree, bool noWarnings); extern Operator oper_inexact(char *op, Oid arg1, Oid arg2, Node **ltree, Node **rtree, bool noWarnings); -#endif /* PARSE_OPER_H */ +#endif /* PARSE_OPER_H */ diff --git a/src/include/parser/parse_relation.h b/src/include/parser/parse_relation.h index 5fc882e75d7..dc227ba5d8b 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.7 1998/02/26 04:42:47 momjian Exp $ + * $Id: parse_relation.h,v 1.8 1998/09/01 04:37:38 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,25 +21,21 @@ #include <utils/rel.h> extern RangeTblEntry *refnameRangeTableEntry(ParseState *pstate, char *refname); -extern int -refnameRangeTablePosn(ParseState *pstate, +extern int refnameRangeTablePosn(ParseState *pstate, char *refname, int *sublevels_up); extern RangeTblEntry *colnameRangeTableEntry(ParseState *pstate, char *colname); -extern RangeTblEntry * -addRangeTableEntry(ParseState *pstate, +extern RangeTblEntry *addRangeTableEntry(ParseState *pstate, char *relname, char *refname, bool inh, bool inFromCl); -extern List * -expandAll(ParseState *pstate, char *relname, char *refname, +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 void handleTargetColname(ParseState *pstate, char **resname, char *refname, char *colname); -#endif /* PARSE_RANGE_H */ +#endif /* PARSE_RANGE_H */ diff --git a/src/include/parser/parse_target.h b/src/include/parser/parse_target.h index 884fb299c47..263ed8a5043 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.10 1998/08/25 03:17:29 momjian Exp $ + * $Id: parse_target.h,v 1.11 1998/09/01 04:37:39 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,20 +24,18 @@ extern List *transformTargetList(ParseState *pstate, List *targetlist); extern List *makeTargetNames(ParseState *pstate, List *cols); -extern TargetEntry * -MakeTargetEntryIdent(ParseState *pstate, +extern TargetEntry *MakeTargetEntryIdent(ParseState *pstate, Node *node, char **resname, char *refname, char *colname, int16 resjunk); -extern Node * -CoerceTargetExpr(ParseState *pstate, Node *expr, +extern Node *CoerceTargetExpr(ParseState *pstate, Node *expr, Oid type_id, Oid attrtype); -TargetEntry * MakeTargetEntryExpr(ParseState *pstate, - char *colname, - Node *expr, - List *arrayRef, - int16 resjunk); +TargetEntry *MakeTargetEntryExpr(ParseState *pstate, + char *colname, + Node *expr, + List *arrayRef, + int16 resjunk); -#endif /* PARSE_TARGET_H */ +#endif /* PARSE_TARGET_H */ diff --git a/src/include/parser/parse_type.h b/src/include/parser/parse_type.h index 7ea8e383297..3a01dd292ef 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.7 1998/07/12 21:29:35 momjian Exp $ + * $Id: parse_type.h,v 1.8 1998/09/01 04:37:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -34,4 +34,4 @@ extern Oid typeidTypElem(Oid type_id); extern Oid GetArrayElementType(Oid typearray); extern Oid typeidInfunc(Oid type_id); -#endif /* PARSE_TYPE_H */ +#endif /* PARSE_TYPE_H */ diff --git a/src/include/parser/parser.h b/src/include/parser/parser.h index 17867623e08..8d13e028809 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.3 1998/02/26 04:42:51 momjian Exp $ + * $Id: parser.h,v 1.4 1998/09/01 04:37:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,4 +17,4 @@ extern QueryTreeList *parser(char *str, Oid *typev, int nargs); -#endif /* PARSER_H */ +#endif /* PARSER_H */ diff --git a/src/include/parser/parsetree.h b/src/include/parser/parsetree.h index 0d2f83bbb2a..b82fe31e70f 100644 --- a/src/include/parser/parsetree.h +++ b/src/include/parser/parsetree.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parsetree.h,v 1.4 1997/11/21 19:12:28 momjian Exp $ + * $Id: parsetree.h,v 1.5 1998/09/01 04:37:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -65,4 +65,4 @@ #define getrelname(rangeindex, rangetable) \ rt_relname((RangeTblEntry*)nth((rangeindex)-1, rangetable)) -#endif /* PARSETREE_H */ +#endif /* PARSETREE_H */ diff --git a/src/include/parser/scansup.h b/src/include/parser/scansup.h index 9a30962cce2..3bc0ba46db3 100644 --- a/src/include/parser/scansup.h +++ b/src/include/parser/scansup.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: scansup.h,v 1.4 1997/11/26 01:14:18 momjian Exp $ + * $Id: scansup.h,v 1.5 1998/09/01 04:37:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,4 +16,4 @@ extern char *scanstr(char *s); -#endif /* SCANSUP_H */ +#endif /* SCANSUP_H */ |
