luke
/
iverilog
mirror of https://github.com/steveicarus/iverilog.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Basic patch from github #44

This commit is contained in:
Cary R 2014-11-04 11:21:12 -08:00
parent cc9fcfd13d
commit 2e8c4e3dbc
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.in
View File

@ -267,7 +267,7 @@ lexor.cc: $(srcdir)/lexor.lex
lexor_keyword.o: lexor_keyword.cc parse.h lexor_keyword.o: lexor_keyword.cc parse.h
lexor_keyword.cc: $(srcdir)/lexor_keyword.gperf lexor_keyword.cc: $(srcdir)/lexor_keyword.gperf
gperf -o -i 7 -C -k 1-4,6,9,$$ -L ANSI-C -H keyword_hash -N check_identifier -t $(srcdir)/lexor_keyword.gperf > lexor_keyword.cc || (rm -f lexor_keyword.cc ; false) gperf -o -i 7 -C -k 1-4,6,9,$$ -H keyword_hash -N check_identifier -t $(srcdir)/lexor_keyword.gperf > lexor_keyword.cc || (rm -f lexor_keyword.cc ; false)
iverilog-vpi.man: $(srcdir)/iverilog-vpi.man.in version.exe iverilog-vpi.man: $(srcdir)/iverilog-vpi.man.in version.exe
./version.exe `head -1 $(srcdir)/iverilog-vpi.man.in`'\n' > $@ ./version.exe `head -1 $(srcdir)/iverilog-vpi.man.in`'\n' > $@

4
autoconf.sh
View File

@ -10,7 +10,7 @@ echo "Autoconf in root..."
autoconf -f autoconf -f
echo "Precompiling lexor_keyword.gperf" echo "Precompiling lexor_keyword.gperf"
gperf -o -i 7 -C -k 1-4,6,9,\$ -L ANSI-C -H keyword_hash -N check_identifier -t ./lexor_keyword.gperf > lexor_keyword.cc gperf -o -i 7 -C -k 1-4,6,9,\$ -H keyword_hash -N check_identifier -t ./lexor_keyword.gperf > lexor_keyword.cc
echo "Precompiling vhdlpp/lexor_keyword.gperf" echo "Precompiling vhdlpp/lexor_keyword.gperf"
(cd vhdlpp ; gperf -o -i 7 --ignore-case -C -k 1-4,6,9,\$ -L ANSI-C -H keyword_hash -N check_identifier -t ./lexor_keyword.gperf > lexor_keyword.cc ) (cd vhdlpp ; gperf -o -i 7 --ignore-case -C -k 1-4,6,9,\$ -H keyword_hash -N check_identifier -t ./lexor_keyword.gperf > lexor_keyword.cc )

6
lexor_keyword.gperf
View File

@ -3,9 +3,11 @@
* tokenType values are not initialized for the empty table entries. * tokenType values are not initialized for the empty table entries.
*/ */
%define initializer-suffix ,0,0 %define initializer-suffix ,0,0
%language=C++
%define class-name Lkwd
%{ %{
/* Command-line: gperf -o -i 1 -C -k 1-3,$ -L C -H keyword_hash -N check_identifier -tT lexor_keyword.gperf */ /* Command-line: gperf -o -i 7 -C -k '1-4,6,9,$' -H keyword_hash -N check_identifier -t ./lexor_keyword.gperf */
#include "config.h" #include "config.h"
#include "parse_misc.h" #include "parse_misc.h"
@ -362,7 +364,7 @@ int lexor_keyword_mask = 0;
int lexor_keyword_code(const char*str, unsigned nstr) int lexor_keyword_code(const char*str, unsigned nstr)
{ {
const struct lexor_keyword*rc = check_identifier(str, nstr); const struct lexor_keyword*rc = Lkwd::check_identifier(str, nstr);
if (rc == 0) if (rc == 0)
return IDENTIFIER; return IDENTIFIER;
else if ((rc->mask & lexor_keyword_mask) == 0) else if ((rc->mask & lexor_keyword_mask) == 0)

2
vhdlpp/Makefile.in
View File

@ -124,7 +124,7 @@ parse.h: parse.cc
lexor_keyword.o: lexor_keyword.cc parse.h lexor_keyword.o: lexor_keyword.cc parse.h
lexor_keyword.cc: $(srcdir)/lexor_keyword.gperf lexor_keyword.cc: $(srcdir)/lexor_keyword.gperf
gperf -o -i 7 --ignore-case -C -k 1-4,6,9,$$ -L ANSI-C -H keyword_hash -N check_identifier -t $(srcdir)/lexor_keyword.gperf > lexor_keyword.cc || (rm -f lexor_keyword.cc ; false) gperf -o -i 7 --ignore-case -C -k 1-4,6,9,$$ -H keyword_hash -N check_identifier -t $(srcdir)/lexor_keyword.gperf > lexor_keyword.cc || (rm -f lexor_keyword.cc ; false)
install: all installdirs $(libdir)/ivl$(suffix)/vhdlpp@EXEEXT@ install: all installdirs $(libdir)/ivl$(suffix)/vhdlpp@EXEEXT@

7
vhdlpp/lexor_keyword.gperf
View File

@ -3,9 +3,10 @@
* tokenType values are not initialized for the empty table entries. * tokenType values are not initialized for the empty table entries.
*/ */
%define initializer-suffix ,0,0 %define initializer-suffix ,0,0
%language=C++
%define class-name Lkwd
%{ %{
/* Command-line: gperf -o -i 1 --ignore-case -C -k 1-3,$ -L C -H keyword_hash -N check_identifier -tT lexor_keyword.gperf */ /* Command-line: gperf -o -i 7 --ignore-case -C -k '1-4,6,9,$' -H keyword_hash -N check_identifier -t lexor_keyword.gperf */
#include "vhdlpp_config.h" #include "vhdlpp_config.h"
#include <cstring> #include <cstring>
@ -134,7 +135,7 @@ int lexor_keyword_mask = GN_KEYWORD_2008;
int lexor_keyword_code(const char*str, unsigned nstr) int lexor_keyword_code(const char*str, unsigned nstr)
{ {
const struct lexor_keyword*rc = check_identifier(str, nstr); const struct lexor_keyword*rc = Lkwd::check_identifier(str, nstr);
if (rc == 0) if (rc == 0)
return IDENTIFIER; return IDENTIFIER;
else if ((rc->mask & lexor_keyword_mask) == 0) else if ((rc->mask & lexor_keyword_mask) == 0)