diff options
| author | William Speirs <bill.speirs@gmail.com> | 2014-10-14 17:06:02 -0400 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2014-10-15 00:48:19 +0200 |
| commit | fad0b0c506f2d7cb1158a3dac53139b8dec7a04e (patch) | |
| tree | b8e0f8be2f0d8989ac3ad8225a767efce3e93269 /frontends/ilang | |
| parent | 2873a8444ee5dbd0a3d034fb4a7a877c680be45d (diff) | |
Updated lexers & parsers to include prefixes
Diffstat (limited to 'frontends/ilang')
| -rw-r--r-- | frontends/ilang/Makefile.inc | 22 | ||||
| -rw-r--r-- | frontends/ilang/ilang_lexer.l (renamed from frontends/ilang/lexer.l) | 8 | ||||
| -rw-r--r-- | frontends/ilang/ilang_parser.y (renamed from frontends/ilang/parser.y) | 0 |
3 files changed, 17 insertions, 13 deletions
diff --git a/frontends/ilang/Makefile.inc b/frontends/ilang/Makefile.inc index e832cfed..984d436c 100644 --- a/frontends/ilang/Makefile.inc +++ b/frontends/ilang/Makefile.inc @@ -1,18 +1,18 @@ -GENFILES += frontends/ilang/parser.tab.cc -GENFILES += frontends/ilang/parser.tab.h -GENFILES += frontends/ilang/parser.output -GENFILES += frontends/ilang/lexer.cc +GENFILES += frontends/ilang/ilang_parser.tab.cc +GENFILES += frontends/ilang/ilang_parser.tab.h +GENFILES += frontends/ilang/ilang_parser.output +GENFILES += frontends/ilang/ilang_lexer.cc -frontends/ilang/parser.tab.cc: frontends/ilang/parser.y - $(P) bison -d -r all -b frontends/ilang/parser frontends/ilang/parser.y - $(Q) mv frontends/ilang/parser.tab.c frontends/ilang/parser.tab.cc +frontends/ilang/ilang_parser.tab.cc: frontends/ilang/ilang_parser.y + $(P) bison -d -r all -b frontends/ilang/ilang_parser frontends/ilang/ilang_parser.y + $(Q) mv frontends/ilang/ilang_parser.tab.c frontends/ilang/ilang_parser.tab.cc -frontends/ilang/parser.tab.h: frontends/ilang/parser.tab.cc +frontends/ilang/ilang_parser.tab.h: frontends/ilang/ilang_parser.tab.cc -frontends/ilang/lexer.cc: frontends/ilang/lexer.l - $(P) flex -o frontends/ilang/lexer.cc frontends/ilang/lexer.l +frontends/ilang/ilang_lexer.cc: frontends/ilang/ilang_lexer.l + $(P) flex -o frontends/ilang/ilang_lexer.cc frontends/ilang/ilang_lexer.l -OBJS += frontends/ilang/parser.tab.o frontends/ilang/lexer.o +OBJS += frontends/ilang/ilang_parser.tab.o frontends/ilang/ilang_lexer.o OBJS += frontends/ilang/ilang_frontend.o diff --git a/frontends/ilang/lexer.l b/frontends/ilang/ilang_lexer.l index 9669f092..dcbc6b6d 100644 --- a/frontends/ilang/lexer.l +++ b/frontends/ilang/ilang_lexer.l @@ -30,12 +30,16 @@ #endif #include "ilang_frontend.h" -#include "parser.tab.h" +#include "ilang_parser.tab.h" USING_YOSYS_NAMESPACE #define YY_INPUT(buf,result,max_size) \ - result = readsome(*ILANG_FRONTEND::lexin, buf, max_size); + do { \ + ILANG_FRONTEND::lexin->read(buf, max_size-1); \ + result = ILANG_FRONTEND::lexin->gcount(); \ + if (result >= 0) buf[result] = '\0'; \ + } while (0) %} diff --git a/frontends/ilang/parser.y b/frontends/ilang/ilang_parser.y index a5cc0689..a5cc0689 100644 --- a/frontends/ilang/parser.y +++ b/frontends/ilang/ilang_parser.y |