From: Alberto Gonzalez <boqwxp@airmail.cc>
Date: Wed, 6 May 2020 07:22:17 +0000 (+0000)
Subject: verilog: Move lexer location variables from global namespace to `VERILOG_FRONTEND... 
X-Git-Tag: working-ls180~526^2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=323aa1df75dcc21e94c4dfbdb77eaad40f48d081;p=yosys.git

verilog: Move lexer location variables from global namespace to `VERILOG_FRONTEND` namespace.
---

diff --git a/frontends/verilog/verilog_lexer.l b/frontends/verilog/verilog_lexer.l
index f6a3ac4db..63c0ba159 100644
--- a/frontends/verilog/verilog_lexer.l
+++ b/frontends/verilog/verilog_lexer.l
@@ -48,16 +48,18 @@ USING_YOSYS_NAMESPACE
 using namespace AST;
 using namespace VERILOG_FRONTEND;
 
+#define YYSTYPE FRONTEND_VERILOG_YYSTYPE
+#define YYLTYPE FRONTEND_VERILOG_YYLTYPE
+
 YOSYS_NAMESPACE_BEGIN
 namespace VERILOG_FRONTEND {
 	std::vector<std::string> fn_stack;
 	std::vector<int> ln_stack;
+	YYLTYPE real_location;
+	YYLTYPE old_location;
 }
 YOSYS_NAMESPACE_END
 
-#define YYSTYPE FRONTEND_VERILOG_YYSTYPE
-#define YYLTYPE FRONTEND_VERILOG_YYLTYPE
-
 #define SV_KEYWORD(_tok) \
 	if (sv_mode) return _tok; \
 	log("Lexer warning: The SystemVerilog keyword `%s' (at %s:%d) is not "\
@@ -73,9 +75,6 @@ YOSYS_NAMESPACE_END
 #define YY_INPUT(buf,result,max_size) \
 	result = readsome(*VERILOG_FRONTEND::lexin, buf, max_size)
 
-YYLTYPE real_location;
-YYLTYPE old_location;
-
 #define YY_USER_ACTION \
        old_location = real_location; \
        real_location.first_line = real_location.last_line; \