diff options
| -rw-r--r-- | tests/.gitignore | 38 | ||||
| -rw-r--r-- | tests/Makefile.am | 80 | ||||
| -rw-r--r-- | tests/alloc_extra.l (renamed from tests/alloc-extra.l) | 0 | ||||
| -rw-r--r-- | tests/alloc_extra.txt (renamed from tests/alloc-extra.txt) | 0 | ||||
| -rw-r--r-- | tests/array_nr.l (renamed from tests/array-nr.l) | 0 | ||||
| -rw-r--r-- | tests/array_nr.txt (renamed from tests/array-nr.txt) | 0 | ||||
| -rw-r--r-- | tests/array_r.l (renamed from tests/array-r.l) | 0 | ||||
| -rw-r--r-- | tests/array_r.txt (renamed from tests/array-r.txt) | 0 | ||||
| -rw-r--r-- | tests/basic_nr.l (renamed from tests/basic-nr.l) | 0 | ||||
| -rw-r--r-- | tests/basic_nr.txt (renamed from tests/basic-nr.txt) | 0 | ||||
| -rw-r--r-- | tests/basic_r.l (renamed from tests/basic-r.l) | 0 | ||||
| -rw-r--r-- | tests/basic_r.txt (renamed from tests/basic-r.txt) | 0 | ||||
| -rw-r--r-- | tests/bison_nr.txt (renamed from tests/bison-nr.txt) | 0 | ||||
| -rw-r--r-- | tests/bison_nr_main.c (renamed from tests/bison-nr-main.c) | 4 | ||||
| -rw-r--r-- | tests/bison_nr_parser.y (renamed from tests/bison-nr-parser.y) | 0 | ||||
| -rw-r--r-- | tests/bison_nr_scanner.l (renamed from tests/bison-nr-scanner.l) | 4 | ||||
| -rw-r--r-- | tests/bison_yylloc.txt (renamed from tests/bison-yylloc.txt) | 0 | ||||
| -rw-r--r-- | tests/bison_yylloc_main.c (renamed from tests/bison-yylloc-main.c) | 4 | ||||
| -rw-r--r-- | tests/bison_yylloc_parser.y (renamed from tests/bison-yylloc-parser.y) | 2 | ||||
| -rw-r--r-- | tests/bison_yylloc_scanner.l (renamed from tests/bison-yylloc-scanner.l) | 4 | ||||
| -rw-r--r-- | tests/bison_yylval.txt (renamed from tests/bison-yylval.txt) | 0 | ||||
| -rw-r--r-- | tests/bison_yylval_main.c (renamed from tests/bison-yylval-main.c) | 4 | ||||
| -rw-r--r-- | tests/bison_yylval_parser.y (renamed from tests/bison-yylval-parser.y) | 0 | ||||
| -rw-r--r-- | tests/bison_yylval_scanner.l (renamed from tests/bison-yylval-scanner.l) | 4 |
24 files changed, 72 insertions, 72 deletions
diff --git a/tests/.gitignore b/tests/.gitignore index ad65bd9..dd220f7 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -1,22 +1,22 @@ *.log *.trs *.o -alloc-extra -alloc-extra.c -array-nr -array-nr.c -array-r -array-r.c -basic-nr -basic-nr.c -basic-r -basic-r.c -bison-nr -bison-nr-scanner.[ch] -bison-nr-parser.[ch] -bison-yylloc -bison-yylloc-parser.[ch] -bison-yylloc-scanner.[ch] -bison-yylval -bison-yylval-parser.[ch] -bison-yylval-scanner.[ch] +alloc_extra +alloc_extra.c +array_nr +array_nr.c +array_r +array_r.c +basic_nr +basic_nr.c +basic_r +basic_r.c +bison_nr +bison_nr_scanner.[ch] +bison_nr_parser.[ch] +bison_yylloc +bison_yylloc_parser.[ch] +bison_yylloc_scanner.[ch] +bison_yylval +bison_yylval_parser.[ch] +bison_yylval_scanner.[ch] diff --git a/tests/Makefile.am b/tests/Makefile.am index b94c661..5f80be7 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -27,46 +27,46 @@ AM_LOG_FLAGS = $(srcdir) AM_YFLAGS = -d -p test check_PROGRAMS = \ - alloc-extra \ - array-nr \ - array-r \ - basic-nr \ - basic-r \ - bison-nr \ - bison-yylloc \ - bison-yylval - -alloc_extra_SOURCES = alloc-extra.l -array_nr_SOURCES = array-nr.l -array_r_SOURCES = array-r.l -basic_nr_SOURCES = basic-nr.l -basic_r_SOURCES = basic-r.l -bison_nr_SOURCES = bison-nr-scanner.l bison-nr-parser.y bison-nr-main.c -bison_yylloc_SOURCES = bison-yylloc-scanner.l bison-yylloc-parser.y bison-yylloc-main.c -bison_yylval_SOURCES = bison-yylval-scanner.l bison-yylval-parser.y bison-yylval-main.c + alloc_extra \ + array_nr \ + array_r \ + basic_nr \ + basic_r \ + bison_nr \ + bison_yylloc \ + bison_yylval + +alloc_extra_SOURCES = alloc_extra.l +array_nr_SOURCES = array_nr.l +array_r_SOURCES = array_r.l +basic_nr_SOURCES = basic_nr.l +basic_r_SOURCES = basic_r.l +bison_nr_SOURCES = bison_nr_scanner.l bison_nr_parser.y bison_nr_main.c +bison_yylloc_SOURCES = bison_yylloc_scanner.l bison_yylloc_parser.y bison_yylloc_main.c +bison_yylval_SOURCES = bison_yylval_scanner.l bison_yylval_parser.y bison_yylval_main.c BUILT_SOURCES = \ - bison-nr-scanner.h \ - bison-nr-parser.h \ - bison-yylloc-parser.h \ - bison-yylloc-scanner.h \ - bison-yylval-parser.h \ - bison-yylval-scanner.h + bison_nr_scanner.h \ + bison_nr_parser.h \ + bison_yylloc_parser.h \ + bison_yylloc_scanner.h \ + bison_yylval_parser.h \ + bison_yylval_scanner.h EXTRA_DIST = \ README \ testwrapper.sh \ - alloc-extra.txt \ - array-nr.txt \ - array-r.txt \ -basic-nr.txt \ - basic-r.txt \ - bison-nr-scanner.h \ - bison-nr.txt \ - bison-yylloc-scanner.h \ - bison-yylloc.txt \ - bison-yylval-scanner.h \ - bison-yylval.txt + alloc_extra.txt \ + array_nr.txt \ + array_r.txt \ +basic_nr.txt \ + basic_r.txt \ + bison_nr_scanner.h \ + bison_nr.txt \ + bison_yylloc_scanner.h \ + bison_yylloc.txt \ + bison_yylval_scanner.h \ + bison_yylval.txt # specify how to process .l files in order to test the flex built by make all @@ -75,11 +75,11 @@ FLEX = $(top_builddir)/src/flex .l.c: $(FLEX) -o $@ $< -bison-nr-main($objext): bison-nr-parser.h bison-nr-scanner.h -bison-nr-scanner.h: bison-nr-scanner.c +bison_nr_main($objext): bison_nr_parser.h bison_nr_scanner.h +bison_nr_scanner.h: bison_nr_scanner.c -bison-yylloc-main$(objext): bison-yylloc-parser.h bison-yylloc-scanner.h -bison-yylloc-scanner.h: bison-yylloc-scanner.c +bison_yylloc_main$(objext): bison_yylloc_parser.h bison_yylloc_scanner.h +bison_yylloc_scanner.h: bison_yylloc_scanner.c -bison-yylval-main$(objext): bison-yylval-parser.h bison-yylval-scanner.h -bison-yylval-scanner.h: bison-yylval-scanner.c +bison_yylval_main$(objext): bison_yylval_parser.h bison_yylval_scanner.h +bison_yylval_scanner.h: bison_yylval_scanner.c diff --git a/tests/alloc-extra.l b/tests/alloc_extra.l index 14e1837..14e1837 100644 --- a/tests/alloc-extra.l +++ b/tests/alloc_extra.l diff --git a/tests/alloc-extra.txt b/tests/alloc_extra.txt index 243df29..243df29 100644 --- a/tests/alloc-extra.txt +++ b/tests/alloc_extra.txt diff --git a/tests/array-nr.l b/tests/array_nr.l index d961ee9..d961ee9 100644 --- a/tests/array-nr.l +++ b/tests/array_nr.l diff --git a/tests/array-nr.txt b/tests/array_nr.txt index 7288a40..7288a40 100644 --- a/tests/array-nr.txt +++ b/tests/array_nr.txt diff --git a/tests/array-r.l b/tests/array_r.l index 0285240..0285240 100644 --- a/tests/array-r.l +++ b/tests/array_r.l diff --git a/tests/array-r.txt b/tests/array_r.txt index 7288a40..7288a40 100644 --- a/tests/array-r.txt +++ b/tests/array_r.txt diff --git a/tests/basic-nr.l b/tests/basic_nr.l index 7109b2b..7109b2b 100644 --- a/tests/basic-nr.l +++ b/tests/basic_nr.l diff --git a/tests/basic-nr.txt b/tests/basic_nr.txt index 642e0fb..642e0fb 100644 --- a/tests/basic-nr.txt +++ b/tests/basic_nr.txt diff --git a/tests/basic-r.l b/tests/basic_r.l index 425af7c..425af7c 100644 --- a/tests/basic-r.l +++ b/tests/basic_r.l diff --git a/tests/basic-r.txt b/tests/basic_r.txt index 2160628..2160628 100644 --- a/tests/basic-r.txt +++ b/tests/basic_r.txt diff --git a/tests/bison-nr.txt b/tests/bison_nr.txt index 94adcb2..94adcb2 100644 --- a/tests/bison-nr.txt +++ b/tests/bison_nr.txt diff --git a/tests/bison-nr-main.c b/tests/bison_nr_main.c index edc4d14..2585750 100644 --- a/tests/bison-nr-main.c +++ b/tests/bison_nr_main.c @@ -21,8 +21,8 @@ * PURPOSE. */ -#include "bison-nr-parser.h" -#include "bison-nr-scanner.h" +#include "bison_nr_parser.h" +#include "bison_nr_scanner.h" extern int testparse(void); diff --git a/tests/bison-nr-parser.y b/tests/bison_nr_parser.y index 2cbf9aa..2cbf9aa 100644 --- a/tests/bison-nr-parser.y +++ b/tests/bison_nr_parser.y diff --git a/tests/bison-nr-scanner.l b/tests/bison_nr_scanner.l index 4d35095..154d12b 100644 --- a/tests/bison-nr-scanner.l +++ b/tests/bison_nr_scanner.l @@ -25,7 +25,7 @@ /* The scanner expects to link to bison yylval . */ #include <stdio.h> #include <stdlib.h> -#include "bison-nr-parser.h" +#include "bison_nr_parser.h" #include "config.h" static char* STRDUP(char* s1); #define YY_EXTRA_TYPE int @@ -34,7 +34,7 @@ static char* STRDUP(char* s1); %option 8bit prefix="test" %option bison-locations yylineno %option nomain nounput noyy_top_state noyywrap nodefault warn -%option prefix="test" header="bison-nr-scanner.h" yylineno +%option prefix="test" header="bison_nr_scanner.h" yylineno %% diff --git a/tests/bison-yylloc.txt b/tests/bison_yylloc.txt index 94adcb2..94adcb2 100644 --- a/tests/bison-yylloc.txt +++ b/tests/bison_yylloc.txt diff --git a/tests/bison-yylloc-main.c b/tests/bison_yylloc_main.c index ba56219..f9fb63d 100644 --- a/tests/bison-yylloc-main.c +++ b/tests/bison_yylloc_main.c @@ -21,8 +21,8 @@ * PURPOSE. */ -#include "bison-yylloc-parser.h" -#include "bison-yylloc-scanner.h" +#include "bison_yylloc_parser.h" +#include "bison_yylloc_scanner.h" int main ( int argc, char** argv ) { diff --git a/tests/bison-yylloc-parser.y b/tests/bison_yylloc_parser.y index 87cb501..d2dfc13 100644 --- a/tests/bison-yylloc-parser.y +++ b/tests/bison_yylloc_parser.y @@ -26,7 +26,7 @@ /* How to compile: - bison --defines --output-file="bison-yylloc-parser.c" --name-prefix="test" parser.y + bison --defines --output-file="bison_yylloc_parser.c" --name-prefix="test" parser.y */ %{ #include <stdio.h> diff --git a/tests/bison-yylloc-scanner.l b/tests/bison_yylloc_scanner.l index dbcc237..b4bb9f7 100644 --- a/tests/bison-yylloc-scanner.l +++ b/tests/bison_yylloc_scanner.l @@ -25,7 +25,7 @@ /* The scanner expects to link to bison yylval . */ #include <stdio.h> #include <stdlib.h> -#include "bison-yylloc-parser.h" +#include "bison_yylloc_parser.h" #include "config.h" static char* STRDUP(char* s1); #define YY_EXTRA_TYPE int @@ -34,7 +34,7 @@ static char* STRDUP(char* s1); %option 8bit prefix="test" %option reentrant bison-bridge bison-locations yylineno %option nomain nounput noyy_top_state noyywrap nodefault warn -%option header="bison-yylloc-scanner.h" +%option header="bison_yylloc_scanner.h" %% diff --git a/tests/bison-yylval.txt b/tests/bison_yylval.txt index 846f206..846f206 100644 --- a/tests/bison-yylval.txt +++ b/tests/bison_yylval.txt diff --git a/tests/bison-yylval-main.c b/tests/bison_yylval_main.c index 5a0b4e8..f615c4b 100644 --- a/tests/bison-yylval-main.c +++ b/tests/bison_yylval_main.c @@ -21,8 +21,8 @@ * PURPOSE. */ -#include "bison-yylval-parser.h" -#include "bison-yylval-scanner.h" +#include "bison_yylval_parser.h" +#include "bison_yylval_scanner.h" int main ( int argc, char** argv ) { diff --git a/tests/bison-yylval-parser.y b/tests/bison_yylval_parser.y index 626c5e7..626c5e7 100644 --- a/tests/bison-yylval-parser.y +++ b/tests/bison_yylval_parser.y diff --git a/tests/bison-yylval-scanner.l b/tests/bison_yylval_scanner.l index 93e33ee..4608bf3 100644 --- a/tests/bison-yylval-scanner.l +++ b/tests/bison_yylval_scanner.l @@ -25,7 +25,7 @@ /* The scanner expects to link to bison yylval . */ #include <stdio.h> #include <stdlib.h> -#include "bison-yylval-parser.h" +#include "bison_yylval_parser.h" #include "config.h" static char* STRDUP(char* s1); @@ -36,7 +36,7 @@ enum yesno_t { no=0, yes=1 }; %option 8bit prefix="test" %option reentrant bison-bridge %option noyywrap nomain nounput noyy_top_state noyywrap nodefault warn -%option header="bison-yylval-scanner.h" +%option header="bison_yylval_scanner.h" %option stack |