From 412a5e653949b930d03056da73afca3c505a80f5 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Tue, 20 Jan 1998 05:05:08 +0000 Subject: Parser cleanup. Add lock to i386 asm. --- src/include/parser/parse_agg.h | 3 +-- src/include/parser/parse_expr.h | 4 +--- src/include/parser/parse_func.h | 6 ++++-- src/include/parser/parse_relation.h | 3 +-- 4 files changed, 7 insertions(+), 9 deletions(-) (limited to 'src/include/parser') diff --git a/src/include/parser/parse_agg.h b/src/include/parser/parse_agg.h index 8d1e0fb31fd..1381f14f8c4 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.4 1998/01/04 04:31:39 momjian Exp $ + * $Id: parse_agg.h,v 1.5 1998/01/20 05:04:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,7 +19,6 @@ #include extern void AddAggToParseState(ParseState *pstate, Aggreg *aggreg); -extern void finalizeAggregates(ParseState *pstate, Query *qry); extern void parseCheckAggregates(ParseState *pstate, Query *qry); extern Aggreg *ParseAgg(ParseState *pstate, char *aggname, Oid basetype, List *target, int precedence); diff --git a/src/include/parser/parse_expr.h b/src/include/parser/parse_expr.h index 42cbe9c4616..b328cc5e5ca 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.5 1998/01/16 23:21:01 momjian Exp $ + * $Id: parse_expr.h,v 1.6 1998/01/20 05:04:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,8 +21,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, int precedence); extern Node *parser_typecast2(Node *expr, Oid exprType, Type tp, int attypmod); #endif /* PARSE_EXPR_H */ diff --git a/src/include/parser/parse_func.h b/src/include/parser/parse_func.h index 12d6ba16b88..0a360df86ae 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.4 1998/01/04 04:31:42 momjian Exp $ + * $Id: parse_func.h,v 1.5 1998/01/20 05:04:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -42,7 +42,9 @@ typedef struct _CandidateList struct _CandidateList *next; } *CandidateList; -extern Node *ParseFunc(ParseState *pstate, char *funcname, List *fargs, +extern Node *ParseNestedFuncOrColumn(ParseState *pstate, Attr *attr, + int *curr_resno, int precedence); +extern Node *ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs, int *curr_resno, int precedence); extern void func_error(char *caller, char *funcname, int nargs, Oid *argtypes); diff --git a/src/include/parser/parse_relation.h b/src/include/parser/parse_relation.h index e379b92932f..eab72589ff5 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.4 1998/01/04 04:31:43 momjian Exp $ + * $Id: parse_relation.h,v 1.5 1998/01/20 05:04:56 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -32,7 +32,6 @@ 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 char *attnumAttName(Relation rd, int attrno); extern int attnumAttNelems(Relation rd, int attid); extern Oid attnumTypeId(Relation rd, int attid); extern void handleTargetColname(ParseState *pstate, char **resname, -- cgit v1.2.3