revert the removal of pg_*.h files. Build failing

Author: pbollimp

src/include/parser/parsenodes.h

@@ -13,7 +13,7 @@
 #include <cstdint>
 
 #include "nodes.h"
-#include "parser/pg_list.h"
+#include "pg_list.h"
 
 typedef enum SetOperation {
   SETOP_NONE = 0,
@@ -44,14 +44,14 @@ typedef struct Expr { NodeTag type; } Expr;
     * A SubLink represents a subselect appearing in an expression, and in some
     * cases also the combining operator(s) just above it.  The subLinkType
 * indicates the form of the expression represented:
-*	EXISTS_SUBLINK		EXISTS(SELECT ...)
-*	ALL_SUBLINK			(lefthand) op ALL (SELECT ...)
-*	ANY_SUBLINK			(lefthand) op ANY (SELECT ...)
-*	ROWCOMPARE_SUBLINK	(lefthand) op (SELECT ...)
-*	EXPR_SUBLINK		(SELECT with single targetlist item ...)
-*	MULTIEXPR_SUBLINK	(SELECT with multiple targetlist items ...)
-*	ARRAY_SUBLINK		ARRAY(SELECT with single targetlist item ...)
-*	CTE_SUBLINK			WITH query (never actually part of an expression)
+*   EXISTS_SUBLINK      EXISTS(SELECT ...)
+*   ALL_SUBLINK         (lefthand) op ALL (SELECT ...)
+*   ANY_SUBLINK         (lefthand) op ANY (SELECT ...)
+*   ROWCOMPARE_SUBLINK  (lefthand) op (SELECT ...)
+*   EXPR_SUBLINK        (SELECT with single targetlist item ...)
+*   MULTIEXPR_SUBLINK   (SELECT with multiple targetlist items ...)
+*   ARRAY_SUBLINK       ARRAY(SELECT with single targetlist item ...)
+*   CTE_SUBLINK         WITH query (never actually part of an expression)
 * For ALL, ANY, and ROWCOMPARE, the lefthand is a list of expressions of the
 * same length as the subselect's targetlist.  ROWCOMPARE will *always* have
 * a list with more than one entry; if the subselect has just one target
@@ -73,8 +73,7 @@ typedef struct Expr { NodeTag type; } Expr;
 * of the lefthand expression (if any), and operName is the String name of
 * the combining operator.  Also, subselect is a raw parsetree.  During parse
 * analysis, the parser transforms testexpr into a complete boolean expression
-    * that compares the lefthand value(s) to PARAM_SUBLINK nodes representing
-*the
+    * that compares the lefthand value(s) to PARAM_SUBLINK nodes representing the
     * output columns of the subselect.  And subselect is transformed to a Query.
 * This is the representation seen in saved rules and in the rewriter.
 *
@@ -90,25 +89,28 @@ typedef struct Expr { NodeTag type; } Expr;
 * The CTE_SUBLINK case never occurs in actual SubLink nodes, but it is used
     * in SubPlans generated for WITH subqueries.
 */
-typedef enum SubLinkType {
+typedef enum SubLinkType
+{
   EXISTS_SUBLINK,
   ALL_SUBLINK,
   ANY_SUBLINK,
   ROWCOMPARE_SUBLINK,
   EXPR_SUBLINK,
   MULTIEXPR_SUBLINK,
   ARRAY_SUBLINK,
-  CTE_SUBLINK /* for SubPlans only */
+  CTE_SUBLINK                   /* for SubPlans only */
 } SubLinkType;
 
-typedef struct SubLink {
-  Expr xpr;
-  SubLinkType subLinkType; /* see above */
-  int subLinkId;           /* ID (1..n); 0 if not MULTIEXPR */
-  Node *testexpr;          /* outer-query test for ALL/ANY/ROWCOMPARE */
-  List *operName;          /* originally specified operator name */
-  Node *subselect;         /* subselect as Query* or raw parsetree */
-  int location;            /* token location, or -1 if unknown */
+
+typedef struct SubLink
+{
+  Expr      xpr;
+  SubLinkType subLinkType;  /* see above */
+  int           subLinkId;      /* ID (1..n); 0 if not MULTIEXPR */
+  Node     *testexpr;       /* outer-query test for ALL/ANY/ROWCOMPARE */
+  List     *operName;       /* originally specified operator name */
+  Node     *subselect;      /* subselect as Query* or raw parsetree */
+  int           location;       /* token location, or -1 if unknown */
 } SubLink;
 
 typedef struct BoolExpr {
@@ -648,8 +650,8 @@ typedef struct DropStmt {
 
 typedef struct DropDatabaseStmt {
   NodeTag type;
-  char *dbname;    /* name of database to drop */
-  bool missing_ok; /* skip error if object is missing? */
+  char *dbname;          /* name of database to drop */
+  bool missing_ok;       /* skip error if object is missing? */
 } DropDatabaseStmt;
 
 typedef struct TruncateStmt {
@@ -706,42 +708,47 @@ typedef struct CreateDatabaseStmt {
   List *options; /* List of DefElem nodes */
 } CreateDatabaseStmt;
 
-typedef struct CreateSchemaStmt {
-  NodeTag type;
-  char *schemaname;   /* the name of the schema to create */
-  Node *authrole;     /* the owner of the created schema */
-  List *schemaElts;   /* schema components (list of parsenodes) */
-  bool if_not_exists; /* just do nothing if schema already exists? */
+typedef struct CreateSchemaStmt
+{
+  NodeTag   type;
+  char     *schemaname;   /* the name of the schema to create */
+  Node     *authrole;   /* the owner of the created schema */
+  List     *schemaElts;   /* schema components (list of parsenodes) */
+  bool    if_not_exists;  /* just do nothing if schema already exists? */
 } CreateSchemaStmt;
 
-typedef enum RoleSpecType {
-  ROLESPEC_CSTRING,      /* role name is stored as a C string */
-  ROLESPEC_CURRENT_USER, /* role spec is CURRENT_USER */
-  ROLESPEC_SESSION_USER, /* role spec is SESSION_USER */
-  ROLESPEC_PUBLIC        /* role name is "public" */
+typedef enum RoleSpecType
+{
+  ROLESPEC_CSTRING,     /* role name is stored as a C string */
+  ROLESPEC_CURRENT_USER,    /* role spec is CURRENT_USER */
+  ROLESPEC_SESSION_USER,    /* role spec is SESSION_USER */
+  ROLESPEC_PUBLIC       /* role name is "public" */
 } RoleSpecType;
 
-typedef struct RoleSpec {
-  NodeTag type;
-  RoleSpecType roletype; /* Type of this rolespec */
-  char *rolename;        /* filled only for ROLESPEC_CSTRING */
-  int location;          /* token location, or -1 if unknown */
+typedef struct RoleSpec
+{
+  NodeTag   type;
+  RoleSpecType roletype;    /* Type of this rolespec */
+  char     *rolename;   /* filled only for ROLESPEC_CSTRING */
+  int     location;   /* token location, or -1 if unknown */
 } RoleSpec;
 
-typedef enum ViewCheckOption {
+typedef enum ViewCheckOption
+{
   NO_CHECK_OPTION,
   LOCAL_CHECK_OPTION,
   CASCADED_CHECK_OPTION
 } ViewCheckOption;
 
-typedef struct ViewStmt {
-  NodeTag type;
-  RangeVar *view;                  /* the view to be created */
-  List *aliases;                   /* target column names */
-  Node *query;                     /* the SELECT query */
-  bool replace;                    /* replace an existing view? */
-  List *options;                   /* options from WITH clause */
-  ViewCheckOption withCheckOption; /* WITH CHECK OPTION */
+typedef struct ViewStmt
+{
+  NodeTag   type;
+  RangeVar   *view;     /* the view to be created */
+  List     *aliases;    /* target column names */
+  Node     *query;      /* the SELECT query */
+  bool    replace;    /* replace an existing view? */
+  List     *options;    /* options from WITH clause */
+  ViewCheckOption withCheckOption;  /* WITH CHECK OPTION */
 } ViewStmt;
 
 typedef struct ParamRef {
@@ -767,26 +774,29 @@ typedef struct VacuumStmt {
   List *va_cols;      /* list of column names, or NIL for all */
 } VacuumStmt;
 
-typedef enum {
-  VAR_SET_VALUE,   /* SET var = value */
-  VAR_SET_DEFAULT, /* SET var TO DEFAULT */
-  VAR_SET_CURRENT, /* SET var FROM CURRENT */
-  VAR_SET_MULTI,   /* special case for SET TRANSACTION ... */
-  VAR_RESET,       /* RESET var */
-  VAR_RESET_ALL    /* RESET ALL */
+typedef enum
+{
+  VAR_SET_VALUE,              /* SET var = value */
+  VAR_SET_DEFAULT,            /* SET var TO DEFAULT */
+  VAR_SET_CURRENT,            /* SET var FROM CURRENT */
+  VAR_SET_MULTI,              /* special case for SET TRANSACTION ... */
+  VAR_RESET,                  /* RESET var */
+  VAR_RESET_ALL               /* RESET ALL */
 } VariableSetKind;
 
-typedef struct VariableSetStmt {
-  NodeTag type;
+typedef struct VariableSetStmt
+{
+  NodeTag     type;
   VariableSetKind kind;
-  char *name;    /* variable to be set */
-  List *args;    /* List of A_Const nodes */
-  bool is_local; /* SET LOCAL? */
+  char       *name;           /* variable to be set */
+  List       *args;           /* List of A_Const nodes */
+  bool        is_local;       /* SET LOCAL? */
 } VariableSetStmt;
 
-typedef struct VariableShowStmt {
-  NodeTag type;
-  char *name;
+typedef struct VariableShowStmt
+{
+  NodeTag     type;
+  char       *name;
 } VariableShowStmt;
 
 /// **********  For UDFs *********** ///

src/include/parser/pg_query.h

@@ -10,69 +10,70 @@
 //
 //===----------------------------------------------------------------------===//
 
+
 #ifndef PG_QUERY_H
 #define PG_QUERY_H
 
-#include "parser/pg_list.h"
+#include "pg_list.h"
 
 typedef struct {
-  char *message;   // exception message
-  char *funcname;  // source function of exception (e.g. SearchSysCache)
-  char *filename;  // source of exception (e.g. parse.l)
-  int lineno;      // source of exception (e.g. 104)
-  int cursorpos;   // char in query at which exception occurred
-  char *context;   // additional context (optional, can be NULL)
+    char* message; // exception message
+    char* funcname; // source function of exception (e.g. SearchSysCache)
+    char* filename; // source of exception (e.g. parse.l)
+    int lineno; // source of exception (e.g. 104)
+    int cursorpos; // char in query at which exception occurred
+    char* context; // additional context (optional, can be NULL)
 } PgQueryError;
 
 typedef struct {
-  char *parse_tree;
-  char *stderr_buffer;
-  PgQueryError *error;
+  char* parse_tree;
+  char* stderr_buffer;
+  PgQueryError* error;
 } PgQueryParseResult;
 
 typedef struct {
-  char *plpgsql_funcs;
-  PgQueryError *error;
+  char* plpgsql_funcs;
+  PgQueryError* error;
 } PgQueryPlpgsqlParseResult;
 
 typedef struct {
-  char *hexdigest;
-  char *stderr_buffer;
-  PgQueryError *error;
+  char* hexdigest;
+  char* stderr_buffer;
+  PgQueryError* error;
 } PgQueryFingerprintResult;
 
 typedef struct {
-  char *normalized_query;
-  PgQueryError *error;
+  char* normalized_query;
+  PgQueryError* error;
 } PgQueryNormalizeResult;
 
 typedef struct {
   List *tree;
-  char *stderr_buffer;
-  PgQueryError *error;
+  char* stderr_buffer;
+  PgQueryError* error;
 } PgQueryInternalParsetreeAndError;
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-void print_pg_parse_tree(List *node);
-void *pg_query_parse_init();
-void pg_query_parse_finish(void *ctx);
-PgQueryNormalizeResult pg_query_normalize(const char *input);
-PgQueryInternalParsetreeAndError pg_query_parse(const char *input);
-PgQueryPlpgsqlParseResult pg_query_parse_plpgsql(const char *input);
+void print_pg_parse_tree(List* node);
+void* pg_query_parse_init();
+void pg_query_parse_finish(void* ctx);
+PgQueryNormalizeResult pg_query_normalize(const char* input);
+PgQueryInternalParsetreeAndError pg_query_parse(const char* input);
+PgQueryPlpgsqlParseResult pg_query_parse_plpgsql(const char* input);
 
-PgQueryFingerprintResult pg_query_fingerprint(const char *input);
+PgQueryFingerprintResult pg_query_fingerprint(const char* input);
 
 void pg_query_free_normalize_result(PgQueryNormalizeResult result);
 void pg_query_free_parse_result(PgQueryInternalParsetreeAndError result);
 void pg_query_free_plpgsql_parse_result(PgQueryPlpgsqlParseResult result);
 void pg_query_free_fingerprint_result(PgQueryFingerprintResult result);
 
+
 // Deprecated APIs below
-void pg_query_init(void);  // Deprecated as of 9.5-1.4.1, this is now run
-                           // automatically as needed
+void pg_query_init(void); // Deprecated as of 9.5-1.4.1, this is now run automatically as needed
 
 #ifdef __cplusplus
 }