Rethink the idea of having plpgsql depend on parser/gram.h. Aside from the

fact that this is breaking the MSVC build, it's probably not really a good
idea to expand the dependencies of gram.h any further than the core parser;
for instance the value of SCONST might depend on which bison version you'd
built with.  Better to expose an additional call point in parser.c, so
move what I had put into pl_funcs.c into parser.c.  Also PGDLLIMPORT'ify
the reference to standard_conforming_strings, per buildfarm results.

6 files changed, 37 insertions, 44 deletions

diff --git a/src/backend/parser/parser.c b/src/backend/parser/parser.c
index c8a77d9847..302dbee3cf 100644
--- a/src/backend/parser/parser.c
+++ b/src/backend/parser/parser.c
@@ -63,6 +63,36 @@ raw_parser(const char *str)
 
 
 /*
+ * pg_parse_string_token - get the value represented by a string literal
+ *
+ * Given the textual form of a SQL string literal, produce the represented
+ * value as a palloc'd string.  It is caller's responsibility that the
+ * passed string does represent one single string literal.
+ *
+ * We export this function to avoid having plpgsql depend on internal details
+ * of the core grammar (such as the token code assigned to SCONST).  Note
+ * that since the scanner isn't presently re-entrant, this cannot be used
+ * during use of the main parser/scanner.
+ */
+char *
+pg_parse_string_token(const char *token)
+{
+	int		ctoken;
+
+	scanner_init(token);
+
+	ctoken = base_yylex();
+
+	if (ctoken != SCONST)		/* caller error */
+		elog(ERROR, "expected string constant, got token code %d", ctoken);
+
+	scanner_finish();
+
+	return base_yylval.str;
+}
+
+
+/*
  * Intermediate filter between parser and base lexer (base_yylex in scan.l).
  *
  * The filter is needed because in some cases the standard SQL grammar
diff --git a/src/include/parser/parser.h b/src/include/parser/parser.h
index 227953df7b..c64c390156 100644
--- a/src/include/parser/parser.h
+++ b/src/include/parser/parser.h
@@ -18,4 +18,6 @@
 
 extern List *raw_parser(const char *str);
 
+extern char *pg_parse_string_token(const char *token);
+
 #endif   /* PARSER_H */
diff --git a/src/pl/plpgsql/src/gram.y b/src/pl/plpgsql/src/gram.y
index b144a8490b..b29047e0a1 100644
--- a/src/pl/plpgsql/src/gram.y
+++ b/src/pl/plpgsql/src/gram.y
@@ -2737,10 +2737,9 @@ plpgsql_sql_error_callback(void *arg)
 /*
  * Convert a string-literal token to the represented string value.
  *
- * To do this, we need to invoke the core lexer.  To avoid confusion between
- * the core bison/flex definitions and our own, the actual invocation is in
- * pl_funcs.c.  Here we are only concerned with setting up the right errcontext
- * state, which is handled the same as in check_sql_expr().
+ * To do this, we need to invoke the core lexer.  Here we are only concerned
+ * with setting up the right errcontext state, which is handled the same as
+ * in check_sql_expr().
  */
 static char *
 parse_string_token(const char *token)
@@ -2758,7 +2757,7 @@ parse_string_token(const char *token)
 	syntax_errcontext.previous = error_context_stack->previous;
 	error_context_stack = &syntax_errcontext;
 
-	result = plpgsql_parse_string_token(token);
+	result = pg_parse_string_token(token);
 
 	/* Restore former ereport callback */
 	error_context_stack = previous_errcontext;
diff --git a/src/pl/plpgsql/src/pl_funcs.c b/src/pl/plpgsql/src/pl_funcs.c
index 62acecd817..c64c22c625 100644
--- a/src/pl/plpgsql/src/pl_funcs.c
+++ b/src/pl/plpgsql/src/pl_funcs.c
@@ -17,8 +17,6 @@
 
 #include <ctype.h>
 
-#include "parser/gramparse.h"
-#include "parser/gram.h"
 #include "parser/scansup.h"
 
 
@@ -462,41 +460,6 @@ plpgsql_convert_ident(const char *s, char **output, int numidents)
 
 
 /*
- * plpgsql_parse_string_token - get the value represented by a string literal
- *
- * We do not make plpgsql's lexer produce the represented value, because
- * in many cases we don't need it.  Instead this function is invoked when
- * we do need it.  The input is the T_STRING token as identified by the lexer.
- *
- * The result is a palloc'd string.
- *
- * Note: this is called only from plpgsql's gram.y, but we can't just put it
- * there because including parser/gram.h there would cause confusion.
- */
-char *
-plpgsql_parse_string_token(const char *token)
-{
-	int		ctoken;
-
-	/*
-	 * We use the core lexer to do the dirty work.  Aside from getting the
-	 * right results for escape sequences and so on, this helps us produce
-	 * appropriate warnings for escape_string_warning etc.
-	 */
-	scanner_init(token);
-
-	ctoken = base_yylex();
-
-	if (ctoken != SCONST)
-		elog(ERROR, "unexpected result from base lexer: %d", ctoken);
-
-	scanner_finish();
-
-	return base_yylval.str;
-}
-
-
-/*
  * Statement type as a string, for use in error messages etc.
  */
 const char *
diff --git a/src/pl/plpgsql/src/plpgsql.h b/src/pl/plpgsql/src/plpgsql.h
index d7efe76408..b5c3bfab30 100644
--- a/src/pl/plpgsql/src/plpgsql.h
+++ b/src/pl/plpgsql/src/plpgsql.h
@@ -880,7 +880,6 @@ extern void plpgsql_ns_rename(char *oldname, char *newname);
  * ----------
  */
 extern void plpgsql_convert_ident(const char *s, char **output, int numidents);
-extern char *plpgsql_parse_string_token(const char *token);
 extern const char *plpgsql_stmt_typename(PLpgSQL_stmt *stmt);
 extern void plpgsql_dumptree(PLpgSQL_function *func);
 
diff --git a/src/pl/plpgsql/src/scan.l b/src/pl/plpgsql/src/scan.l
index ca1df6d357..1917eef95b 100644
--- a/src/pl/plpgsql/src/scan.l
+++ b/src/pl/plpgsql/src/scan.l
@@ -43,7 +43,7 @@ static int	cur_line_num;
 static int		xcdepth = 0;	/* depth of nesting in slash-star comments */
 static char    *dolqstart;      /* current $foo$ quote start string */
 
-extern bool		standard_conforming_strings;
+extern PGDLLIMPORT bool standard_conforming_strings;
 
 bool plpgsql_SpaceScanned = false;
 %}