diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/nodes/primnodes.h | 5 | ||||
| -rw-r--r-- | src/include/parser/analyze.h | 4 | ||||
| -rw-r--r-- | src/include/parser/parse_node.h | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h index 3da2c433cb7..531e5e9052b 100644 --- a/src/include/nodes/primnodes.h +++ b/src/include/nodes/primnodes.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: primnodes.h,v 1.13 1998/01/17 04:53:42 momjian Exp $ + * $Id: primnodes.h,v 1.14 1998/01/19 05:06:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -281,8 +281,7 @@ typedef struct Aggreg */ typedef enum SubLinkType { - EXISTS_SUBLINK, ALL_SUBLINK, ANY_SUBLINK, EXPR_SUBLINK, - IN_SUBLINK, NOTIN_SUBLINK, OPER_SUBLINK + EXISTS_SUBLINK, ALL_SUBLINK, ANY_SUBLINK, EXPR_SUBLINK } SubLinkType; diff --git a/src/include/parser/analyze.h b/src/include/parser/analyze.h index b88d80f346f..85191a60c1b 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.2 1997/11/26 01:13:56 momjian Exp $ + * $Id: analyze.h,v 1.3 1998/01/19 05:06:39 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -14,6 +14,6 @@ #include <parser/parse_node.h> -extern QueryTreeList *parse_analyze(List *pl); +extern QueryTreeList *parse_analyze(List *pl, ParseState *parentParseState); #endif /* ANALYZE_H */ diff --git a/src/include/parser/parse_node.h b/src/include/parser/parse_node.h index a0915574a1d..f09c7d0f86e 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.5 1998/01/17 04:53:46 momjian Exp $ + * $Id: parse_node.h,v 1.6 1998/01/19 05:06:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,9 +28,11 @@ typedef struct QueryTreeList /* state information used during parse analysis */ typedef struct ParseState { + struct ParseState; int p_last_resno; List *p_rtable; List *p_insert_columns; + struct ParseState *parentParseState; bool p_hasAggs; bool p_hasSubLinks; bool p_is_insert; @@ -41,7 +43,7 @@ typedef struct ParseState RangeTblEntry *p_target_rangetblentry; } ParseState; -extern ParseState *make_parsestate(void); +extern ParseState *make_parsestate(ParseState *parentParseState); 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, |