summaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
authorJohn Naylor2022-09-14 03:41:44 +0000
committerJohn Naylor2022-09-14 03:57:13 +0000
commitecaf7c5df54f7fa9df2fdc7225d2bb4e283f0081 (patch)
tree2e80f00c444d5d7406f4132390a60f66ea793932 /src/include
parentf352e2d08ac048d7407dd6098fc6b344ff85c2dd (diff)
Move gramparse.h to src/backend/parser
This header is semi-private, being used only in files related to raw parsing, so move to the backend directory where those files live. This allows removal of Makefile rules that symlink gram.h to src/include/parser, since gramparse.h can now include gram.h from within the same directory. This has the side-effect of no longer installing gram.h and gramparse.h, but there doesn't seem to be a good reason to continue doing so. Per suggestion from Andres Freund and Peter Eisentraut Discussion: https://www.postgresql.org/message-id/20220904181759.px6uosll6zbxcum5%40awork3.anarazel.de
Diffstat (limited to 'src/include')
-rw-r--r--src/include/Makefile4
-rw-r--r--src/include/parser/.gitignore1
-rw-r--r--src/include/parser/gramparse.h75
3 files changed, 2 insertions, 78 deletions
diff --git a/src/include/Makefile b/src/include/Makefile
index 1e504006170..7472cd5e015 100644
--- a/src/include/Makefile
+++ b/src/include/Makefile
@@ -53,7 +53,7 @@ install: all installdirs
$(INSTALL_DATA) $(srcdir)/$$dir/*.h '$(DESTDIR)$(includedir_server)'/$$dir || exit; \
done
ifeq ($(vpath_build),yes)
- for file in catalog/schemapg.h catalog/system_fk_info.h catalog/pg_*_d.h parser/gram.h storage/lwlocknames.h utils/probes.h; do \
+ for file in catalog/schemapg.h catalog/system_fk_info.h catalog/pg_*_d.h storage/lwlocknames.h utils/probes.h; do \
$(INSTALL_DATA) $$file '$(DESTDIR)$(includedir_server)'/$$file || exit; \
done
endif
@@ -72,7 +72,7 @@ uninstall:
clean:
rm -f utils/fmgroids.h utils/fmgrprotos.h utils/errcodes.h utils/header-stamp
- rm -f parser/gram.h storage/lwlocknames.h utils/probes.h
+ rm -f storage/lwlocknames.h utils/probes.h
rm -f catalog/schemapg.h catalog/system_fk_info.h
rm -f catalog/pg_*_d.h catalog/header-stamp
rm -f nodes/nodetags.h nodes/header-stamp
diff --git a/src/include/parser/.gitignore b/src/include/parser/.gitignore
deleted file mode 100644
index 19ea9554a07..00000000000
--- a/src/include/parser/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/gram.h
diff --git a/src/include/parser/gramparse.h b/src/include/parser/gramparse.h
deleted file mode 100644
index 41b753a96c6..00000000000
--- a/src/include/parser/gramparse.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * gramparse.h
- * Shared definitions for the "raw" parser (flex and bison phases only)
- *
- * NOTE: this file is only meant to be included in the core parsing files,
- * i.e., parser.c, gram.y, and scan.l.
- * Definitions that are needed outside the core parser should be in parser.h.
- *
- *
- * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
- * Portions Copyright (c) 1994, Regents of the University of California
- *
- * src/include/parser/gramparse.h
- *
- *-------------------------------------------------------------------------
- */
-
-#ifndef GRAMPARSE_H
-#define GRAMPARSE_H
-
-#include "nodes/parsenodes.h"
-#include "parser/scanner.h"
-
-/*
- * NB: include gram.h only AFTER including scanner.h, because scanner.h
- * is what #defines YYLTYPE.
- */
-#include "parser/gram.h"
-
-/*
- * The YY_EXTRA data that a flex scanner allows us to pass around. Private
- * state needed for raw parsing/lexing goes here.
- */
-typedef struct base_yy_extra_type
-{
- /*
- * Fields used by the core scanner.
- */
- core_yy_extra_type core_yy_extra;
-
- /*
- * State variables for base_yylex().
- */
- bool have_lookahead; /* is lookahead info valid? */
- int lookahead_token; /* one-token lookahead */
- core_YYSTYPE lookahead_yylval; /* yylval for lookahead token */
- YYLTYPE lookahead_yylloc; /* yylloc for lookahead token */
- char *lookahead_end; /* end of current token */
- char lookahead_hold_char; /* to be put back at *lookahead_end */
-
- /*
- * State variables that belong to the grammar.
- */
- List *parsetree; /* final parse result is delivered here */
-} base_yy_extra_type;
-
-/*
- * In principle we should use yyget_extra() to fetch the yyextra field
- * from a yyscanner struct. However, flex always puts that field first,
- * and this is sufficiently performance-critical to make it seem worth
- * cheating a bit to use an inline macro.
- */
-#define pg_yyget_extra(yyscanner) (*((base_yy_extra_type **) (yyscanner)))
-
-
-/* from parser.c */
-extern int base_yylex(YYSTYPE *lvalp, YYLTYPE *llocp,
- core_yyscan_t yyscanner);
-
-/* from gram.y */
-extern void parser_init(base_yy_extra_type *yyext);
-extern int base_yyparse(core_yyscan_t yyscanner);
-
-#endif /* GRAMPARSE_H */