From 7849ccf2a44b1ccc1b431cc4fd82b7fbe1616329 Mon Sep 17 00:00:00 2001
From: Kyotaro Horiguchi <horiguchi.kyotaro@lab.ntt.co.jp>
Date: Wed, 6 Jan 2016 15:27:43 +0900
Subject: [PATCH 2/5] Change the access method to shell variables

Access to shell variables via a callback function so that the lexer no
longer need to be aware of VariableSpace.
---
 src/bin/psql/common.c             |  7 +++++++
 src/bin/psql/common.h             |  2 ++
 src/bin/psql/mainloop.c           |  4 ++--
 src/bin/psql/psqlscan.h           |  6 ++++--
 src/bin/psql/psqlscan_int.h       |  2 +-
 src/bin/psql/psqlscan_slashbody.l | 14 +++++++-------
 src/bin/psql/psqlscanbody.l       | 16 ++++++++--------
 src/bin/psql/startup.c            |  2 +-
 8 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
index 2cb2e9b..1216d1e 100644
--- a/src/bin/psql/common.c
+++ b/src/bin/psql/common.c
@@ -1901,3 +1901,10 @@ recognized_connection_string(const char *connstr)
 {
 	return uri_prefix_length(connstr) != 0 || strchr(connstr, '=') != NULL;
 }
+
+/* Access callback to "shell variables" for lexer */
+const char *
+get_variable(const char *name)
+{
+	return GetVariable(pset.vars, name);
+}
diff --git a/src/bin/psql/common.h b/src/bin/psql/common.h
index 6ba3f44..636331e 100644
--- a/src/bin/psql/common.h
+++ b/src/bin/psql/common.h
@@ -49,4 +49,6 @@ extern void expand_tilde(char **filename);
 
 extern bool recognized_connection_string(const char *connstr);
 
+extern const char *get_variable(const char *name);
+
 #endif   /* COMMON_H */
diff --git a/src/bin/psql/mainloop.c b/src/bin/psql/mainloop.c
index 947caff..76b2f78 100644
--- a/src/bin/psql/mainloop.c
+++ b/src/bin/psql/mainloop.c
@@ -234,7 +234,7 @@ MainLoop(FILE *source)
 		 * Parse line, looking for command separators.
 		 */
 		psql_scan_setup(scan_state, line, strlen(line),
-						pset.db, pset.vars, pset.encoding);
+						pset.db, &get_variable, pset.encoding);
 		success = true;
 		line_saved_in_history = false;
 
@@ -375,7 +375,7 @@ MainLoop(FILE *source)
 					/* reset parsing state since we are rescanning whole line */
 					psql_scan_reset(scan_state);
 					psql_scan_setup(scan_state, line, strlen(line),
-									pset.db, pset.vars, pset.encoding);
+									pset.db, &get_variable, pset.encoding);
 					line_saved_in_history = false;
 					prompt_status = PROMPT_READY;
 				}
diff --git a/src/bin/psql/psqlscan.h b/src/bin/psql/psqlscan.h
index 7615df2..651f074 100644
--- a/src/bin/psql/psqlscan.h
+++ b/src/bin/psql/psqlscan.h
@@ -11,11 +11,13 @@
 #include "pqexpbuffer.h"
 
 #include "prompt.h"
-#include "variables.h"
 
 /* Abstract type for lexer's internal state */
 typedef struct PsqlScanStateData *PsqlScanState;
 
+/* Callback type for retrieve variables */
+typedef const char *(*VariableGetter)(const char *);
+
 /* Termination states for psql_scan() */
 typedef enum
 {
@@ -29,7 +31,7 @@ extern PsqlScanState psql_scan_create(void);
 extern void psql_scan_destroy(PsqlScanState state);
 
 extern void psql_scan_setup(PsqlScanState state, const char *line, int line_len,
-							PGconn *db, VariableSpace vars, int encoding);
+							PGconn *db, VariableGetter getter, int encoding);
 extern void psql_scan_finish(PsqlScanState state);
 
 extern PsqlScanResult psql_scan(PsqlScanState state,
diff --git a/src/bin/psql/psqlscan_int.h b/src/bin/psql/psqlscan_int.h
index 0fb04c7..6f9fa13 100644
--- a/src/bin/psql/psqlscan_int.h
+++ b/src/bin/psql/psqlscan_int.h
@@ -56,7 +56,7 @@ typedef struct PsqlScanStateData
 	const char *curline;		/* actual flex input string for cur buf */
 	const char *refline;		/* original data for cur buffer */
 	int			curpos;			/* current position in curline  */
-	VariableSpace vars;			/* "shell variable" repository */
+	VariableGetter get_variable; /* access to the "shell variable" repository */
 
 	/*
 	 * All this state lives across successive input lines, until explicitly
diff --git a/src/bin/psql/psqlscan_slashbody.l b/src/bin/psql/psqlscan_slashbody.l
index 06c218b..ca0870e 100644
--- a/src/bin/psql/psqlscan_slashbody.l
+++ b/src/bin/psql/psqlscan_slashbody.l
@@ -187,10 +187,10 @@ other			.
 						char   *varname;
 						const char *value;
 
-						if (cur_state->vars)
+						if (cur_state->get_variable)
 						{
 							varname = extract_substring(yytext + 1, yyleng - 1);
-							value = GetVariable(cur_state->vars, varname);
+							value = cur_state->get_variable(varname);
 							free(varname);
 						}
 
@@ -372,8 +372,8 @@ psql_scan_slash_command_initialize(PsqlScanState state)
  */
 static void
 psql_scan_slash_command_setup(PsqlScanState state,
-							  const char *line, int line_len,
-							  PGconn *db, VariableSpace vars, int encoding)
+						  const char *line, int line_len,
+						  PGconn *db, VariableGetter vargetter, int encoding)
 {
 	/* Mustn't be scanning already */
 	Assert(state->scanbufhandle == NULL);
@@ -383,7 +383,7 @@ psql_scan_slash_command_setup(PsqlScanState state,
 	state->encoding = encoding;
 	state->safe_encoding = pg_valid_server_encoding_id(state->encoding);
 
-	state->vars = vars;
+	state->get_variable = vargetter;
 
 	/* needed for prepare_buffer */
 	cur_state = state;
@@ -412,12 +412,12 @@ psql_scan_slash_command_switch_lexer(PsqlScanState state)
 {
 	const char *newscanline = state->scanline + state->curpos;
 	PGconn		   *db = state->db;
-	VariableSpace	vars = state->vars;
+	VariableGetter	vargetter = state->get_variable;
 	int				encoding = state->encoding;
 
 	psql_scan_slash_command_initialize(state);
 	psql_scan_slash_command_setup(state, newscanline, strlen(newscanline),
-								  db, vars, encoding);
+								  db, vargetter, encoding);
 }
 
 /*
diff --git a/src/bin/psql/psqlscanbody.l b/src/bin/psql/psqlscanbody.l
index cf5755c..4418a5c 100644
--- a/src/bin/psql/psqlscanbody.l
+++ b/src/bin/psql/psqlscanbody.l
@@ -658,10 +658,10 @@ other			.
 					char   *varname = NULL;
 					const char *value = NULL;
 
-					if (cur_state->vars)
+					if (cur_state->get_variable)
 					{
 						varname = extract_substring(yytext + 1, yyleng - 1);
-						value = GetVariable(cur_state->vars, varname);
+						value = cur_state->get_variable(varname);
 					}
 
 					if (value)
@@ -911,7 +911,7 @@ psql_scan_destroy(PsqlScanState state)
  */
 void
 psql_scan_setup(PsqlScanState state, const char *line, int line_len,
-				PGconn *db, VariableSpace vars, int encoding)
+				PGconn *db, VariableGetter vargetter, int encoding)
 {
 	/* Mustn't be scanning already */
 	Assert(state->scanbufhandle == NULL);
@@ -921,7 +921,7 @@ psql_scan_setup(PsqlScanState state, const char *line, int line_len,
 	state->encoding = encoding;
 	state->safe_encoding = pg_valid_server_encoding_id(state->encoding);
 
-	state->vars = vars;
+	state->get_variable = vargetter;
 
 	/* needed for prepare_buffer */
 	cur_state = state;
@@ -1142,12 +1142,12 @@ psql_scan_switch_lexer(PsqlScanState state)
 {
 	const char	   *newscanline = state->scanline + state->curpos;
 	PGconn		   *db = state->db;
-	VariableSpace	vars = state->vars;
+	VariableGetter	vargetter = state->get_variable;
 	int				encoding = state->encoding;
 
 	psql_scan_initialize(state);
 	psql_scan_setup(state, newscanline, strlen(newscanline),
-					db, vars, encoding);
+					db, vargetter, encoding);
 }
 
 /*
@@ -1385,10 +1385,10 @@ escape_variable(bool as_ident)
 	const char *value;
 
 	/* Variable lookup if possible. */
-	if (cur_state->vars && cur_state->db)
+	if (cur_state->get_variable)
 	{
 		varname = extract_substring(yytext + 2, yyleng - 3);
-		value = GetVariable(cur_state->vars, varname);
+		value = cur_state->get_variable(varname);
 		free(varname);
 	}
 
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
index 5461763..553efc0 100644
--- a/src/bin/psql/startup.c
+++ b/src/bin/psql/startup.c
@@ -339,7 +339,7 @@ main(int argc, char *argv[])
 				scan_state = psql_scan_create();
 				psql_scan_setup(scan_state,
 								cell->val, strlen(cell->val),
-								pset.db, pset.vars, pset.encoding);
+								pset.db, get_variable, pset.encoding);
 
 				successResult = HandleSlashCmds(scan_state, NULL) != PSQL_CMD_ERROR
 					? EXIT_SUCCESS : EXIT_FAILURE;
-- 
1.8.3.1

