3 files changed, 18 insertions, 14 deletions
diff --git a/frontends/verilog/Makefile.inc b/frontends/verilog/Makefile.inc
index 49eb320e..1b6854bb 100644
--- a/frontends/verilog/Makefile.inc
+++ b/frontends/verilog/Makefile.inc
@@ -1,20 +1,20 @@
 
-GENFILES += frontends/verilog/parser.tab.cc
-GENFILES += frontends/verilog/parser.tab.h
-GENFILES += frontends/verilog/parser.output
-GENFILES += frontends/verilog/lexer.cc
+GENFILES += frontends/verilog/verilog_parser.tab.cc
+GENFILES += frontends/verilog/verilog_parser.tab.h
+GENFILES += frontends/verilog/verilog_parser.output
+GENFILES += frontends/verilog/verilog_lexer.cc
 
-frontends/verilog/parser.tab.cc: frontends/verilog/parser.y
-	$(P) bison -d -r all -b frontends/verilog/parser frontends/verilog/parser.y
-	$(Q) mv frontends/verilog/parser.tab.c frontends/verilog/parser.tab.cc
+frontends/verilog/verilog_parser.tab.cc: frontends/verilog/verilog_parser.y
+	$(P) bison -d -r all -b frontends/verilog/verilog_parser frontends/verilog/verilog_parser.y
+	$(Q) mv frontends/verilog/verilog_parser.tab.c frontends/verilog/verilog_parser.tab.cc
 
-frontends/verilog/parser.tab.h: frontends/verilog/parser.tab.cc
+frontends/verilog/verilog_parser.tab.h: frontends/verilog/verilog_parser.tab.cc
 
-frontends/verilog/lexer.cc: frontends/verilog/lexer.l
-	$(P) flex -o frontends/verilog/lexer.cc frontends/verilog/lexer.l
+frontends/verilog/verilog_lexer.cc: frontends/verilog/verilog_lexer.l
+	$(P) flex -o frontends/verilog/verilog_lexer.cc frontends/verilog/verilog_lexer.l
 
-OBJS += frontends/verilog/parser.tab.o
-OBJS += frontends/verilog/lexer.o
+OBJS += frontends/verilog/verilog_parser.tab.o
+OBJS += frontends/verilog/verilog_lexer.o
 OBJS += frontends/verilog/preproc.o
 OBJS += frontends/verilog/verilog_frontend.o
 OBJS += frontends/verilog/const2ast.o
diff --git a/frontends/verilog/lexer.l b/frontends/verilog/verilog_lexer.l
index 98f36088..0d28e2e7 100644
--- a/frontends/verilog/lexer.l
+++ b/frontends/verilog/verilog_lexer.l
@@ -42,7 +42,7 @@
 #include "kernel/log.h"
 #include "verilog_frontend.h"
 #include "frontends/ast/ast.h"
-#include "parser.tab.h"
+#include "verilog_parser.tab.h"
 
 USING_YOSYS_NAMESPACE
 using namespace AST;
@@ -64,7 +64,11 @@ YOSYS_NAMESPACE_END
 	return TOK_ID;
 
 #define YY_INPUT(buf,result,max_size) \
-	result = readsome(*lexin, buf, max_size);
+	do { \
+		lexin->read(buf, max_size-1); \
+		result = lexin->gcount(); \
+		if (result >= 0) buf[result] = '\0'; \
+	} while (0)
 
 %}
 
diff --git a/frontends/verilog/parser.y b/frontends/verilog/verilog_parser.y
index cf02a56a..cf02a56a 100644
--- a/frontends/verilog/parser.y
+++ b/frontends/verilog/verilog_parser.y