You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(4) |
Jun
(35) |
Jul
(11) |
Aug
(5) |
Sep
|
Oct
(1) |
Nov
(2) |
Dec
|
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
(10) |
Feb
(33) |
Mar
(8) |
Apr
(60) |
May
(40) |
Jun
(13) |
Jul
(3) |
Aug
(10) |
Sep
|
Oct
|
Nov
|
Dec
|
2008 |
Jan
(19) |
Feb
(14) |
Mar
(38) |
Apr
(3) |
May
(10) |
Jun
|
Jul
|
Aug
(6) |
Sep
(2) |
Oct
|
Nov
(13) |
Dec
(1) |
2009 |
Jan
(5) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2011 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
2012 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2013 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(4) |
Jul
(1) |
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
(6) |
2014 |
Jan
(2) |
Feb
(3) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(11) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
2015 |
Jan
(13) |
Feb
(5) |
Mar
(1) |
Apr
|
May
(1) |
Jun
|
Jul
(12) |
Aug
|
Sep
|
Oct
|
Nov
(2) |
Dec
(1) |
2016 |
Jan
(3) |
Feb
(5) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
(1) |
Nov
|
Dec
|
2017 |
Jan
(1) |
Feb
|
Mar
(2) |
Apr
(3) |
May
(2) |
Jun
|
Jul
(1) |
Aug
(1) |
Sep
(1) |
Oct
|
Nov
|
Dec
(2) |
2018 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2019 |
Jan
|
Feb
(2) |
Mar
(1) |
Apr
(1) |
May
(2) |
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
2020 |
Jan
(2) |
Feb
(3) |
Mar
|
Apr
(1) |
May
(4) |
Jun
|
Jul
(3) |
Aug
(1) |
Sep
(5) |
Oct
(9) |
Nov
(5) |
Dec
(3) |
2021 |
Jan
(1) |
Feb
(3) |
Mar
(2) |
Apr
(3) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
(1) |
Nov
(2) |
Dec
(1) |
2022 |
Jan
(2) |
Feb
(4) |
Mar
(4) |
Apr
(2) |
May
(2) |
Jun
(4) |
Jul
(3) |
Aug
(5) |
Sep
(1) |
Oct
(3) |
Nov
(1) |
Dec
(2) |
2023 |
Jan
(2) |
Feb
|
Mar
(2) |
Apr
|
May
(3) |
Jun
(2) |
Jul
(1) |
Aug
(1) |
Sep
|
Oct
(1) |
Nov
(1) |
Dec
(1) |
2024 |
Jan
(1) |
Feb
(4) |
Mar
(7) |
Apr
(1) |
May
(1) |
Jun
(2) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <he...@us...> - 2006-08-05 11:43:57
|
Revision: 605 Author: helly Date: 2006-08-05 04:43:48 -0700 (Sat, 05 Aug 2006) ViewCVS: http://svn.sourceforge.net/re2c/?rev=605&view=rev Log Message: ----------- - Synch Makefile.am from 0.10.6 and trunk and excluding .svn dirs in distributions Modified Paths: -------------- tags/RELEASE_0_10_6/Makefile.am trunk/re2c/Makefile.am Modified: tags/RELEASE_0_10_6/Makefile.am =================================================================== --- tags/RELEASE_0_10_6/Makefile.am 2006-08-05 11:18:32 UTC (rev 604) +++ tags/RELEASE_0_10_6/Makefile.am 2006-08-05 11:43:48 UTC (rev 605) @@ -15,7 +15,7 @@ YFLAGS = -d RE2C = re2c$(EXEEXT) -RE2CFLAGS = -s +RE2CFLAGS = -b CLEANFILES = parser.cc y.tab.c y.tab.h scanner.cc re2c.1 .version @@ -27,10 +27,10 @@ EXTRA_ZIP = $(EXTRA_SRC) config_w32.h *.sln *.vcproj dist-hook: re2c.spec - rm -rf `find $(distdir)/doc -name CVS` - rm -rf `find $(distdir)/examples -name CVS` - rm -rf `find $(distdir)/test -name CVS` - rm -rf `find $(distdir)/lessons -name CVS -o -name .cvsignore` + rm -rf `find $(distdir)/doc -name .svn` + rm -rf `find $(distdir)/examples -name .svn` + rm -rf `find $(distdir)/test -name .svn -o -name .cvsignore` + rm -rf `find $(distdir)/lessons -name .svn -o -name .cvsignore` rpm-files: $(bin_PROGRAMS) $(EXTRA_DIST) Modified: trunk/re2c/Makefile.am =================================================================== --- trunk/re2c/Makefile.am 2006-08-05 11:18:32 UTC (rev 604) +++ trunk/re2c/Makefile.am 2006-08-05 11:43:48 UTC (rev 605) @@ -11,7 +11,7 @@ man_MANS = re2c.1 #CXXFLAGS = -O2 -Wall -Wno-unused -Wno-parentheses -Wno-deprecated -#CXXFLAGS = -O0 -ggdb -Wall -Wextra -pedantic -Wconversion -Wpointer-arith -Wwrite-strings -Wredundant-decls -Werror -Wunused-function -DPEDANTIC +#CXXFLAGS = -O2 -Wall -Wextra -pedantic -Wconversion -Wpointer-arith -Wwrite-strings -Wredundant-decls -Werror -Wunused-function -DPEDANTIC YFLAGS = -d RE2C = re2c$(EXEEXT) @@ -27,10 +27,10 @@ EXTRA_ZIP = $(EXTRA_SRC) config_w32.h *.sln *.vcproj dist-hook: re2c.spec - rm -rf `find $(distdir)/doc -name CVS` - rm -rf `find $(distdir)/examples -name CVS` - rm -rf `find $(distdir)/test -name CVS` - rm -rf `find $(distdir)/lessons -name CVS -o -name .cvsignore` + rm -rf `find $(distdir)/doc -name .svn` + rm -rf `find $(distdir)/examples -name .svn` + rm -rf `find $(distdir)/test -name .svn -o -name .cvsignore` + rm -rf `find $(distdir)/lessons -name .svn -o -name .cvsignore` rpm-files: $(bin_PROGRAMS) $(EXTRA_DIST) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2006-08-05 11:18:42
|
Revision: 604 Author: helly Date: 2006-08-05 04:18:32 -0700 (Sat, 05 Aug 2006) ViewCVS: http://svn.sourceforge.net/re2c/?rev=604&view=rev Log Message: ----------- - Under SUN C++ 5.8 -compat5 is not really required Modified Paths: -------------- tags/RELEASE_0_10_6/README.in tags/RELEASE_0_10_6/htdocs/index.html trunk/re2c/README.in trunk/re2c/htdocs/index.html Modified: tags/RELEASE_0_10_6/README.in =================================================================== --- tags/RELEASE_0_10_6/README.in 2006-08-05 11:07:10 UTC (rev 603) +++ tags/RELEASE_0_10_6/README.in 2006-08-05 11:18:32 UTC (rev 604) @@ -17,7 +17,7 @@ - GCC 3.3 ... 4.1 - Microsoft VC 7, 7.1, 8 - Intel 9.0 -- Sun C++ 5.8 (CXXFLAGS='-compat5 -library=stlport4') +- Sun C++ 5.8 (CXXFLAGS='-library=stlport4') - MIPSpro Compilers: Version 7.4.4m GCC 2.x and Microsoft VC 6 are not capable of compiling re2c. Modified: tags/RELEASE_0_10_6/htdocs/index.html =================================================================== --- tags/RELEASE_0_10_6/htdocs/index.html 2006-08-05 11:07:10 UTC (rev 603) +++ tags/RELEASE_0_10_6/htdocs/index.html 2006-08-05 11:18:32 UTC (rev 604) @@ -132,7 +132,7 @@ <li>Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 13.10.3077 for 80x86 (Mictosoft Visual C++ 2003)</li> <li>Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 13.00.9466 for 80x86 (Microsoft Visual C++ 2002)</li> <li>Intel(R) C++ Compiler for Intel(R) EM64T-based applications, Version 9.0 Build 20050430 Package ID: l_cc_p_9.0.021</li> -<li>CC: Sun C++ 5.8 2005/10/13 (CXXFLAGS='-compat5 -library=stlport4')</li> +<li>CC: Sun C++ 5.8 2005/10/13 (CXXFLAGS='-library=stlport4')</li> </ul> <ul> <li>bison 2.1, 1.875d, 1.875b, 1.875 Modified: trunk/re2c/README.in =================================================================== --- trunk/re2c/README.in 2006-08-05 11:07:10 UTC (rev 603) +++ trunk/re2c/README.in 2006-08-05 11:18:32 UTC (rev 604) @@ -17,7 +17,7 @@ - GCC 3.3 ... 4.1 - Microsoft VC 7, 7.1, 8 - Intel 9.0 -- Sun C++ 5.8 (CXXFLAGS='-compat5 -library=stlport4') +- Sun C++ 5.8 (CXXFLAGS='-library=stlport4') - MIPSpro Compilers: Version 7.4.4m GCC 2.x and Microsoft VC 6 are not capable of compiling re2c. Modified: trunk/re2c/htdocs/index.html =================================================================== --- trunk/re2c/htdocs/index.html 2006-08-05 11:07:10 UTC (rev 603) +++ trunk/re2c/htdocs/index.html 2006-08-05 11:18:32 UTC (rev 604) @@ -132,7 +132,7 @@ <li>Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 13.10.3077 for 80x86 (Mictosoft Visual C++ 2003)</li> <li>Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 13.00.9466 for 80x86 (Microsoft Visual C++ 2002)</li> <li>Intel(R) C++ Compiler for Intel(R) EM64T-based applications, Version 9.0 Build 20050430 Package ID: l_cc_p_9.0.021</li> -<li>CC: Sun C++ 5.8 2005/10/13 (CXXFLAGS='-compat5 -library=stlport4')</li> +<li>CC: Sun C++ 5.8 2005/10/13 (CXXFLAGS='-library=stlport4')</li> </ul> <ul> <li>bison 2.1, 1.875d, 1.875b, 1.875 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2006-08-05 11:07:20
|
Revision: 603 Author: helly Date: 2006-08-05 04:07:10 -0700 (Sat, 05 Aug 2006) ViewCVS: http://svn.sourceforge.net/re2c/?rev=603&view=rev Log Message: ----------- - Add new example Added Paths: ----------- trunk/re2c/examples/pp-c.re Added: trunk/re2c/examples/pp-c.re =================================================================== --- trunk/re2c/examples/pp-c.re (rev 0) +++ trunk/re2c/examples/pp-c.re 2006-08-05 11:07:10 UTC (rev 603) @@ -0,0 +1,295 @@ +#include <stdlib.h> +#include <stdio.h> +#include <string.h> + +#define ADDEQ 257 +#define ANDAND 258 +#define ANDEQ 259 +#define ARRAY 260 +#define ASM 261 +#define AUTO 262 +#define BREAK 263 +#define CASE 264 +#define CHAR 265 +#define CONST 266 +#define CONTINUE 267 +#define DECR 268 +#define DEFAULT 269 +#define DEREF 270 +#define DIVEQ 271 +#define DO 272 +#define DOUBLE 273 +#define ELLIPSIS 274 +#define ELSE 275 +#define ENUM 276 +#define EQL 277 +#define EXTERN 278 +#define FCON 279 +#define FLOAT 280 +#define FOR 281 +#define FUNCTION 282 +#define GEQ 283 +#define GOTO 284 +#define ICON 285 +#define ID 286 +#define IF 287 +#define INCR 288 +#define INT 289 +#define LEQ 290 +#define LONG 291 +#define LSHIFT 292 +#define LSHIFTEQ 293 +#define MODEQ 294 +#define MULEQ 295 +#define NEQ 296 +#define OREQ 297 +#define OROR 298 +#define POINTER 299 +#define REGISTER 300 +#define RETURN 301 +#define RSHIFT 302 +#define RSHIFTEQ 303 +#define SCON 304 +#define SHORT 305 +#define SIGNED 306 +#define SIZEOF 307 +#define STATIC 308 +#define STRUCT 309 +#define SUBEQ 310 +#define SWITCH 311 +#define TYPEDEF 312 +#define UNION 313 +#define UNSIGNED 314 +#define VOID 315 +#define VOLATILE 316 +#define WHILE 317 +#define XOREQ 318 +#define EOI 319 +#define PP_INCLUDE 500 +#define PP_LINE 501 +#define PP_DEFINE 502 +#define PP_UNDEF 503 +#define PP_IF 504 +#define PP_IFDEF 505 +#define PP_IFNDEF 506 +#define PP_ELSE 507 +#define PP_ELIF 508 +#define PP_ENDIF 509 +#define PP_ERROR 510 + +typedef unsigned int uint; +typedef unsigned char uchar; + +#define BSIZE 12 +//8192 + +#define YYCTYPE uchar +#define YYCURSOR cursor +#define YYLIMIT s->lim +#define YYMARKER s->ptr +#define YYFILL(n) {cursor = fill(s, cursor);} + +#define RET(i) {s->cur = cursor; return i;} + +typedef struct Scanner { + int fd; + uchar *bot, *tok, *ptr, *cur, *pos, *lim, *top, *eof; + uint line; +} Scanner; + +uchar *fill(Scanner *s, uchar *cursor){ + if(!s->eof) { + uint cnt = s->tok - s->bot; + if(cnt){ + memcpy(s->bot, s->tok, s->lim - s->tok); + s->tok = s->bot; + s->ptr -= cnt; + cursor -= cnt; + s->pos -= cnt; + s->lim -= cnt; + } + if((s->top - s->lim) < BSIZE){ + uchar *buf = (uchar*) malloc(((s->lim - s->bot) + BSIZE)*sizeof(uchar)); + memcpy(buf, s->tok, s->lim - s->tok); + s->tok = buf; + s->ptr = &buf[s->ptr - s->bot]; + cursor = &buf[cursor - s->bot]; + s->pos = &buf[s->pos - s->bot]; + s->lim = &buf[s->lim - s->bot]; + s->top = &s->lim[BSIZE]; + free(s->bot); + s->bot = buf; + } + if((cnt = read(s->fd, (char*) s->lim, BSIZE)) != BSIZE){ + s->eof = &s->lim[cnt]; *(s->eof)++ = '\n'; + } + s->lim += cnt; + } + return cursor; +} + +int scan(Scanner *s){ + uchar *cursor = s->cur; +std: + s->tok = cursor; +/*!re2c +any = [\000-\377]; +O = [0-7]; +D = [0-9]; +L = [a-zA-Z_]; +H = [a-fA-F0-9]; +E = [Ee] [+-]? D+; +FS = [fFlL]; +IS = [uUlL]*; +ESC = [\\] ([abfnrtv?'"\\] | "x" H+ | O+); +PP = "#" [ \t]*; +*/ + +/*!re2c + "/*" { goto comment; } + + "auto" { RET(AUTO); } + "break" { RET(BREAK); } + "case" { RET(CASE); } + "char" { RET(CHAR); } + "const" { RET(CONST); } + "continue" { RET(CONTINUE); } + "default" { RET(DEFAULT); } + "do" { RET(DO); } + "double" { RET(DOUBLE); } + "else" { RET(ELSE); } + "enum" { RET(ENUM); } + "extern" { RET(EXTERN); } + "float" { RET(FLOAT); } + "for" { RET(FOR); } + "goto" { RET(GOTO); } + "if" { RET(IF); } + "int" { RET(INT); } + "long" { RET(LONG); } + "register" { RET(REGISTER); } + "return" { RET(RETURN); } + "short" { RET(SHORT); } + "signed" { RET(SIGNED); } + "sizeof" { RET(SIZEOF); } + "static" { RET(STATIC); } + "struct" { RET(STRUCT); } + "switch" { RET(SWITCH); } + "typedef" { RET(TYPEDEF); } + "union" { RET(UNION); } + "unsigned" { RET(UNSIGNED); } + "void" { RET(VOID); } + "volatile" { RET(VOLATILE); } + "while" { RET(WHILE); } + + L (L|D)* { RET(ID); } + + ("0" [xX] H+ IS?) | ("0" D+ IS?) | (D+ IS?) | + (['] (ESC|any\[\n\\'])* [']) + { RET(ICON); } + + (D+ E FS?) | (D* "." D+ E? FS?) | (D+ "." D* E? FS?) + { RET(FCON); } + + (["] (ESC|any\[\n\\"])* ["]) + { RET(SCON); } + + "..." { RET(ELLIPSIS); } + ">>=" { RET(RSHIFTEQ); } + "<<=" { RET(LSHIFTEQ); } + "+=" { RET(ADDEQ); } + "-=" { RET(SUBEQ); } + "*=" { RET(MULEQ); } + "/=" { RET(DIVEQ); } + "%=" { RET(MODEQ); } + "&=" { RET(ANDEQ); } + "^=" { RET(XOREQ); } + "|=" { RET(OREQ); } + ">>" { RET(RSHIFT); } + "<<" { RET(LSHIFT); } + "++" { RET(INCR); } + "--" { RET(DECR); } + "->" { RET(DEREF); } + "&&" { RET(ANDAND); } + "||" { RET(OROR); } + "<=" { RET(LEQ); } + ">=" { RET(GEQ); } + "==" { RET(EQL); } + "!=" { RET(NEQ); } + ";" { RET(';'); } + "{" { RET('{'); } + "}" { RET('}'); } + "," { RET(','); } + ":" { RET(':'); } + "=" { RET('='); } + "(" { RET('('); } + ")" { RET(')'); } + "[" { RET('['); } + "]" { RET(']'); } + "." { RET('.'); } + "&" { RET('&'); } + "!" { RET('!'); } + "~" { RET('~'); } + "-" { RET('-'); } + "+" { RET('+'); } + "*" { RET('*'); } + "/" { RET('/'); } + "%" { RET('%'); } + "<" { RET('<'); } + ">" { RET('>'); } + "^" { RET('^'); } + "|" { RET('|'); } + "?" { RET('?'); } + + PP "include" { RET(PP_INCLUDE); } + PP "line" { RET(PP_LINE); } + PP "define" { RET(PP_DEFINE); } + PP "undef" { RET(PP_UNDEF); } + PP "if" { RET(PP_IF); } + PP "ifdef" { RET(PP_IFDEF); } + PP "ifndef" { RET(PP_IFNDEF); } + PP "else" { RET(PP_ELSE); } + PP "elif" { RET(PP_ELIF); } + PP "endif" { RET(PP_ENDIF); } + PP "error" { RET(PP_ERROR); } + + [ \t\v\f]+ { goto std; } + + "\n" + { + if(cursor == s->eof) RET(EOI); + s->pos = cursor; s->line++; + goto std; + } + + any + { + printf("unexpected character: %c\n", *s->tok); + goto std; + } +*/ + +comment: +/*!re2c + "*/" { goto std; } + "\n" + { + if(cursor == s->eof) RET(EOI); + s->tok = s->pos = cursor; s->line++; + goto comment; + } + any { goto comment; } +*/ +} + +main(){ + Scanner in; + int t; + memset((char*) &in, 0, sizeof(in)); + in.fd = 0; + while((t = scan(&in)) != EOI){ + + printf("%d\t%.*s\n", t, in.cur - in.tok, in.tok); + + } + close(in.fd); +} Property changes on: trunk/re2c/examples/pp-c.re ___________________________________________________________________ Name: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2006-07-29 20:22:52
|
Revision: 602 Author: helly Date: 2006-07-29 13:21:54 -0700 (Sat, 29 Jul 2006) ViewCVS: http://svn.sourceforge.net/re2c/?rev=602&view=rev Log Message: ----------- - Fixed #1529351 Segv bug on unterminated code blocks Modified Paths: -------------- trunk/re2c/CHANGELOG trunk/re2c/bootstrap/parser.cc trunk/re2c/bootstrap/scanner.cc trunk/re2c/parser.y trunk/re2c/scanner.re Added Paths: ----------- trunk/re2c/test/bug1529351.c trunk/re2c/test/bug1529351.re Modified: trunk/re2c/CHANGELOG =================================================================== --- trunk/re2c/CHANGELOG 2006-07-29 20:20:50 UTC (rev 601) +++ trunk/re2c/CHANGELOG 2006-07-29 20:21:54 UTC (rev 602) @@ -1,5 +1,9 @@ Version 0.11.0 (????-??-??) --------------------------- + +Version 0.10.6 (2006-??-??) +--------------------------- +- Fixed #1529351 Segv bug on unterminated code blocks - Fixed #1528269 Invalid code generation. Version 0.10.5 (2006-06-11) Modified: trunk/re2c/bootstrap/parser.cc =================================================================== --- trunk/re2c/bootstrap/parser.cc 2006-07-29 20:20:50 UTC (rev 601) +++ trunk/re2c/bootstrap/parser.cc 2006-07-29 20:21:54 UTC (rev 602) @@ -113,7 +113,7 @@ static re2c::uint accept; static RegExp *spec; -static Scanner *in; +static Scanner *in = NULL; /* Bison version 1.875 emits a definition that is not working * with several g++ version. Hence we disable it here. @@ -1609,7 +1609,7 @@ } int yylex(){ - return in->scan(); + return in ? in->scan() : 0; } } // end extern "C" @@ -1639,6 +1639,7 @@ RegExp::vFreeList.clear(); Range::vFreeList.clear(); Symbol::ClearTable(); + in = NULL; } } // end namespace re2c Modified: trunk/re2c/bootstrap/scanner.cc =================================================================== --- trunk/re2c/bootstrap/scanner.cc 2006-07-29 20:20:50 UTC (rev 601) +++ trunk/re2c/bootstrap/scanner.cc 2006-07-29 20:21:54 UTC (rev 602) @@ -1,4 +1,4 @@ -/* Generated by re2c 0.11.0.dev on Thu Jul 27 03:06:48 2006 */ +/* Generated by re2c 0.11.0.dev on Sat Jul 29 22:25:10 2006 */ #line 1 "scanner.re" /* $Id$ */ #include <stdlib.h> @@ -94,7 +94,7 @@ echo: { -#line 98 "<stdout>" +#line 98 "scanner.cc" { YYCTYPE yych; unsigned int yyaccept = 0; @@ -117,7 +117,7 @@ { goto echo; } -#line 121 "<stdout>" +#line 121 "scanner.cc" yy4: yych = *++YYCURSOR; if(yych == '/') goto yy10; @@ -134,7 +134,7 @@ tok = pos = cursor; cline++; goto echo; } -#line 138 "<stdout>" +#line 138 "scanner.cc" yy7: ++YYCURSOR; #line 176 "scanner.re" @@ -146,7 +146,7 @@ RETURN(0); } } -#line 150 "<stdout>" +#line 150 "scanner.cc" yy9: yych = *++YYCURSOR; goto yy3; @@ -170,7 +170,7 @@ tok = pos = cursor; goto echo; } -#line 174 "<stdout>" +#line 174 "scanner.cc" yy12: yych = *++YYCURSOR; if(yych == 0x0A) goto yy14; @@ -198,7 +198,7 @@ tok = pos = cursor; goto echo; } -#line 202 "<stdout>" +#line 202 "scanner.cc" yy16: yych = *++YYCURSOR; if(yych != '!') goto yy13; @@ -239,7 +239,7 @@ tok = cursor; RETURN(1); } -#line 243 "<stdout>" +#line 243 "scanner.cc" yy26: yych = *++YYCURSOR; if(yych != 'x') goto yy13; @@ -265,7 +265,7 @@ bUsedYYMaxFill = true; goto echo; } -#line 269 "<stdout>" +#line 269 "scanner.cc" yy34: yych = *++YYCURSOR; if(yych != 't') goto yy13; @@ -297,7 +297,7 @@ ignore_eoc = true; goto echo; } -#line 301 "<stdout>" +#line 301 "scanner.cc" yy47: yych = *++YYCURSOR; if(yych != 'n') goto yy13; @@ -324,7 +324,7 @@ ignore_eoc = true; goto echo; } -#line 328 "<stdout>" +#line 328 "scanner.cc" } } #line 187 "scanner.re" @@ -385,7 +385,7 @@ 112, 112, 112, 112, 112, 112, 112, 112, }; -#line 389 "<stdout>" +#line 389 "scanner.cc" { YYCTYPE yych; unsigned int yyaccept = 0; @@ -463,14 +463,14 @@ { depth = 1; goto code; } -#line 467 "<stdout>" +#line 467 "scanner.cc" yy62: ++YYCURSOR; if((yych = *YYCURSOR) == '*') goto yy121; yy63: #line 239 "scanner.re" { RETURN(*tok); } -#line 474 "<stdout>" +#line 474 "scanner.cc" yy64: ++YYCURSOR; if((yych = *YYCURSOR) == '/') goto yy119; @@ -478,7 +478,7 @@ #line 241 "scanner.re" { yylval.op = *tok; RETURN(CLOSE); } -#line 482 "<stdout>" +#line 482 "scanner.cc" yy66: yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); @@ -486,7 +486,7 @@ yy67: #line 226 "scanner.re" { fatal("unterminated string constant (missing \")"); } -#line 490 "<stdout>" +#line 490 "scanner.cc" yy68: yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); @@ -494,7 +494,7 @@ yy69: #line 227 "scanner.re" { fatal("unterminated string constant (missing ')"); } -#line 498 "<stdout>" +#line 498 "scanner.cc" yy70: yyaccept = 3; yych = *(YYMARKER = ++YYCURSOR); @@ -504,7 +504,7 @@ yy71: #line 237 "scanner.re" { fatal("unterminated range (missing ])"); } -#line 508 "<stdout>" +#line 508 "scanner.cc" yy72: yych = *++YYCURSOR; goto yy63; @@ -520,7 +520,7 @@ { cur = cursor; yylval.symbol = Symbol::find(token()); return ID; } -#line 524 "<stdout>" +#line 524 "scanner.cc" yy76: yych = *++YYCURSOR; goto yy90; @@ -531,7 +531,7 @@ yylval.regexp = mkDot(); return RANGE; } -#line 535 "<stdout>" +#line 535 "scanner.cc" yy79: ++YYCURSOR; yych = *YYCURSOR; @@ -539,7 +539,7 @@ yy80: #line 277 "scanner.re" { goto scan; } -#line 543 "<stdout>" +#line 543 "scanner.cc" yy81: ++YYCURSOR; yy82: @@ -548,7 +548,7 @@ pos = cursor; cline++; goto scan; } -#line 552 "<stdout>" +#line 552 "scanner.cc" yy83: ++YYCURSOR; if((yych = *YYCURSOR) == 0x0A) goto yy86; @@ -560,7 +560,7 @@ fatal(msg.str().c_str()); goto scan; } -#line 564 "<stdout>" +#line 564 "scanner.cc" yy85: yych = *++YYCURSOR; goto yy84; @@ -645,7 +645,7 @@ yylval.str = new Str(token()); return CONFIG; } -#line 649 "<stdout>" +#line 649 "scanner.cc" yy99: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); @@ -681,7 +681,7 @@ { cur = cursor; yylval.regexp = ranToRE(token()); return RANGE; } -#line 685 "<stdout>" +#line 685 "scanner.cc" yy106: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); @@ -694,7 +694,7 @@ { cur = cursor; yylval.regexp = invToRE(token()); return RANGE; } -#line 698 "<stdout>" +#line 698 "scanner.cc" yy109: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); @@ -716,7 +716,7 @@ { cur = cursor; yylval.regexp = strToCaseInsensitiveRE(token()); return STRING; } -#line 720 "<stdout>" +#line 720 "scanner.cc" yy114: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); @@ -738,19 +738,19 @@ { cur = cursor; yylval.regexp = strToRE(token()); return STRING; } -#line 742 "<stdout>" +#line 742 "scanner.cc" yy119: ++YYCURSOR; #line 215 "scanner.re" { tok = cursor; RETURN(0); } -#line 748 "<stdout>" +#line 748 "scanner.cc" yy121: ++YYCURSOR; #line 212 "scanner.re" { depth = 1; goto comment; } -#line 754 "<stdout>" +#line 754 "scanner.cc" yy123: yych = *++YYCURSOR; if(yych == ',') goto yy137; @@ -771,14 +771,14 @@ yy127: #line 259 "scanner.re" { fatal("illegal closure form, use '{n}', '{n,}', '{n,m}' where n and m are numbers"); } -#line 775 "<stdout>" +#line 775 "scanner.cc" yy128: ++YYCURSOR; #line 247 "scanner.re" { yylval.extop.minsize = atoi((char *)tok+1); yylval.extop.maxsize = atoi((char *)tok+1); RETURN(CLOSESIZE); } -#line 782 "<stdout>" +#line 782 "scanner.cc" yy130: yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); @@ -790,7 +790,7 @@ { yylval.extop.minsize = atoi((char *)tok+1); yylval.extop.maxsize = -1; RETURN(CLOSESIZE); } -#line 794 "<stdout>" +#line 794 "scanner.cc" yy133: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); @@ -803,7 +803,7 @@ { yylval.extop.minsize = atoi((char *)tok+1); yylval.extop.maxsize = MAX(yylval.extop.minsize,atoi(strchr((char *)tok, ',')+1)); RETURN(CLOSESIZE); } -#line 807 "<stdout>" +#line 807 "scanner.cc" yy137: yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); @@ -814,7 +814,7 @@ #line 244 "scanner.re" { yylval.op = '*'; RETURN(CLOSE); } -#line 818 "<stdout>" +#line 818 "scanner.cc" } } #line 290 "scanner.re" @@ -857,26 +857,27 @@ 192, 192, 192, 192, 192, 192, 192, 192, }; -#line 861 "<stdout>" +#line 861 "scanner.cc" { YYCTYPE yych; if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; if(yych <= '&') { if(yych <= 0x0A) { - if(yych <= 0x09) goto yy148; + if(yych <= 0x00) goto yy148; + if(yych <= 0x09) goto yy150; goto yy146; } else { - if(yych == '"') goto yy150; - goto yy148; + if(yych == '"') goto yy152; + goto yy150; } } else { if(yych <= '{') { - if(yych <= '\'') goto yy151; - if(yych <= 'z') goto yy148; + if(yych <= '\'') goto yy153; + if(yych <= 'z') goto yy150; goto yy144; } else { - if(yych != '}') goto yy148; + if(yych != '}') goto yy150; } } ++YYCURSOR; @@ -887,13 +888,13 @@ return CODE; } goto code; } -#line 891 "<stdout>" +#line 892 "scanner.cc" yy144: ++YYCURSOR; #line 300 "scanner.re" { ++depth; goto code; } -#line 897 "<stdout>" +#line 898 "scanner.cc" yy146: ++YYCURSOR; #line 302 "scanner.re" @@ -901,118 +902,128 @@ pos = cursor; cline++; goto code; } -#line 905 "<stdout>" +#line 906 "scanner.cc" yy148: ++YYCURSOR; -yy149: #line 306 "scanner.re" - { goto code; } -#line 911 "<stdout>" + { if(cursor == eof) { + if (depth) fatal("missing '}'"); + RETURN(0); + } + goto code; + } +#line 916 "scanner.cc" yy150: - yych = *(YYMARKER = ++YYCURSOR); - if(yych == 0x0A) goto yy149; - goto yy157; + ++YYCURSOR; yy151: +#line 312 "scanner.re" + { goto code; } +#line 922 "scanner.cc" +yy152: yych = *(YYMARKER = ++YYCURSOR); - if(yych == 0x0A) goto yy149; - goto yy153; -yy152: + if(yych == 0x0A) goto yy151; + goto yy159; +yy153: + yych = *(YYMARKER = ++YYCURSOR); + if(yych == 0x0A) goto yy151; + goto yy155; +yy154: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; -yy153: +yy155: if(yybm[0+yych] & 64) { - goto yy152; + goto yy154; } - if(yych <= '&') goto yy154; - if(yych <= '\'') goto yy148; - goto yy155; -yy154: + if(yych <= '&') goto yy156; + if(yych <= '\'') goto yy150; + goto yy157; +yy156: YYCURSOR = YYMARKER; - goto yy149; -yy155: + goto yy151; +yy157: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; - if(yych == 0x0A) goto yy154; - goto yy152; -yy156: + if(yych == 0x0A) goto yy156; + goto yy154; +yy158: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; -yy157: +yy159: if(yybm[0+yych] & 128) { - goto yy156; + goto yy158; } - if(yych <= '!') goto yy154; - if(yych <= '"') goto yy148; + if(yych <= '!') goto yy156; + if(yych <= '"') goto yy150; ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; - if(yych == 0x0A) goto yy154; - goto yy156; + if(yych == 0x0A) goto yy156; + goto yy158; } } -#line 307 "scanner.re" +#line 313 "scanner.re" comment: { -#line 963 "<stdout>" +#line 974 "scanner.cc" { YYCTYPE yych; if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; if(yych <= ')') { - if(yych == 0x0A) goto yy164; - goto yy166; + if(yych == 0x0A) goto yy166; + goto yy168; } else { - if(yych <= '*') goto yy161; - if(yych == '/') goto yy163; - goto yy166; + if(yych <= '*') goto yy163; + if(yych == '/') goto yy165; + goto yy168; } -yy161: +yy163: ++YYCURSOR; - if((yych = *YYCURSOR) == '/') goto yy169; -yy162: -#line 322 "scanner.re" + if((yych = *YYCURSOR) == '/') goto yy171; +yy164: +#line 328 "scanner.re" { if(cursor == eof) RETURN(0); goto comment; } -#line 983 "<stdout>" -yy163: +#line 994 "scanner.cc" +yy165: yych = *++YYCURSOR; - if(yych == '*') goto yy167; - goto yy162; -yy164: + if(yych == '*') goto yy169; + goto yy164; +yy166: ++YYCURSOR; -#line 318 "scanner.re" +#line 324 "scanner.re" { if(cursor == eof) RETURN(0); tok = pos = cursor; cline++; goto comment; } -#line 995 "<stdout>" -yy166: +#line 1006 "scanner.cc" +yy168: yych = *++YYCURSOR; - goto yy162; -yy167: + goto yy164; +yy169: ++YYCURSOR; -#line 315 "scanner.re" +#line 321 "scanner.re" { ++depth; fatal("ambiguous /* found"); goto comment; } -#line 1005 "<stdout>" -yy169: +#line 1016 "scanner.cc" +yy171: ++YYCURSOR; -#line 311 "scanner.re" +#line 317 "scanner.re" { if(--depth == 0) goto scan; else goto comment; } -#line 1013 "<stdout>" +#line 1024 "scanner.cc" } } -#line 324 "scanner.re" +#line 330 "scanner.re" config: @@ -1052,62 +1063,62 @@ 0, 0, 0, 0, 0, 0, 0, 0, }; -#line 1056 "<stdout>" +#line 1067 "scanner.cc" { YYCTYPE yych; if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; if(yych <= 0x1F) { - if(yych != 0x09) goto yy177; + if(yych != 0x09) goto yy179; } else { - if(yych <= ' ') goto yy173; - if(yych == '=') goto yy175; - goto yy177; + if(yych <= ' ') goto yy175; + if(yych == '=') goto yy177; + goto yy179; } -yy173: +yy175: ++YYCURSOR; yych = *YYCURSOR; - goto yy182; -yy174: -#line 328 "scanner.re" + goto yy184; +yy176: +#line 334 "scanner.re" { goto config; } -#line 1075 "<stdout>" -yy175: +#line 1086 "scanner.cc" +yy177: ++YYCURSOR; yych = *YYCURSOR; - goto yy180; -yy176: -#line 329 "scanner.re" + goto yy182; +yy178: +#line 335 "scanner.re" { iscfg = 2; cur = cursor; RETURN('='); } -#line 1086 "<stdout>" -yy177: +#line 1097 "scanner.cc" +yy179: ++YYCURSOR; -#line 333 "scanner.re" +#line 339 "scanner.re" { fatal("missing '='"); } -#line 1091 "<stdout>" -yy179: +#line 1102 "scanner.cc" +yy181: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; -yy180: +yy182: if(yybm[0+yych] & 128) { - goto yy179; + goto yy181; } - goto yy176; -yy181: + goto yy178; +yy183: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; -yy182: - if(yych == 0x09) goto yy181; - if(yych == ' ') goto yy181; - goto yy174; +yy184: + if(yych == 0x09) goto yy183; + if(yych == ' ') goto yy183; + goto yy176; } } -#line 334 "scanner.re" +#line 340 "scanner.re" value: @@ -1147,203 +1158,203 @@ 248, 248, 248, 248, 248, 248, 248, 248, }; -#line 1151 "<stdout>" +#line 1162 "scanner.cc" { YYCTYPE yych; if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; if(yych <= '&') { if(yych <= 0x0D) { - if(yych <= 0x08) goto yy191; - if(yych <= 0x0A) goto yy185; - if(yych <= 0x0C) goto yy191; + if(yych <= 0x08) goto yy193; + if(yych <= 0x0A) goto yy187; + if(yych <= 0x0C) goto yy193; } else { if(yych <= ' ') { - if(yych <= 0x1F) goto yy191; + if(yych <= 0x1F) goto yy193; } else { - if(yych == '"') goto yy193; - goto yy191; + if(yych == '"') goto yy195; + goto yy193; } } } else { if(yych <= '/') { - if(yych <= '\'') goto yy195; - if(yych == '-') goto yy188; - goto yy191; + if(yych <= '\'') goto yy197; + if(yych == '-') goto yy190; + goto yy193; } else { if(yych <= '9') { - if(yych <= '0') goto yy186; - goto yy189; + if(yych <= '0') goto yy188; + goto yy191; } else { - if(yych != ';') goto yy191; + if(yych != ';') goto yy193; } } } -yy185: -#line 343 "scanner.re" +yy187: +#line 349 "scanner.re" { cur = cursor; yylval.str = new Str(token()); iscfg = 0; return VALUE; } -#line 1190 "<stdout>" -yy186: +#line 1201 "scanner.cc" +yy188: ++YYCURSOR; if(yybm[0+(yych = *YYCURSOR)] & 8) { - goto yy191; + goto yy193; } -yy187: -#line 338 "scanner.re" +yy189: +#line 344 "scanner.re" { cur = cursor; yylval.number = atoi(token().to_string().c_str()); iscfg = 0; return NUMBER; } -#line 1203 "<stdout>" -yy188: +#line 1214 "scanner.cc" +yy190: yych = *++YYCURSOR; - if(yych <= '0') goto yy192; - if(yych >= ':') goto yy192; -yy189: + if(yych <= '0') goto yy194; + if(yych >= ':') goto yy194; +yy191: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; if(yybm[0+yych] & 4) { - goto yy189; + goto yy191; } if(yych <= 0x0D) { - if(yych <= 0x08) goto yy191; - if(yych <= 0x0A) goto yy187; - if(yych >= 0x0D) goto yy187; + if(yych <= 0x08) goto yy193; + if(yych <= 0x0A) goto yy189; + if(yych >= 0x0D) goto yy189; } else { if(yych <= ' ') { - if(yych >= ' ') goto yy187; + if(yych >= ' ') goto yy189; } else { - if(yych == ';') goto yy187; + if(yych == ';') goto yy189; } } -yy191: +yy193: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; -yy192: +yy194: if(yybm[0+yych] & 8) { - goto yy191; + goto yy193; } - goto yy185; -yy193: + goto yy187; +yy195: YYMARKER = ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; if(yybm[0+yych] & 16) { - goto yy193; + goto yy195; } if(yych <= '!') { - if(yych == 0x0A) goto yy185; - goto yy203; + if(yych == 0x0A) goto yy187; + goto yy205; } else { - if(yych <= '"') goto yy191; - if(yych <= '[') goto yy203; - goto yy205; + if(yych <= '"') goto yy193; + if(yych <= '[') goto yy205; + goto yy207; } -yy195: +yy197: YYMARKER = ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; if(yybm[0+yych] & 32) { - goto yy195; + goto yy197; } if(yych <= '&') { - if(yych == 0x0A) goto yy185; + if(yych == 0x0A) goto yy187; } else { - if(yych <= '\'') goto yy191; - if(yych >= '\\') goto yy200; + if(yych <= '\'') goto yy193; + if(yych >= '\\') goto yy202; } -yy197: +yy199: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; if(yybm[0+yych] & 64) { - goto yy197; + goto yy199; } - if(yych <= '&') goto yy199; - if(yych <= '\'') goto yy201; - goto yy202; -yy199: + if(yych <= '&') goto yy201; + if(yych <= '\'') goto yy203; + goto yy204; +yy201: YYCURSOR = YYMARKER; - goto yy185; -yy200: + goto yy187; +yy202: YYMARKER = ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; if(yych <= 0x0D) { if(yych <= 0x09) { - if(yych <= 0x08) goto yy195; - goto yy197; + if(yych <= 0x08) goto yy197; + goto yy199; } else { - if(yych <= 0x0A) goto yy185; - if(yych <= 0x0C) goto yy195; - goto yy197; + if(yych <= 0x0A) goto yy187; + if(yych <= 0x0C) goto yy197; + goto yy199; } } else { if(yych <= ' ') { - if(yych <= 0x1F) goto yy195; + if(yych <= 0x1F) goto yy197; + goto yy199; + } else { + if(yych == ';') goto yy199; goto yy197; - } else { - if(yych == ';') goto yy197; - goto yy195; } } -yy201: +yy203: yych = *++YYCURSOR; - goto yy185; -yy202: + goto yy187; +yy204: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; - if(yych == 0x0A) goto yy199; - goto yy197; -yy203: + if(yych == 0x0A) goto yy201; + goto yy199; +yy205: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; if(yybm[0+yych] & 128) { - goto yy203; + goto yy205; } - if(yych <= '!') goto yy199; - if(yych <= '"') goto yy201; - goto yy206; -yy205: + if(yych <= '!') goto yy201; + if(yych <= '"') goto yy203; + goto yy208; +yy207: YYMARKER = ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; if(yych <= 0x0D) { if(yych <= 0x09) { - if(yych <= 0x08) goto yy193; - goto yy203; + if(yych <= 0x08) goto yy195; + goto yy205; } else { - if(yych <= 0x0A) goto yy185; - if(yych <= 0x0C) goto yy193; - goto yy203; + if(yych <= 0x0A) goto yy187; + if(yych <= 0x0C) goto yy195; + goto yy205; } } else { if(yych <= ' ') { - if(yych <= 0x1F) goto yy193; - goto yy203; + if(yych <= 0x1F) goto yy195; + goto yy205; } else { - if(yych == ';') goto yy203; - goto yy193; + if(yych == ';') goto yy205; + goto yy195; } } -yy206: +yy208: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; - if(yych == 0x0A) goto yy199; - goto yy203; + if(yych == 0x0A) goto yy201; + goto yy205; } } -#line 348 "scanner.re" +#line 354 "scanner.re" } Modified: trunk/re2c/parser.y =================================================================== --- trunk/re2c/parser.y 2006-07-29 20:20:50 UTC (rev 601) +++ trunk/re2c/parser.y 2006-07-29 20:21:54 UTC (rev 602) @@ -28,7 +28,7 @@ static re2c::uint accept; static RegExp *spec; -static Scanner *in; +static Scanner *in = NULL; /* Bison version 1.875 emits a definition that is not working * with several g++ version. Hence we disable it here. @@ -182,7 +182,7 @@ } int yylex(){ - return in->scan(); + return in ? in->scan() : 0; } } // end extern "C" @@ -212,6 +212,7 @@ RegExp::vFreeList.clear(); Range::vFreeList.clear(); Symbol::ClearTable(); + in = NULL; } } // end namespace re2c Modified: trunk/re2c/scanner.re =================================================================== --- trunk/re2c/scanner.re 2006-07-29 20:20:50 UTC (rev 601) +++ trunk/re2c/scanner.re 2006-07-29 20:21:54 UTC (rev 602) @@ -299,10 +299,16 @@ goto code; } "{" { ++depth; goto code; } - "\n" { if(cursor == eof) fatal("missing '}'"); + "\n" { if(cursor == eof) fatal("missing '}'"); pos = cursor; cline++; goto code; } + zero { if(cursor == eof) { + if (depth) fatal("missing '}'"); + RETURN(0); + } + goto code; + } dstring | sstring | any { goto code; } */ Added: trunk/re2c/test/bug1529351.c =================================================================== --- trunk/re2c/test/bug1529351.c (rev 0) +++ trunk/re2c/test/bug1529351.c 2006-07-29 20:21:54 UTC (rev 602) @@ -0,0 +1 @@ +re2c: error: line 3, column 9: missing '}' Property changes on: trunk/re2c/test/bug1529351.c ___________________________________________________________________ Name: svn:executable + * Name: svn:eol-style + native Added: trunk/re2c/test/bug1529351.re =================================================================== --- trunk/re2c/test/bug1529351.re (rev 0) +++ trunk/re2c/test/bug1529351.re 2006-07-29 20:21:54 UTC (rev 602) @@ -0,0 +1,4 @@ +/*!re2c + + "foo" { func(); { func(); } +*/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2006-07-29 20:21:16
|
Revision: 601 Author: helly Date: 2006-07-29 13:20:50 -0700 (Sat, 29 Jul 2006) ViewCVS: http://svn.sourceforge.net/re2c/?rev=601&view=rev Log Message: ----------- - Add test Added Paths: ----------- tags/RELEASE_0_10_6/test/bug1529351.c tags/RELEASE_0_10_6/test/bug1529351.re Added: tags/RELEASE_0_10_6/test/bug1529351.c =================================================================== --- tags/RELEASE_0_10_6/test/bug1529351.c (rev 0) +++ tags/RELEASE_0_10_6/test/bug1529351.c 2006-07-29 20:20:50 UTC (rev 601) @@ -0,0 +1 @@ +re2c: error: line 3, column 9: missing '}' Property changes on: tags/RELEASE_0_10_6/test/bug1529351.c ___________________________________________________________________ Name: svn:executable + * Name: svn:eol-style + native Added: tags/RELEASE_0_10_6/test/bug1529351.re =================================================================== --- tags/RELEASE_0_10_6/test/bug1529351.re (rev 0) +++ tags/RELEASE_0_10_6/test/bug1529351.re 2006-07-29 20:20:50 UTC (rev 601) @@ -0,0 +1,4 @@ +/*!re2c + + "foo" { func(); { func(); } +*/ Property changes on: tags/RELEASE_0_10_6/test/bug1529351.re ___________________________________________________________________ Name: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2006-07-29 20:17:24
|
Revision: 600 Author: helly Date: 2006-07-29 13:16:45 -0700 (Sat, 29 Jul 2006) ViewCVS: http://svn.sourceforge.net/re2c/?rev=600&view=rev Log Message: ----------- - Fixed #1529351 Segv bug on unterminated code blocks Modified Paths: -------------- tags/RELEASE_0_10_6/CHANGELOG tags/RELEASE_0_10_6/bootstrap/parser.cc tags/RELEASE_0_10_6/bootstrap/scanner.cc tags/RELEASE_0_10_6/parser.y tags/RELEASE_0_10_6/scanner.re Modified: tags/RELEASE_0_10_6/CHANGELOG =================================================================== --- tags/RELEASE_0_10_6/CHANGELOG 2006-07-27 01:34:29 UTC (rev 599) +++ tags/RELEASE_0_10_6/CHANGELOG 2006-07-29 20:16:45 UTC (rev 600) @@ -1,5 +1,6 @@ Version 0.10.6 (2006-??-??) --------------------------- +- Fixed #1529351 Segv bug on unterminated code blocks - Fixed #1528269 Invalid code generation. Version 0.10.5 (2006-06-11) Modified: tags/RELEASE_0_10_6/bootstrap/parser.cc =================================================================== --- tags/RELEASE_0_10_6/bootstrap/parser.cc 2006-07-27 01:34:29 UTC (rev 599) +++ tags/RELEASE_0_10_6/bootstrap/parser.cc 2006-07-29 20:16:45 UTC (rev 600) @@ -113,7 +113,7 @@ static re2c::uint accept; static RegExp *spec; -static Scanner *in; +static Scanner *in = NULL; /* Bison version 1.875 emits a definition that is not working * with several g++ version. Hence we disable it here. @@ -1609,7 +1609,7 @@ } int yylex(){ - return in->scan(); + return in ? in->scan() : 0; } } // end extern "C" @@ -1635,6 +1635,7 @@ } o << sourceFileInfo; } + in = NULL; } } // end namespace re2c Modified: tags/RELEASE_0_10_6/bootstrap/scanner.cc =================================================================== --- tags/RELEASE_0_10_6/bootstrap/scanner.cc 2006-07-27 01:34:29 UTC (rev 599) +++ tags/RELEASE_0_10_6/bootstrap/scanner.cc 2006-07-29 20:16:45 UTC (rev 600) @@ -1,4 +1,4 @@ -/* Generated by re2c 0.10.6 on Thu Jul 27 04:06:32 2006 */ +/* Generated by re2c 0.10.6 on Sat Jul 29 22:27:21 2006 */ #line 1 "scanner.re" /* $Id$ */ #include <stdlib.h> @@ -94,7 +94,7 @@ echo: { -#line 98 "<stdout>" +#line 98 "scanner.cc" { YYCTYPE yych; unsigned int yyaccept = 0; @@ -117,7 +117,7 @@ { goto echo; } -#line 121 "<stdout>" +#line 121 "scanner.cc" yy4: yych = *++YYCURSOR; if(yych == '/') goto yy10; @@ -134,7 +134,7 @@ tok = pos = cursor; cline++; goto echo; } -#line 138 "<stdout>" +#line 138 "scanner.cc" yy7: ++YYCURSOR; #line 176 "scanner.re" @@ -146,7 +146,7 @@ RETURN(0); } } -#line 150 "<stdout>" +#line 150 "scanner.cc" yy9: yych = *++YYCURSOR; goto yy3; @@ -170,7 +170,7 @@ tok = pos = cursor; goto echo; } -#line 174 "<stdout>" +#line 174 "scanner.cc" yy12: yych = *++YYCURSOR; if(yych == 0x0A) goto yy14; @@ -198,7 +198,7 @@ tok = pos = cursor; goto echo; } -#line 202 "<stdout>" +#line 202 "scanner.cc" yy16: yych = *++YYCURSOR; if(yych != '!') goto yy13; @@ -239,7 +239,7 @@ tok = cursor; RETURN(1); } -#line 243 "<stdout>" +#line 243 "scanner.cc" yy26: yych = *++YYCURSOR; if(yych != 'x') goto yy13; @@ -265,7 +265,7 @@ bUsedYYMaxFill = true; goto echo; } -#line 269 "<stdout>" +#line 269 "scanner.cc" yy34: yych = *++YYCURSOR; if(yych != 't') goto yy13; @@ -297,7 +297,7 @@ ignore_eoc = true; goto echo; } -#line 301 "<stdout>" +#line 301 "scanner.cc" yy47: yych = *++YYCURSOR; if(yych != 'n') goto yy13; @@ -324,7 +324,7 @@ ignore_eoc = true; goto echo; } -#line 328 "<stdout>" +#line 328 "scanner.cc" } } #line 187 "scanner.re" @@ -385,7 +385,7 @@ 112, 112, 112, 112, 112, 112, 112, 112, }; -#line 389 "<stdout>" +#line 389 "scanner.cc" { YYCTYPE yych; unsigned int yyaccept = 0; @@ -463,14 +463,14 @@ { depth = 1; goto code; } -#line 467 "<stdout>" +#line 467 "scanner.cc" yy62: ++YYCURSOR; if((yych = *YYCURSOR) == '*') goto yy121; yy63: #line 239 "scanner.re" { RETURN(*tok); } -#line 474 "<stdout>" +#line 474 "scanner.cc" yy64: ++YYCURSOR; if((yych = *YYCURSOR) == '/') goto yy119; @@ -478,7 +478,7 @@ #line 241 "scanner.re" { yylval.op = *tok; RETURN(CLOSE); } -#line 482 "<stdout>" +#line 482 "scanner.cc" yy66: yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); @@ -486,7 +486,7 @@ yy67: #line 226 "scanner.re" { fatal("unterminated string constant (missing \")"); } -#line 490 "<stdout>" +#line 490 "scanner.cc" yy68: yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); @@ -494,7 +494,7 @@ yy69: #line 227 "scanner.re" { fatal("unterminated string constant (missing ')"); } -#line 498 "<stdout>" +#line 498 "scanner.cc" yy70: yyaccept = 3; yych = *(YYMARKER = ++YYCURSOR); @@ -504,7 +504,7 @@ yy71: #line 237 "scanner.re" { fatal("unterminated range (missing ])"); } -#line 508 "<stdout>" +#line 508 "scanner.cc" yy72: yych = *++YYCURSOR; goto yy63; @@ -520,7 +520,7 @@ { cur = cursor; yylval.symbol = Symbol::find(token()); return ID; } -#line 524 "<stdout>" +#line 524 "scanner.cc" yy76: yych = *++YYCURSOR; goto yy90; @@ -531,7 +531,7 @@ yylval.regexp = mkDot(); return RANGE; } -#line 535 "<stdout>" +#line 535 "scanner.cc" yy79: ++YYCURSOR; yych = *YYCURSOR; @@ -539,7 +539,7 @@ yy80: #line 277 "scanner.re" { goto scan; } -#line 543 "<stdout>" +#line 543 "scanner.cc" yy81: ++YYCURSOR; yy82: @@ -548,7 +548,7 @@ pos = cursor; cline++; goto scan; } -#line 552 "<stdout>" +#line 552 "scanner.cc" yy83: ++YYCURSOR; if((yych = *YYCURSOR) == 0x0A) goto yy86; @@ -560,7 +560,7 @@ fatal(msg.str().c_str()); goto scan; } -#line 564 "<stdout>" +#line 564 "scanner.cc" yy85: yych = *++YYCURSOR; goto yy84; @@ -645,7 +645,7 @@ yylval.str = new Str(token()); return CONFIG; } -#line 649 "<stdout>" +#line 649 "scanner.cc" yy99: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); @@ -681,7 +681,7 @@ { cur = cursor; yylval.regexp = ranToRE(token()); return RANGE; } -#line 685 "<stdout>" +#line 685 "scanner.cc" yy106: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); @@ -694,7 +694,7 @@ { cur = cursor; yylval.regexp = invToRE(token()); return RANGE; } -#line 698 "<stdout>" +#line 698 "scanner.cc" yy109: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); @@ -716,7 +716,7 @@ { cur = cursor; yylval.regexp = strToCaseInsensitiveRE(token()); return STRING; } -#line 720 "<stdout>" +#line 720 "scanner.cc" yy114: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); @@ -738,19 +738,19 @@ { cur = cursor; yylval.regexp = strToRE(token()); return STRING; } -#line 742 "<stdout>" +#line 742 "scanner.cc" yy119: ++YYCURSOR; #line 215 "scanner.re" { tok = cursor; RETURN(0); } -#line 748 "<stdout>" +#line 748 "scanner.cc" yy121: ++YYCURSOR; #line 212 "scanner.re" { depth = 1; goto comment; } -#line 754 "<stdout>" +#line 754 "scanner.cc" yy123: yych = *++YYCURSOR; if(yych == ',') goto yy137; @@ -771,14 +771,14 @@ yy127: #line 259 "scanner.re" { fatal("illegal closure form, use '{n}', '{n,}', '{n,m}' where n and m are numbers"); } -#line 775 "<stdout>" +#line 775 "scanner.cc" yy128: ++YYCURSOR; #line 247 "scanner.re" { yylval.extop.minsize = atoi((char *)tok+1); yylval.extop.maxsize = atoi((char *)tok+1); RETURN(CLOSESIZE); } -#line 782 "<stdout>" +#line 782 "scanner.cc" yy130: yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); @@ -790,7 +790,7 @@ { yylval.extop.minsize = atoi((char *)tok+1); yylval.extop.maxsize = -1; RETURN(CLOSESIZE); } -#line 794 "<stdout>" +#line 794 "scanner.cc" yy133: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); @@ -803,7 +803,7 @@ { yylval.extop.minsize = atoi((char *)tok+1); yylval.extop.maxsize = MAX(yylval.extop.minsize,atoi(strchr((char *)tok, ',')+1)); RETURN(CLOSESIZE); } -#line 807 "<stdout>" +#line 807 "scanner.cc" yy137: yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); @@ -814,7 +814,7 @@ #line 244 "scanner.re" { yylval.op = '*'; RETURN(CLOSE); } -#line 818 "<stdout>" +#line 818 "scanner.cc" } } #line 290 "scanner.re" @@ -857,26 +857,27 @@ 192, 192, 192, 192, 192, 192, 192, 192, }; -#line 861 "<stdout>" +#line 861 "scanner.cc" { YYCTYPE yych; if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; if(yych <= '&') { if(yych <= 0x0A) { - if(yych <= 0x09) goto yy148; + if(yych <= 0x00) goto yy148; + if(yych <= 0x09) goto yy150; goto yy146; } else { - if(yych == '"') goto yy150; - goto yy148; + if(yych == '"') goto yy152; + goto yy150; } } else { if(yych <= '{') { - if(yych <= '\'') goto yy151; - if(yych <= 'z') goto yy148; + if(yych <= '\'') goto yy153; + if(yych <= 'z') goto yy150; goto yy144; } else { - if(yych != '}') goto yy148; + if(yych != '}') goto yy150; } } ++YYCURSOR; @@ -887,13 +888,13 @@ return CODE; } goto code; } -#line 891 "<stdout>" +#line 892 "scanner.cc" yy144: ++YYCURSOR; #line 300 "scanner.re" { ++depth; goto code; } -#line 897 "<stdout>" +#line 898 "scanner.cc" yy146: ++YYCURSOR; #line 302 "scanner.re" @@ -901,118 +902,128 @@ pos = cursor; cline++; goto code; } -#line 905 "<stdout>" +#line 906 "scanner.cc" yy148: ++YYCURSOR; -yy149: #line 306 "scanner.re" - { goto code; } -#line 911 "<stdout>" + { if(cursor == eof) { + if (depth) fatal("missing '}'"); + RETURN(0); + } + goto code; + } +#line 916 "scanner.cc" yy150: - yych = *(YYMARKER = ++YYCURSOR); - if(yych == 0x0A) goto yy149; - goto yy157; + ++YYCURSOR; yy151: +#line 312 "scanner.re" + { goto code; } +#line 922 "scanner.cc" +yy152: yych = *(YYMARKER = ++YYCURSOR); - if(yych == 0x0A) goto yy149; - goto yy153; -yy152: + if(yych == 0x0A) goto yy151; + goto yy159; +yy153: + yych = *(YYMARKER = ++YYCURSOR); + if(yych == 0x0A) goto yy151; + goto yy155; +yy154: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; -yy153: +yy155: if(yybm[0+yych] & 64) { - goto yy152; + goto yy154; } - if(yych <= '&') goto yy154; - if(yych <= '\'') goto yy148; - goto yy155; -yy154: + if(yych <= '&') goto yy156; + if(yych <= '\'') goto yy150; + goto yy157; +yy156: YYCURSOR = YYMARKER; - goto yy149; -yy155: + goto yy151; +yy157: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; - if(yych == 0x0A) goto yy154; - goto yy152; -yy156: + if(yych == 0x0A) goto yy156; + goto yy154; +yy158: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; -yy157: +yy159: if(yybm[0+yych] & 128) { - goto yy156; + goto yy158; } - if(yych <= '!') goto yy154; - if(yych <= '"') goto yy148; + if(yych <= '!') goto yy156; + if(yych <= '"') goto yy150; ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; - if(yych == 0x0A) goto yy154; - goto yy156; + if(yych == 0x0A) goto yy156; + goto yy158; } } -#line 307 "scanner.re" +#line 313 "scanner.re" comment: { -#line 963 "<stdout>" +#line 974 "scanner.cc" { YYCTYPE yych; if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; if(yych <= ')') { - if(yych == 0x0A) goto yy164; - goto yy166; + if(yych == 0x0A) goto yy166; + goto yy168; } else { - if(yych <= '*') goto yy161; - if(yych == '/') goto yy163; - goto yy166; + if(yych <= '*') goto yy163; + if(yych == '/') goto yy165; + goto yy168; } -yy161: +yy163: ++YYCURSOR; - if((yych = *YYCURSOR) == '/') goto yy169; -yy162: -#line 322 "scanner.re" + if((yych = *YYCURSOR) == '/') goto yy171; +yy164: +#line 328 "scanner.re" { if(cursor == eof) RETURN(0); goto comment; } -#line 983 "<stdout>" -yy163: +#line 994 "scanner.cc" +yy165: yych = *++YYCURSOR; - if(yych == '*') goto yy167; - goto yy162; -yy164: + if(yych == '*') goto yy169; + goto yy164; +yy166: ++YYCURSOR; -#line 318 "scanner.re" +#line 324 "scanner.re" { if(cursor == eof) RETURN(0); tok = pos = cursor; cline++; goto comment; } -#line 995 "<stdout>" -yy166: +#line 1006 "scanner.cc" +yy168: yych = *++YYCURSOR; - goto yy162; -yy167: + goto yy164; +yy169: ++YYCURSOR; -#line 315 "scanner.re" +#line 321 "scanner.re" { ++depth; fatal("ambiguous /* found"); goto comment; } -#line 1005 "<stdout>" -yy169: +#line 1016 "scanner.cc" +yy171: ++YYCURSOR; -#line 311 "scanner.re" +#line 317 "scanner.re" { if(--depth == 0) goto scan; else goto comment; } -#line 1013 "<stdout>" +#line 1024 "scanner.cc" } } -#line 324 "scanner.re" +#line 330 "scanner.re" config: @@ -1052,62 +1063,62 @@ 0, 0, 0, 0, 0, 0, 0, 0, }; -#line 1056 "<stdout>" +#line 1067 "scanner.cc" { YYCTYPE yych; if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; if(yych <= 0x1F) { - if(yych != 0x09) goto yy177; + if(yych != 0x09) goto yy179; } else { - if(yych <= ' ') goto yy173; - if(yych == '=') goto yy175; - goto yy177; + if(yych <= ' ') goto yy175; + if(yych == '=') goto yy177; + goto yy179; } -yy173: +yy175: ++YYCURSOR; yych = *YYCURSOR; - goto yy182; -yy174: -#line 328 "scanner.re" + goto yy184; +yy176: +#line 334 "scanner.re" { goto config; } -#line 1075 "<stdout>" -yy175: +#line 1086 "scanner.cc" +yy177: ++YYCURSOR; yych = *YYCURSOR; - goto yy180; -yy176: -#line 329 "scanner.re" + goto yy182; +yy178: +#line 335 "scanner.re" { iscfg = 2; cur = cursor; RETURN('='); } -#line 1086 "<stdout>" -yy177: +#line 1097 "scanner.cc" +yy179: ++YYCURSOR; -#line 333 "scanner.re" +#line 339 "scanner.re" { fatal("missing '='"); } -#line 1091 "<stdout>" -yy179: +#line 1102 "scanner.cc" +yy181: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; -yy180: +yy182: if(yybm[0+yych] & 128) { - goto yy179; + goto yy181; } - goto yy176; -yy181: + goto yy178; +yy183: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; -yy182: - if(yych == 0x09) goto yy181; - if(yych == ' ') goto yy181; - goto yy174; +yy184: + if(yych == 0x09) goto yy183; + if(yych == ' ') goto yy183; + goto yy176; } } -#line 334 "scanner.re" +#line 340 "scanner.re" value: @@ -1147,203 +1158,203 @@ 248, 248, 248, 248, 248, 248, 248, 248, }; -#line 1151 "<stdout>" +#line 1162 "scanner.cc" { YYCTYPE yych; if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; if(yych <= '&') { if(yych <= 0x0D) { - if(yych <= 0x08) goto yy191; - if(yych <= 0x0A) goto yy185; - if(yych <= 0x0C) goto yy191; + if(yych <= 0x08) goto yy193; + if(yych <= 0x0A) goto yy187; + if(yych <= 0x0C) goto yy193; } else { if(yych <= ' ') { - if(yych <= 0x1F) goto yy191; + if(yych <= 0x1F) goto yy193; } else { - if(yych == '"') goto yy193; - goto yy191; + if(yych == '"') goto yy195; + goto yy193; } } } else { if(yych <= '/') { - if(yych <= '\'') goto yy195; - if(yych == '-') goto yy188; - goto yy191; + if(yych <= '\'') goto yy197; + if(yych == '-') goto yy190; + goto yy193; } else { if(yych <= '9') { - if(yych <= '0') goto yy186; - goto yy189; + if(yych <= '0') goto yy188; + goto yy191; } else { - if(yych != ';') goto yy191; + if(yych != ';') goto yy193; } } } -yy185: -#line 343 "scanner.re" +yy187: +#line 349 "scanner.re" { cur = cursor; yylval.str = new Str(token()); iscfg = 0; return VALUE; } -#line 1190 "<stdout>" -yy186: +#line 1201 "scanner.cc" +yy188: ++YYCURSOR; if(yybm[0+(yych = *YYCURSOR)] & 8) { - goto yy191; + goto yy193; } -yy187: -#line 338 "scanner.re" +yy189: +#line 344 "scanner.re" { cur = cursor; yylval.number = atoi(token().to_string().c_str()); iscfg = 0; return NUMBER; } -#line 1203 "<stdout>" -yy188: +#line 1214 "scanner.cc" +yy190: yych = *++YYCURSOR; - if(yych <= '0') goto yy192; - if(yych >= ':') goto yy192; -yy189: + if(yych <= '0') goto yy194; + if(yych >= ':') goto yy194; +yy191: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; if(yybm[0+yych] & 4) { - goto yy189; + goto yy191; } if(yych <= 0x0D) { - if(yych <= 0x08) goto yy191; - if(yych <= 0x0A) goto yy187; - if(yych >= 0x0D) goto yy187; + if(yych <= 0x08) goto yy193; + if(yych <= 0x0A) goto yy189; + if(yych >= 0x0D) goto yy189; } else { if(yych <= ' ') { - if(yych >= ' ') goto yy187; + if(yych >= ' ') goto yy189; } else { - if(yych == ';') goto yy187; + if(yych == ';') goto yy189; } } -yy191: +yy193: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; -yy192: +yy194: if(yybm[0+yych] & 8) { - goto yy191; + goto yy193; } - goto yy185; -yy193: + goto yy187; +yy195: YYMARKER = ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; if(yybm[0+yych] & 16) { - goto yy193; + goto yy195; } if(yych <= '!') { - if(yych == 0x0A) goto yy185; - goto yy203; + if(yych == 0x0A) goto yy187; + goto yy205; } else { - if(yych <= '"') goto yy191; - if(yych <= '[') goto yy203; - goto yy205; + if(yych <= '"') goto yy193; + if(yych <= '[') goto yy205; + goto yy207; } -yy195: +yy197: YYMARKER = ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; if(yybm[0+yych] & 32) { - goto yy195; + goto yy197; } if(yych <= '&') { - if(yych == 0x0A) goto yy185; + if(yych == 0x0A) goto yy187; } else { - if(yych <= '\'') goto yy191; - if(yych >= '\\') goto yy200; + if(yych <= '\'') goto yy193; + if(yych >= '\\') goto yy202; } -yy197: +yy199: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; if(yybm[0+yych] & 64) { - goto yy197; + goto yy199; } - if(yych <= '&') goto yy199; - if(yych <= '\'') goto yy201; - goto yy202; -yy199: + if(yych <= '&') goto yy201; + if(yych <= '\'') goto yy203; + goto yy204; +yy201: YYCURSOR = YYMARKER; - goto yy185; -yy200: + goto yy187; +yy202: YYMARKER = ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; if(yych <= 0x0D) { if(yych <= 0x09) { - if(yych <= 0x08) goto yy195; - goto yy197; + if(yych <= 0x08) goto yy197; + goto yy199; } else { - if(yych <= 0x0A) goto yy185; - if(yych <= 0x0C) goto yy195; - goto yy197; + if(yych <= 0x0A) goto yy187; + if(yych <= 0x0C) goto yy197; + goto yy199; } } else { if(yych <= ' ') { - if(yych <= 0x1F) goto yy195; + if(yych <= 0x1F) goto yy197; + goto yy199; + } else { + if(yych == ';') goto yy199; goto yy197; - } else { - if(yych == ';') goto yy197; - goto yy195; } } -yy201: +yy203: yych = *++YYCURSOR; - goto yy185; -yy202: + goto yy187; +yy204: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; - if(yych == 0x0A) goto yy199; - goto yy197; -yy203: + if(yych == 0x0A) goto yy201; + goto yy199; +yy205: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; if(yybm[0+yych] & 128) { - goto yy203; + goto yy205; } - if(yych <= '!') goto yy199; - if(yych <= '"') goto yy201; - goto yy206; -yy205: + if(yych <= '!') goto yy201; + if(yych <= '"') goto yy203; + goto yy208; +yy207: YYMARKER = ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; if(yych <= 0x0D) { if(yych <= 0x09) { - if(yych <= 0x08) goto yy193; - goto yy203; + if(yych <= 0x08) goto yy195; + goto yy205; } else { - if(yych <= 0x0A) goto yy185; - if(yych <= 0x0C) goto yy193; - goto yy203; + if(yych <= 0x0A) goto yy187; + if(yych <= 0x0C) goto yy195; + goto yy205; } } else { if(yych <= ' ') { - if(yych <= 0x1F) goto yy193; - goto yy203; + if(yych <= 0x1F) goto yy195; + goto yy205; } else { - if(yych == ';') goto yy203; - goto yy193; + if(yych == ';') goto yy205; + goto yy195; } } -yy206: +yy208: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; - if(yych == 0x0A) goto yy199; - goto yy203; + if(yych == 0x0A) goto yy201; + goto yy205; } } -#line 348 "scanner.re" +#line 354 "scanner.re" } @@ -1357,4 +1368,3 @@ } } // end namespace re2c - Modified: tags/RELEASE_0_10_6/parser.y =================================================================== --- tags/RELEASE_0_10_6/parser.y 2006-07-27 01:34:29 UTC (rev 599) +++ tags/RELEASE_0_10_6/parser.y 2006-07-29 20:16:45 UTC (rev 600) @@ -28,7 +28,7 @@ static re2c::uint accept; static RegExp *spec; -static Scanner *in; +static Scanner *in = NULL; /* Bison version 1.875 emits a definition that is not working * with several g++ version. Hence we disable it here. @@ -182,7 +182,7 @@ } int yylex(){ - return in->scan(); + return in ? in->scan() : 0; } } // end extern "C" @@ -208,6 +208,7 @@ } o << sourceFileInfo; } + in = NULL; } } // end namespace re2c Modified: tags/RELEASE_0_10_6/scanner.re =================================================================== --- tags/RELEASE_0_10_6/scanner.re 2006-07-27 01:34:29 UTC (rev 599) +++ tags/RELEASE_0_10_6/scanner.re 2006-07-29 20:16:45 UTC (rev 600) @@ -299,10 +299,16 @@ goto code; } "{" { ++depth; goto code; } - "\n" { if(cursor == eof) fatal("missing '}'"); + "\n" { if(cursor == eof) fatal("missing '}'"); pos = cursor; cline++; goto code; } + zero { if(cursor == eof) { + if (depth) fatal("missing '}'"); + RETURN(0); + } + goto code; + } dstring | sstring | any { goto code; } */ @@ -358,4 +364,3 @@ } } // end namespace re2c - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2006-07-27 22:36:30
|
Revision: 593 Author: helly Date: 2006-07-26 17:59:39 -0700 (Wed, 26 Jul 2006) ViewCVS: http://svn.sourceforge.net/re2c/?rev=593&view=rev Log Message: ----------- - Fixed #1528269 Invalid code generation. Modified Paths: -------------- trunk/re2c/CHANGELOG trunk/re2c/Makefile.am trunk/re2c/bootstrap/scanner.cc trunk/re2c/re2c.spec.in trunk/re2c/scanner.re Modified: trunk/re2c/CHANGELOG =================================================================== --- trunk/re2c/CHANGELOG 2006-07-27 00:56:38 UTC (rev 592) +++ trunk/re2c/CHANGELOG 2006-07-27 00:59:39 UTC (rev 593) @@ -1,3 +1,7 @@ +Version 0.11.0 (????-??-??) +--------------------------- +- Fixed #1528269 Invalid code generation. + Version 0.10.5 (2006-06-11) --------------------------- - Fixed long form of -1 switch to --single-pass as noted in man page and help. Modified: trunk/re2c/Makefile.am =================================================================== --- trunk/re2c/Makefile.am 2006-07-27 00:56:38 UTC (rev 592) +++ trunk/re2c/Makefile.am 2006-07-27 00:59:39 UTC (rev 593) @@ -15,7 +15,7 @@ YFLAGS = -d RE2C = re2c$(EXEEXT) -RE2CFLAGS = -s +RE2CFLAGS = -b CLEANFILES = parser.cc y.tab.c y.tab.h scanner.cc re2c.1 .version Modified: trunk/re2c/bootstrap/scanner.cc =================================================================== --- trunk/re2c/bootstrap/scanner.cc 2006-07-27 00:56:38 UTC (rev 592) +++ trunk/re2c/bootstrap/scanner.cc 2006-07-27 00:59:39 UTC (rev 593) @@ -1,4 +1,4 @@ -/* Generated by re2c 0.11.0.dev on Mon Jun 5 18:17:13 2006 */ +/* Generated by re2c 0.11.0.dev on Thu Jul 27 03:06:48 2006 */ #line 1 "scanner.re" /* $Id$ */ #include <stdlib.h> @@ -19,7 +19,7 @@ #define BSIZE 8192 -#define YYCTYPE char +#define YYCTYPE unsigned char #define YYCURSOR cursor #define YYLIMIT lim #define YYMARKER ptr @@ -92,39 +92,40 @@ tok = cursor; echo: - -#line 97 "scanner.cc" { - YYCTYPE yych; - unsigned int yyaccept = 0; - if((YYLIMIT - YYCURSOR) < 16) YYFILL(16); - yych = *YYCURSOR; - if(yych <= ')') { - if(yych <= 0x00) goto yy7; - if(yych == 0x0A) goto yy5; - goto yy9; - } else { - if(yych <= '*') goto yy4; - if(yych != '/') goto yy9; - } - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if(yych == '*') goto yy16; +#line 98 "<stdout>" + { + YYCTYPE yych; + unsigned int yyaccept = 0; + + if((YYLIMIT - YYCURSOR) < 16) YYFILL(16); + yych = *YYCURSOR; + if(yych <= ')') { + if(yych <= 0x00) goto yy7; + if(yych == 0x0A) goto yy5; + goto yy9; + } else { + if(yych <= '*') goto yy4; + if(yych != '/') goto yy9; + } + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + if(yych == '*') goto yy16; yy3: #line 184 "scanner.re" - { + { goto echo; } -#line 120 "scanner.cc" +#line 121 "<stdout>" yy4: - yych = *++YYCURSOR; - if(yych == '/') goto yy10; - goto yy3; + yych = *++YYCURSOR; + if(yych == '/') goto yy10; + goto yy3; yy5: - ++YYCURSOR; + ++YYCURSOR; #line 167 "scanner.re" - { + { if (ignore_eoc) { ignore_cnt++; } else { @@ -133,11 +134,11 @@ tok = pos = cursor; cline++; goto echo; } -#line 137 "scanner.cc" +#line 138 "<stdout>" yy7: - ++YYCURSOR; + ++YYCURSOR; #line 176 "scanner.re" - { + { if (!ignore_eoc) { out.write((const char*)(tok), (const char*)(cursor) - (const char*)(tok) - 1); // -1 so we don't write out the \0 } @@ -145,18 +146,18 @@ RETURN(0); } } -#line 149 "scanner.cc" +#line 150 "<stdout>" yy9: - yych = *++YYCURSOR; - goto yy3; + yych = *++YYCURSOR; + goto yy3; yy10: - yyaccept = 1; - yych = *(YYMARKER = ++YYCURSOR); - if(yych == 0x0A) goto yy14; - if(yych == 0x0D) goto yy12; + yyaccept = 1; + yych = *(YYMARKER = ++YYCURSOR); + if(yych == 0x0A) goto yy14; + if(yych == 0x0D) goto yy12; yy11: #line 154 "scanner.re" - { + { if (ignore_eoc) { if (ignore_cnt) { out << "\n" << sourceFileInfo; @@ -169,21 +170,21 @@ tok = pos = cursor; goto echo; } -#line 173 "scanner.cc" +#line 174 "<stdout>" yy12: - yych = *++YYCURSOR; - if(yych == 0x0A) goto yy14; + yych = *++YYCURSOR; + if(yych == 0x0A) goto yy14; yy13: - YYCURSOR = YYMARKER; - if(yyaccept <= 0) { - goto yy3; - } else { - goto yy11; - } + YYCURSOR = YYMARKER; + if(yyaccept <= 0) { + goto yy3; + } else { + goto yy11; + } yy14: - ++YYCURSOR; + ++YYCURSOR; #line 140 "scanner.re" - { + { cline++; if (ignore_eoc) { if (ignore_cnt) { @@ -197,40 +198,40 @@ tok = pos = cursor; goto echo; } -#line 201 "scanner.cc" +#line 202 "<stdout>" yy16: - yych = *++YYCURSOR; - if(yych != '!') goto yy13; - yych = *++YYCURSOR; - switch(yych) { - case 'g': goto yy19; - case 'i': goto yy18; - case 'm': goto yy20; - case 'r': goto yy21; - default: goto yy13; - } + yych = *++YYCURSOR; + if(yych != '!') goto yy13; + yych = *++YYCURSOR; + switch(yych) { + case 'g': goto yy19; + case 'i': goto yy18; + case 'm': goto yy20; + case 'r': goto yy21; + default: goto yy13; + } yy18: - yych = *++YYCURSOR; - if(yych == 'g') goto yy47; - goto yy13; + yych = *++YYCURSOR; + if(yych == 'g') goto yy47; + goto yy13; yy19: - yych = *++YYCURSOR; - if(yych == 'e') goto yy34; - goto yy13; + yych = *++YYCURSOR; + if(yych == 'e') goto yy34; + goto yy13; yy20: - yych = *++YYCURSOR; - if(yych == 'a') goto yy26; - goto yy13; + yych = *++YYCURSOR; + if(yych == 'a') goto yy26; + goto yy13; yy21: - yych = *++YYCURSOR; - if(yych != 'e') goto yy13; - yych = *++YYCURSOR; - if(yych != '2') goto yy13; - yych = *++YYCURSOR; - if(yych != 'c') goto yy13; - ++YYCURSOR; + yych = *++YYCURSOR; + if(yych != 'e') goto yy13; + yych = *++YYCURSOR; + if(yych != '2') goto yy13; + yych = *++YYCURSOR; + if(yych != 'c') goto yy13; + ++YYCURSOR; #line 111 "scanner.re" - { + { if (bUsedYYMaxFill && bSinglePass) { fatal("found scanner block after YYMAXFILL declaration"); } @@ -238,23 +239,23 @@ tok = cursor; RETURN(1); } -#line 242 "scanner.cc" +#line 243 "<stdout>" yy26: - yych = *++YYCURSOR; - if(yych != 'x') goto yy13; - yych = *++YYCURSOR; - if(yych != ':') goto yy13; - yych = *++YYCURSOR; - if(yych != 'r') goto yy13; - yych = *++YYCURSOR; - if(yych != 'e') goto yy13; - yych = *++YYCURSOR; - if(yych != '2') goto yy13; - yych = *++YYCURSOR; - if(yych != 'c') goto yy13; - ++YYCURSOR; + yych = *++YYCURSOR; + if(yych != 'x') goto yy13; + yych = *++YYCURSOR; + if(yych != ':') goto yy13; + yych = *++YYCURSOR; + if(yych != 'r') goto yy13; + yych = *++YYCURSOR; + if(yych != 'e') goto yy13; + yych = *++YYCURSOR; + if(yych != '2') goto yy13; + yych = *++YYCURSOR; + if(yych != 'c') goto yy13; + ++YYCURSOR; #line 119 "scanner.re" - { + { if (bUsedYYMaxFill) { fatal("cannot generate YYMAXFILL twice"); } @@ -264,66 +265,67 @@ bUsedYYMaxFill = true; goto echo; } -#line 268 "scanner.cc" +#line 269 "<stdout>" yy34: - yych = *++YYCURSOR; - if(yych != 't') goto yy13; - yych = *++YYCURSOR; - if(yych != 's') goto yy13; - yych = *++YYCURSOR; - if(yych != 't') goto yy13; - yych = *++YYCURSOR; - if(yych != 'a') goto yy13; - yych = *++YYCURSOR; - if(yych != 't') goto yy13; - yych = *++YYCURSOR; - if(yych != 'e') goto yy13; - yych = *++YYCURSOR; - if(yych != ':') goto yy13; - yych = *++YYCURSOR; - if(yych != 'r') goto yy13; - yych = *++YYCURSOR; - if(yych != 'e') goto yy13; - yych = *++YYCURSOR; - if(yych != '2') goto yy13; - yych = *++YYCURSOR; - if(yych != 'c') goto yy13; - ++YYCURSOR; + yych = *++YYCURSOR; + if(yych != 't') goto yy13; + yych = *++YYCURSOR; + if(yych != 's') goto yy13; + yych = *++YYCURSOR; + if(yych != 't') goto yy13; + yych = *++YYCURSOR; + if(yych != 'a') goto yy13; + yych = *++YYCURSOR; + if(yych != 't') goto yy13; + yych = *++YYCURSOR; + if(yych != 'e') goto yy13; + yych = *++YYCURSOR; + if(yych != ':') goto yy13; + yych = *++YYCURSOR; + if(yych != 'r') goto yy13; + yych = *++YYCURSOR; + if(yych != 'e') goto yy13; + yych = *++YYCURSOR; + if(yych != '2') goto yy13; + yych = *++YYCURSOR; + if(yych != 'c') goto yy13; + ++YYCURSOR; #line 129 "scanner.re" - { + { tok = pos = cursor; genGetState(out, topIndent, 0); ignore_eoc = true; goto echo; } -#line 300 "scanner.cc" +#line 301 "<stdout>" yy47: - yych = *++YYCURSOR; - if(yych != 'n') goto yy13; - yych = *++YYCURSOR; - if(yych != 'o') goto yy13; - yych = *++YYCURSOR; - if(yych != 'r') goto yy13; - yych = *++YYCURSOR; - if(yych != 'e') goto yy13; - yych = *++YYCURSOR; - if(yych != ':') goto yy13; - yych = *++YYCURSOR; - if(yych != 'r') goto yy13; - yych = *++YYCURSOR; - if(yych != 'e') goto yy13; - yych = *++YYCURSOR; - if(yych != '2') goto yy13; - yych = *++YYCURSOR; - if(yych != 'c') goto yy13; - ++YYCURSOR; + yych = *++YYCURSOR; + if(yych != 'n') goto yy13; + yych = *++YYCURSOR; + if(yych != 'o') goto yy13; + yych = *++YYCURSOR; + if(yych != 'r') goto yy13; + yych = *++YYCURSOR; + if(yych != 'e') goto yy13; + yych = *++YYCURSOR; + if(yych != ':') goto yy13; + yych = *++YYCURSOR; + if(yych != 'r') goto yy13; + yych = *++YYCURSOR; + if(yych != 'e') goto yy13; + yych = *++YYCURSOR; + if(yych != '2') goto yy13; + yych = *++YYCURSOR; + if(yych != 'c') goto yy13; + ++YYCURSOR; #line 135 "scanner.re" - { + { tok = pos = cursor; ignore_eoc = true; goto echo; } -#line 327 "scanner.cc" +#line 328 "<stdout>" + } } #line 187 "scanner.re" @@ -347,918 +349,999 @@ { goto value; } +{ + static unsigned char yybm[] = { + 112, 112, 112, 112, 112, 112, 112, 112, + 112, 114, 0, 112, 112, 112, 112, 112, + 112, 112, 112, 112, 112, 112, 112, 112, + 112, 112, 112, 112, 112, 112, 112, 112, + 114, 112, 48, 112, 112, 112, 112, 80, + 112, 112, 112, 112, 112, 112, 112, 112, + 252, 252, 252, 252, 252, 252, 252, 252, + 252, 252, 112, 112, 112, 112, 112, 112, + 112, 124, 124, 124, 124, 124, 124, 124, + 124, 124, 124, 124, 124, 124, 124, 124, + 124, 124, 124, 124, 124, 124, 124, 124, + 124, 124, 124, 112, 0, 96, 112, 120, + 112, 124, 124, 124, 124, 124, 124, 124, + 124, 124, 124, 124, 124, 124, 124, 124, + 124, 124, 124, 124, 124, 124, 124, 124, + 124, 124, 124, 112, 112, 112, 112, 112, + 112, 112, 112, 112, 112, 112, 112, 112, + 112, 112, 112, 112, 112, 112, 112, 112, + 112, 112, 112, 112, 112, 112, 112, 112, + 112, 112, 112, 112, 112, 112, 112, 112, + 112, 112, 112, 112, 112, 112, 112, 112, + 112, 112, 112, 112, 112, 112, 112, 112, + 112, 112, 112, 112, 112, 112, 112, 112, + 112, 112, 112, 112, 112, 112, 112, 112, + 112, 112, 112, 112, 112, 112, 112, 112, + 112, 112, 112, 112, 112, 112, 112, 112, + 112, 112, 112, 112, 112, 112, 112, 112, + 112, 112, 112, 112, 112, 112, 112, 112, + 112, 112, 112, 112, 112, 112, 112, 112, + 112, 112, 112, 112, 112, 112, 112, 112, + 112, 112, 112, 112, 112, 112, 112, 112, + 112, 112, 112, 112, 112, 112, 112, 112, + }; -#line 352 "scanner.cc" -{ - YYCTYPE yych; - unsigned int yyaccept = 0; - if((YYLIMIT - YYCURSOR) < 5) YYFILL(5); - yych = *YYCURSOR; - if(yych <= '/') { - if(yych <= '!') { - if(yych <= 0x0C) { - if(yych <= 0x08) goto yy85; - if(yych <= 0x09) goto yy79; - if(yych <= 0x0A) goto yy81; - goto yy85; +#line 389 "<stdout>" + { + YYCTYPE yych; + unsigned int yyaccept = 0; + if((YYLIMIT - YYCURSOR) < 5) YYFILL(5); + yych = *YYCURSOR; + if(yych <= '/') { + if(yych <= '!') { + if(yych <= 0x0C) { + if(yych <= 0x08) goto yy85; + if(yych <= 0x09) goto yy79; + if(yych <= 0x0A) goto yy81; + goto yy85; + } else { + if(yych <= 0x0D) goto yy83; + if(yych == ' ') goto yy79; + goto yy85; + } } else { - if(yych <= 0x0D) goto yy83; - if(yych == ' ') goto yy79; - goto yy85; + if(yych <= ')') { + if(yych <= '"') goto yy66; + if(yych <= '&') goto yy85; + if(yych <= '\'') goto yy68; + goto yy72; + } else { + if(yych <= '+') { + if(yych <= '*') goto yy64; + goto yy73; + } else { + if(yych <= '-') goto yy85; + if(yych <= '.') goto yy77; + goto yy62; + } + } } } else { - if(yych <= ')') { - if(yych <= '"') goto yy66; - if(yych <= '&') goto yy85; - if(yych <= '\'') goto yy68; - goto yy72; - } else { - if(yych <= '+') { - if(yych <= '*') goto yy64; - goto yy73; + if(yych <= 'Z') { + if(yych <= '=') { + if(yych == ';') goto yy72; + if(yych <= '<') goto yy85; + goto yy72; } else { - if(yych <= '-') goto yy85; - if(yych <= '.') goto yy77; - goto yy62; + if(yych == '?') goto yy73; + if(yych <= '@') goto yy85; + goto yy76; } - } - } - } else { - if(yych <= 'Z') { - if(yych <= '=') { - if(yych == ';') goto yy72; - if(yych <= '<') goto yy85; - goto yy72; } else { - if(yych == '?') goto yy73; - if(yych <= '@') goto yy85; - goto yy76; - } - } else { - if(yych <= 'q') { - if(yych <= '[') goto yy70; - if(yych <= '\\') goto yy72; - if(yych <= '`') goto yy85; - goto yy76; - } else { - if(yych <= 'z') { - if(yych <= 'r') goto yy74; + if(yych <= 'q') { + if(yych <= '[') goto yy70; + if(yych <= '\\') goto yy72; + if(yych <= '`') goto yy85; goto yy76; } else { - if(yych <= '{') goto yy60; - if(yych <= '|') goto yy72; - goto yy85; + if(yych <= 'z') { + if(yych <= 'r') goto yy74; + goto yy76; + } else { + if(yych <= '{') goto yy60; + if(yych <= '|') goto yy72; + goto yy85; + } } } } - } yy60: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if(yych <= '/') { - if(yych == ',') goto yy126; - } else { - if(yych <= '0') goto yy123; - if(yych <= '9') goto yy124; - } + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + if(yych <= '/') { + if(yych == ',') goto yy126; + } else { + if(yych <= '0') goto yy123; + if(yych <= '9') goto yy124; + } yy61: #line 209 "scanner.re" - { depth = 1; + { depth = 1; goto code; } -#line 430 "scanner.cc" +#line 467 "<stdout>" yy62: - ++YYCURSOR; - if((yych = *YYCURSOR) == '*') goto yy121; + ++YYCURSOR; + if((yych = *YYCURSOR) == '*') goto yy121; yy63: #line 239 "scanner.re" - { RETURN(*tok); } -#line 437 "scanner.cc" + { RETURN(*tok); } +#line 474 "<stdout>" yy64: - ++YYCURSOR; - if((yych = *YYCURSOR) == '/') goto yy119; + ++YYCURSOR; + if((yych = *YYCURSOR) == '/') goto yy119; yy65: #line 241 "scanner.re" - { yylval.op = *tok; + { yylval.op = *tok; RETURN(CLOSE); } -#line 445 "scanner.cc" +#line 482 "<stdout>" yy66: - yyaccept = 1; - yych = *(YYMARKER = ++YYCURSOR); - if(yych != 0x0A) goto yy115; + yyaccept = 1; + yych = *(YYMARKER = ++YYCURSOR); + if(yych != 0x0A) goto yy115; yy67: #line 226 "scanner.re" - { fatal("unterminated string constant (missing \")"); } -#line 453 "scanner.cc" + { fatal("unterminated string constant (missing \")"); } +#line 490 "<stdout>" yy68: - yyaccept = 2; - yych = *(YYMARKER = ++YYCURSOR); - if(yych != 0x0A) goto yy110; + yyaccept = 2; + yych = *(YYMARKER = ++YYCURSOR); + if(yych != 0x0A) goto yy110; yy69: #line 227 "scanner.re" - { fatal("unterminated string constant (missing ')"); } -#line 461 "scanner.cc" + { fatal("unterminated string constant (missing ')"); } +#line 498 "<stdout>" yy70: - yyaccept = 3; - yych = *(YYMARKER = ++YYCURSOR); - if(yych == 0x0A) goto yy71; - if(yych == '^') goto yy101; - goto yy100; + yyaccept = 3; + yych = *(YYMARKER = ++YYCURSOR); + if(yych == 0x0A) goto yy71; + if(yych == '^') goto yy101; + goto yy100; yy71: #line 237 "scanner.re" - { fatal("unterminated range (missing ])"); } -#line 471 "scanner.cc" + { fatal("unterminated range (missing ])"); } +#line 508 "<stdout>" yy72: - yych = *++YYCURSOR; - goto yy63; + yych = *++YYCURSOR; + goto yy63; yy73: - yych = *++YYCURSOR; - goto yy65; + yych = *++YYCURSOR; + goto yy65; yy74: - ++YYCURSOR; - if((yych = *YYCURSOR) == 'e') goto yy91; - goto yy90; + ++YYCURSOR; + if((yych = *YYCURSOR) == 'e') goto yy91; + goto yy90; yy75: #line 268 "scanner.re" - { cur = cursor; + { cur = cursor; yylval.symbol = Symbol::find(token()); return ID; } -#line 487 "scanner.cc" +#line 524 "<stdout>" yy76: - yych = *++YYCURSOR; - goto yy90; + yych = *++YYCURSOR; + goto yy90; yy77: - ++YYCURSOR; + ++YYCURSOR; #line 272 "scanner.re" - { cur = cursor; + { cur = cursor; yylval.regexp = mkDot(); return RANGE; } -#line 498 "scanner.cc" +#line 535 "<stdout>" yy79: - ++YYCURSOR; - yych = *YYCURSOR; - goto yy88; + ++YYCURSOR; + yych = *YYCURSOR; + goto yy88; yy80: #line 277 "scanner.re" - { goto scan; } -#line 506 "scanner.cc" + { goto scan; } +#line 543 "<stdout>" yy81: - ++YYCURSOR; + ++YYCURSOR; yy82: #line 279 "scanner.re" - { if(cursor == eof) RETURN(0); + { if(cursor == eof) RETURN(0); pos = cursor; cline++; goto scan; } -#line 515 "scanner.cc" +#line 552 "<stdout>" yy83: - ++YYCURSOR; - if((yych = *YYCURSOR) == 0x0A) goto yy86; + ++YYCURSOR; + if((yych = *YYCURSOR) == 0x0A) goto yy86; yy84: #line 284 "scanner.re" - { std::ostringstream msg; + { std::ostringstream msg; msg << "unexpected character: "; prtChOrHex(msg, *tok); fatal(msg.str().c_str()); goto scan; } -#line 527 "scanner.cc" +#line 564 "<stdout>" yy85: - yych = *++YYCURSOR; - goto yy84; + yych = *++YYCURSOR; + goto yy84; yy86: - yych = *++YYCURSOR; - goto yy82; + yych = *++YYCURSOR; + goto yy82; yy87: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; yy88: - if(yych == 0x09) goto yy87; - if(yych == ' ') goto yy87; - goto yy80; + if(yybm[0+yych] & 2) { + goto yy87; + } + goto yy80; yy89: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; yy90: - if(yych <= '@') { - if(yych <= '/') goto yy75; - if(yych <= '9') goto yy89; + if(yybm[0+yych] & 4) { + goto yy89; + } goto yy75; - } else { - if(yych <= 'Z') goto yy89; - if(yych <= '`') goto yy75; - if(yych <= 'z') goto yy89; - goto yy75; - } yy91: - yych = *++YYCURSOR; - if(yych != '2') goto yy90; - yych = *++YYCURSOR; - if(yych != 'c') goto yy90; - yyaccept = 4; - yych = *(YYMARKER = ++YYCURSOR); - if(yych != ':') goto yy90; + yych = *++YYCURSOR; + if(yych != '2') goto yy90; + yych = *++YYCURSOR; + if(yych != 'c') goto yy90; + yyaccept = 4; + yych = *(YYMARKER = ++YYCURSOR); + if(yych != ':') goto yy90; yy94: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if(yych <= '@') goto yy95; - if(yych <= 'Z') goto yy96; - if(yych <= '`') goto yy95; - if(yych <= 'z') goto yy96; + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + if(yych <= '@') goto yy95; + if(yych <= 'Z') goto yy96; + if(yych <= '`') goto yy95; + if(yych <= 'z') goto yy96; yy95: - YYCURSOR = YYMARKER; - if(yyaccept <= 3) { - if(yyaccept <= 1) { - if(yyaccept <= 0) { - goto yy61; + YYCURSOR = YYMARKER; + if(yyaccept <= 3) { + if(yyaccept <= 1) { + if(yyaccept <= 0) { + goto yy61; + } else { + goto yy67; + } } else { - goto yy67; + if(yyaccept <= 2) { + goto yy69; + } else { + goto yy71; + } } } else { - if(yyaccept <= 2) { - goto yy69; + if(yyaccept <= 5) { + if(yyaccept <= 4) { + goto yy75; + } else { + goto yy98; + } } else { - goto yy71; + goto yy127; } } - } else { - if(yyaccept <= 5) { - if(yyaccept <= 4) { - goto yy75; - } else { - goto yy98; - } - } else { - goto yy127; - } - } yy96: - yyaccept = 5; - YYMARKER = ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if(yych <= 'Z') { - if(yych <= '9') { - if(yych >= '0') goto yy96; - } else { - if(yych <= ':') goto yy94; - if(yych >= 'A') goto yy96; + yyaccept = 5; + YYMARKER = ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + if(yybm[0+yych] & 8) { + goto yy96; } - } else { - if(yych <= '_') { - if(yych >= '_') goto yy96; - } else { - if(yych <= '`') goto yy98; - if(yych <= 'z') goto yy96; - } - } + if(yych == ':') goto yy94; yy98: #line 261 "scanner.re" - { cur = cursor; + { cur = cursor; tok+= 5; /* skip "re2c:" */ iscfg = 1; yylval.str = new Str(token()); return CONFIG; } -#line 628 "scanner.cc" +#line 649 "<stdout>" yy99: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; yy100: - if(yych <= '[') { - if(yych == 0x0A) goto yy95; - goto yy99; - } else { + if(yybm[0+yych] & 16) { + goto yy99; + } + if(yych <= '[') goto yy95; if(yych <= '\\') goto yy103; - if(yych <= ']') goto yy104; - goto yy99; - } + goto yy104; yy101: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if(yych <= '[') { + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + if(yych <= '[') { + if(yych == 0x0A) goto yy95; + goto yy101; + } else { + if(yych <= '\\') goto yy106; + if(yych <= ']') goto yy107; + goto yy101; + } +yy103: + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; if(yych == 0x0A) goto yy95; - goto yy101; - } else { - if(yych <= '\\') goto yy106; - if(yych <= ']') goto yy107; - goto yy101; - } -yy103: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if(yych == 0x0A) goto yy95; - goto yy99; + goto yy99; yy104: - ++YYCURSOR; + ++YYCURSOR; #line 233 "scanner.re" - { cur = cursor; + { cur = cursor; yylval.regexp = ranToRE(token()); return RANGE; } -#line 666 "scanner.cc" +#line 685 "<stdout>" yy106: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if(yych == 0x0A) goto yy95; - goto yy101; + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + if(yych == 0x0A) goto yy95; + goto yy101; yy107: - ++YYCURSOR; + ++YYCURSOR; #line 229 "scanner.re" - { cur = cursor; + { cur = cursor; yylval.regexp = invToRE(token()); return RANGE; } -#line 679 "scanner.cc" +#line 698 "<stdout>" yy109: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; yy110: - if(yych <= '&') { + if(yybm[0+yych] & 32) { + goto yy109; + } + if(yych <= '&') goto yy95; + if(yych <= '\'') goto yy112; + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; if(yych == 0x0A) goto yy95; goto yy109; - } else { - if(yych <= '\'') goto yy112; - if(yych != '\\') goto yy109; - } - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if(yych == 0x0A) goto yy95; - goto yy109; yy112: - ++YYCURSOR; + ++YYCURSOR; #line 222 "scanner.re" - { cur = cursor; + { cur = cursor; yylval.regexp = strToCaseInsensitiveRE(token()); return STRING; } -#line 703 "scanner.cc" +#line 720 "<stdout>" yy114: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; yy115: - if(yych <= '!') { + if(yybm[0+yych] & 64) { + goto yy114; + } + if(yych <= '!') goto yy95; + if(yych <= '"') goto yy117; + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; if(yych == 0x0A) goto yy95; goto yy114; - } else { - if(yych <= '"') goto yy117; - if(yych != '\\') goto yy114; - } - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if(yych == 0x0A) goto yy95; - goto yy114; yy117: - ++YYCURSOR; + ++YYCURSOR; #line 218 "scanner.re" - { cur = cursor; + { cur = cursor; yylval.regexp = strToRE(token()); return STRING; } -#line 727 "scanner.cc" +#line 742 "<stdout>" yy119: - ++YYCURSOR; + ++YYCURSOR; #line 215 "scanner.re" - { tok = cursor; + { tok = cursor; RETURN(0); } -#line 733 "scanner.cc" +#line 748 "<stdout>" yy121: - ++YYCURSOR; + ++YYCURSOR; #line 212 "scanner.re" - { depth = 1; + { depth = 1; goto comment; } -#line 739 "scanner.cc" +#line 754 "<stdout>" yy123: - yych = *++YYCURSOR; - if(yych == ',') goto yy137; - goto yy125; + yych = *++YYCURSOR; + if(yych == ',') goto yy137; + goto yy125; yy124: - ++YYCURSOR; - if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); - yych = *YYCURSOR; + ++YYCURSOR; + if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); + yych = *YYCURSOR; yy125: - if(yych <= '/') { + if(yybm[0+yych] & 128) { + goto yy124; + } if(yych == ',') goto yy130; - goto yy95; - } else { - if(yych <= '9') goto yy124; if(yych == '}') goto yy128; goto yy95; - } yy126: - ++YYCURSOR; + ++YYCURSOR; yy127: #line 259 "scanner.re" - { fatal("illegal closure form, use '{n}', '{n,}', '{n,m}' where n and m are numbers"); } -#line 762 "scanner.cc" + { fatal("illegal closure form, use '{n}', '{n,}', '{n,m}' where n and m are numbers"); } +#line 775 "<stdout>" yy128: - ++YYCURSOR; + ++YYCURSOR; #line 247 "scanner.re" - { yylval.extop.minsize = atoi((char *)tok+1); + { yylval.extop.minsize = atoi((char *)tok+1); yylval.extop.maxsize = atoi((char *)tok+1); RETURN(CLOSESIZE); } -#line 769 "scanner.cc" +#line 782 "<stdout>" yy130: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if(yych <= '/') goto yy127; - if(yych <= '9') goto yy133; - if(yych != '}') goto yy127; - ++YYCURSOR; + yyaccept = 6; + yych = *(YYMARKER = ++YYCURSOR); + if(yych <= '/') goto yy127; + if(yych <= '9') goto yy133; + if(yych != '}') goto yy127; + ++YYCURSOR; #line 255 "scanner.re" - { yylval.extop.minsize = atoi((char *)tok+1); + { yylval.extop.minsize = atoi((char *)tok+1); yylval.extop.maxsize = -1; RETURN(CLOSESIZE); } -#line 781 "scanner.cc" +#line 794 "<stdout>" yy133: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if(yych <= '/') goto yy95; - if(yych <= '9') goto yy133; - if(yych != '}') goto yy95; - ++YYCURSOR; + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + if(yych <= '/') goto yy95; + if(yych <= '9') goto yy133; + if(yych != '}') goto yy95; + ++YYCURSOR; #line 251 "scanner.re" - { yylval.extop.minsize = atoi((char *)tok+1); + { yylval.extop.minsize = atoi((char *)tok+1); yylval.extop.maxsize = MAX(yylval.extop.minsize,atoi(strchr((char *)tok, ',')+1)); RETURN(CLOSESIZE); } -#line 794 "scanner.cc" +#line 807 "<stdout>" yy137: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if(yych <= '/') goto yy127; - if(yych <= '9') goto yy133; - if(yych != '}') goto yy127; - ++YYCURSOR; + yyaccept = 6; + yych = *(YYMARKER = ++YYCURSOR); + if(yych <= '/') goto yy127; + if(yych <= '9') goto yy133; + if(yych != '}') goto yy127; + ++YYCURSOR; #line 244 "scanner.re" - { yylval.op = '*'; + { yylval.op = '*'; RETURN(CLOSE); } -#line 805 "scanner.cc" +#line 818 "<stdout>" + } } #line 290 "scanner.re" code: +{ + static unsigned char yybm[] = { + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 0, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 64, 192, 192, 192, 192, 128, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 0, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + }; -#line 812 "scanner.cc" -{ - YYCTYPE yych; - if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); - yych = *YYCURSOR; - if(yych <= '&') { - if(yych <= 0x0A) { - if(yych <= 0x09) goto yy148; - goto yy146; +#line 861 "<stdout>" + { + YYCTYPE yych; + if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); + yych = *YYCURSOR; + if(yych <= '&') { + if(yych <= 0x0A) { + if(yych <= 0x09) goto yy148; + goto yy146; + } else { + if(yych == '"') goto yy150; + goto yy148; + } } else { - if(yych == '"') goto yy150; - goto yy148; + if(yych <= '{') { + if(yych <= '\'') goto yy151; + if(yych <= 'z') goto yy148; + goto yy144; + } else { + if(yych != '}') goto yy148; + } } - } else { - if(yych <= '{') { - if(yych <= '\'') goto yy151; - if(yych <= 'z') goto yy148; - goto yy144; - } else { - if(yych != '}') goto yy148; - } - } - ++YYCURSOR; + ++YYCURSOR; #line 294 "scanner.re" - { if(--depth == 0){ + { if(--depth == 0){ cur = cursor; yylval.token = new Token(token(), tline); return CODE; } goto code; } -#line 842 "scanner.cc" +#line 891 "<stdout>" yy144: - ++YYCURSOR; + ++YYCURSOR; #line 300 "scanner.re" - { ++depth; + { ++depth; goto code; } -#line 848 "scanner.cc" +#line 897 "<stdout>" yy146: - ++YYCURSOR; + ++YYCURSOR; #line 302 "scanner.re" - { if(cursor == eof) fatal("missing '}'"); + { if(cursor == eof) fatal("missing '}'"); pos = cursor; cline++; goto code; } -#line 856 "scanner.cc" +#line 905 "<stdout>" yy148: - ++YYCURSOR; + ++YYCURSOR; yy149: #line 306 "scanner.re" - { goto code; } -#line 862 "scanner.cc" + { goto code; } +#line 911 "<stdout>" yy150: - yych = *(YYMARKER = ++YYCURSOR); - if(yych == 0x0A) goto yy149; - goto yy157; + yych = *(YYMARKER = ++YYCURSOR); + if(yych == 0x0A) goto yy149; + goto yy157; yy151: - yych = *(YYMARKER = ++YYCURSOR); - if(yych == 0x0A) goto yy149; - goto yy153; + yych = *(YYMARKER = ++YYCURSOR); + if(yych == 0x0A) goto yy149; + goto yy153; yy152: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; yy153: - if(yych <= '&') { - if(yych != 0x0A) goto yy152; - } else { + if(yybm[0+yych] & 64) { + goto yy152; + } + if(yych <= '&') goto yy154; if(yych <= '\'') goto yy148; - if(yych == '\\') goto yy155; - goto yy152; - } + goto yy155; yy154: - YYCURSOR = YYMARKER; - goto yy149; + YYCURSOR = YYMARKER; + goto yy149; yy155: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if(yych == 0x0A) goto yy154; - goto yy152; + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + if(yych == 0x0A) goto yy154; + goto yy152; yy156: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; yy157: - if(yych <= '!') { + if(yybm[0+yych] & 128) { + goto yy156; + } + if(yych <= '!') goto yy154; + if(yych <= '"') goto yy148; + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; if(yych == 0x0A) goto yy154; goto yy156; - } else { - if(yych <= '"') goto yy148; - if(yych != '\\') goto yy156; } - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if(yych == 0x0A) goto yy154; - goto yy156; } #line 307 "scanner.re" comment: +{ -#line 915 "scanner.cc" -{ - YYCTYPE yych; - if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); - yych = *YYCURSOR; - if(yych <= ')') { - if(yych == 0x0A) goto yy164; - goto yy166; - } else { - if(yych <= '*') goto yy161; - if(yych == '/') goto yy163; - goto yy166; - } +#line 963 "<stdout>" + { + YYCTYPE yych; + if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); + yych = *YYCURSOR; + if(yych <= ')') { + if(yych == 0x0A) goto yy164; + goto yy166; + } else { + if(yych <= '*') goto yy161; + if(yych == '/') goto yy163; + goto yy166; + } yy161: - ++YYCURSOR; - if((yych = *YYCURSOR) == '/') goto yy169; + ++YYCURSOR; + if((yych = *YYCURSOR) == '/') goto yy169; yy162: #line 322 "scanner.re" - { if(cursor == eof) RETURN(0); + { if(cursor == eof) RETURN(0); goto comment; } -#line 935 "scanner.cc" +#line 983 "<stdout>" yy163: - yych = *++YYCURSOR; - if(yych == '*') goto yy167; - goto yy162; + yych = *++YYCURSOR; + if(yych == '*') goto yy167; + goto yy162; yy164: - ++YYCURSOR; + ++YYCURSOR; #line 318 "scanner.re" - { if(cursor == eof) RETURN(0); + { if(cursor == eof) RETURN(0); tok = pos = cursor; cline++; goto comment; } -#line 947 "scanner.cc" +#line 995 "<stdout>" yy166: - yych = *++YYCURSOR; - goto yy162; + yych = *++YYCURSOR; + goto yy162; yy167: - ++YYCURSOR; + ++YYCURSOR; #line 315 "scanner.re" - { ++depth; + { ++depth; fatal("ambiguous /* found"); goto comment; } -#line 957 "scanner.cc" +#line 1005 "<stdout>" yy169: - ++YYCURSOR; + ++YYCURSOR; #line 311 "scanner.re" - { if(--depth == 0) + { if(--depth == 0) goto scan; else goto comment; } -#line 965 "scanner.cc" +#line 1013 "<stdout>" + } } #line 324 "scanner.re" config: +{ + static unsigned char yybm[] = { + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 128, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 128, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + }; -#line 972 "scanner.cc" -{ - YYCTYPE yych; - if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); - yych = *YYCURSOR; - if(yych <= 0x1F) { - if(yych != 0x09) goto yy177; - } else { - if(yych <= ' ') goto yy173; - if(yych == '=') goto yy175; - goto yy177; - } +#line 1056 "<stdout>" + { + YYCTYPE yych; + if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); + yych = *YYCURSOR; + if(yych <= 0x1F) { + if(yych != 0x09) goto yy177; + } else { + if(yych <= ' ') goto yy173; + if(yych == '=') goto yy175; + goto yy177; + } yy173: - ++YYCURSOR; - yych = *YYCURSOR; - goto yy182; + ++YYCURSOR; + yych = *YYCURSOR; + goto yy182; yy174: #line 328 "scanner.re" - { goto config; } -#line 991 "scanner.cc" + { goto config; } +#line 1075 "<stdout>" yy175: - ++YYCURSOR; - yych = *YYCURSOR; - goto yy180; + ++YYCURSOR; + yych = *YYCURSOR; + goto yy180; yy176: #line 329 "scanner.re" - { iscfg = 2; + { iscfg = 2; cur = cursor; RETURN('='); } -#line 1002 "scanner.cc" +#line 1086 "<stdout>" yy177: - ++YYCURSOR; + ++YYCURSOR; #line 333 "scanner.re" - { fatal("missing '='"); } -#line 1007 "scanner.cc" + { fatal("missing '='"); } +#line 1091 "<stdout>" yy179: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; yy180: - if(yych == 0x09) goto yy179; - if(yych == ' ') goto yy179; - goto yy176; + if(yybm[0+yych] & 128) { + goto yy179; + } + goto yy176; yy181: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; yy182: - if(yych == 0x09) goto yy181; - if(yych == ' ') goto yy181; - goto yy174; + if(yych == 0x09) goto yy181; + if(yych == ' ') goto yy181; + goto yy174; + } } #line 334 "scanner.re" value: +{ + static unsigned char yybm[] = { + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 192, 0, 248, 248, 192, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 192, 248, 104, 248, 248, 248, 248, 152, + 248, 248, 248, 248, 248, 248, 248, 248, + 252, 252, 252, 252, 252, 252, 252, 252, + 252, 252, 248, 192, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 8, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + }; -#line 1030 "scanner.cc" -{ - YYCTYPE yych; - if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); - yych = *YYCURSOR; - if(yych <= '&') { - if(yych <= 0x0D) { - if(yych <= 0x08) goto yy191; - if(yych <= 0x0A) goto yy185; - if(yych <= 0x0C) goto yy191; - } else { - if(yych <= ' ') { - if(yych <= 0x1F) goto yy191; +#line 1151 "<stdout>" + { + YYCTYPE yych; + if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); + yych = *YYCURSOR; + if(yych <= '&') { + if(yych <= 0x0D) { + if(yych <= 0x08) goto yy191; + if(yych <= 0x0A) goto yy185; + if(yych <= 0x0C) goto yy191; } else { - if(yych == '"') goto yy193; - goto yy191; + if(yych <= ' ') { + if(yych <= 0x1F) goto yy191; + } else { + if(yych == '"') goto yy193; + goto yy191; + } } - } - } else { - if(yych <= '/') { - if(yych <= '\'') goto yy195; - if(yych == '-') goto yy188; - goto yy191; } else { - if(yych <= '9') { - if(yych <= '0') goto yy186; - goto yy189; + if(yych <= '/') { + if(yych <= '\'') goto yy195; + if(yych == '-') goto yy188; + goto yy191; } else { - if(yych != ';') goto yy191; + if(yych <= '9') { + if(yych <= '0') goto yy186; + goto yy189; + } else { + if(yych != ';') goto yy191; + } } } - } yy185: #line 343 "scanner.re" - { cur = cursor; + { cur = cursor; yylval.str = new Str(token()); iscfg = 0; return VALUE; } -#line 1069 "scanner.cc" +#line 1190 "<stdout>" yy186: - ++YYCURSOR; - if((yych = *YYCURSOR) <= 0x0D) { - if(yych <= 0x08) goto yy191; - if(yych <= 0x0A) goto yy187; - if(yych <= 0x0C) goto yy191; - } else { - if(yych <= ' ') { - if(yych <= 0x1F) goto yy191; - } else { - if(yych != ';') goto yy191; + ++YYCURSOR; + if(yybm[0+(yych = *YYCURSOR)] & 8) { + goto yy191; } - } yy187: #line 338 "scanner.re" - { cur = cursor; + { cur = cursor; yylval.number = atoi(token().to_string().c_str()); iscfg = 0; return NUMBER; } -#line 1090 "scanner.cc" +#line 1203 "<stdout>" yy188: - yych = *++YYCURSOR; - if(yych <= '0') goto yy192; - if(yych >= ':') goto yy192; + yych = *++YYCURSOR; + if(yych <= '0') goto yy192; + if(yych >= ':') goto yy192; yy189: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if(yych <= 0x1F) { - if(yych <= 0x0A) { - if(yych >= 0x09) goto yy187; - } else { - if(yych == 0x0D) goto yy187; + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + if(yybm[0+yych] & 4) { + goto yy189; } - } else { - if(yych <= '9') { - if(yych <= ' ') goto yy187; - if(yych >= '0') goto yy189; + if(yych <= 0x0D) { + if(yych <= 0x08) goto yy191; + if(yych <= 0x0A) goto yy187; + if(yych >= 0x0D) goto yy187; } else { - if(yych == ';') goto yy187; + if(yych <= ' ') { + if(yych >= ' ') goto yy187; + } else { + if(yych == ';') goto yy187; + } } - } yy191: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; yy192: - if(yych <= 0x0D) { - if(yych <= 0x08) goto yy191; - if(yych <= 0x0A) goto yy185; - if(yych <= 0x0C) goto yy191; - goto yy185; - } else { - if(yych <= ' ') { - if(yych <= 0x1F) goto yy191; - goto yy185; - } else { - if(yych == ';') goto yy185; + if(yybm[0+yych] & 8) { goto yy191; } - } + goto yy185; yy193: - YYMARKER = ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if(yych <= ' ') { - if(yych <= 0x0A) { - if(yych <= 0x08) goto yy193; - if(yych <= 0x09) goto yy203; - goto yy185; - } else { - if(yych == 0x0D) goto yy203; - if(yych <= 0x1F) goto yy193; + YYMARKER = ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + if(yybm[0+yych] & 16) { + goto yy193; + } + if(yych <= '!') { + if(yych == 0x0A) goto yy185; goto yy203; - } - } else { - if(yych <= ':') { - if(yych == '"') goto yy191; - goto yy193; } else { - if(yych <= ';') goto yy203; - if(yych == '\\') goto yy205; - goto yy193; + if(yych <= '"') goto yy191; + if(yych <= '[') goto yy203; + goto yy205; } - } yy195: - YYMARKER = ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if(yych <= ' ') { - if(yych <= 0x0A) { - if(yych <= 0x08) goto yy195; - if(yych >= 0x0A) goto yy185; - } else { - if(yych == 0x0D) goto yy197; - if(yych <= 0x1F) goto yy195; + YYMARKER = ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + if(yybm[0+yych] & 32) { + goto yy195; } - } else { - if(yych <= ':') { - if(yych == '\'') goto yy191; - goto yy195; + if(yych <= '&') { + if(yych == 0x0A) goto yy185; } else { - if(yych <= ';') goto yy197; - if(yych == '\\') goto yy200; - goto yy195; + if(yych <= '\'') goto yy191; + if(yych >= '\\') goto yy200; } - } yy197: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if(yych <= '&') { - if(yych != 0x0A) goto yy197; - } else { + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + if(yybm[0+yych] & 64) { + goto yy197; + } + if(yych <= '&') goto yy199; if(yych <= '\'') goto yy201; - if(yych == '\\') goto yy202; - goto yy197; - } + goto yy202; yy199: - YYCURSOR = YYMARKER; - goto yy185; + YYCURSOR = YYMARKER; + goto yy185; yy200: - YYMARKER = ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if(yych <= 0x0D) { - if(yych <= 0x09) { - if(yych <= 0x08) goto yy195; - goto yy197; + YYMARKER = ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + if(yych <= 0x0D) { + if(yych <= 0x09) { + if(yych <= 0x08) goto yy195; + goto yy197; + } else { + if(yych <= 0x0A) goto yy185; + if(yych <= 0x0C) goto yy195; + goto yy197; + } } else { - if(yych <= 0x0A) goto yy185; - if(yych <= 0x0C) goto yy195; - goto yy197; + if(yych <= ' ') { + if(yych <= 0x1F) goto yy195; + goto yy197; + } else { + if(yych == ';') goto yy197; + goto yy195; + } } - } else { - if(yych <= ' ') { - if(yych <= 0x1F) goto yy195; - goto yy197; - } else { - if(yych == ';') goto yy197; - goto yy195; - } - } yy201: - yych = *++YYCURSOR; - goto yy185; + yych = *++YYCURSOR; + goto yy185; yy202: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if(yych == 0x0A) goto yy199; - goto yy197; + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + if(yych == 0x0A) goto yy199; + goto yy197; yy203: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if(yych <= '!') { - if(yych == 0x0A) goto yy199; - goto yy203; - } else { + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + if(yybm[0+yych] & 128) { + goto yy203; + } + if(yych <= '!') goto yy199; if(yych <= '"') goto yy201; - if(yych == '\\') goto yy206; - goto yy203; - } + goto yy206; yy205: - YYMARKER = ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if(yych <= 0x0D) { - if(yych <= 0x09) { - if(yych <= 0x08) goto yy193; - goto yy203; + YYMARKER = ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + if(yych <= 0x0D) { + if(yych <= 0x09) { + if(yych <= 0x08) goto yy193; + goto yy203; + } else { + if(yych <= 0x0A) goto yy185; + if(yych <= 0x0C) goto yy193; + goto yy203; + } } else { - if(yych <= 0x0A) goto yy185; - if(yych <= 0x0C) goto yy193; - goto yy203; + if(yych <= ' ') { + if(yych <= 0x1F) goto yy193; + goto yy203; + } else { + if(yych == ';') goto yy203; + goto yy193; + } } - } else { - if(yych <= ' ') { - if(yych <= 0x1F) goto yy193; - goto yy203; - } else { - if(yych == ';') goto yy203; - goto yy193; - } +yy206: + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + if(yych == 0x0A) goto yy199; + goto yy203; } -yy206: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if(yych == 0x0A) goto yy199; - goto yy203; } #line 348 "scanner.re" Modified: trunk/re2c/re2c.spec.in =================================================================== --- trunk/re2c/re2c.spec.in 2006-07-27 00:56:38 UTC (rev 592) +++ trunk/re2c/re2c.spec.in 2006-07-27 00:59:39 UTC (rev 593) @@ -24,7 +24,7 @@ make re2c #regenerate file scanner.cc rm -f scanner.cc -./re2c scanner.re > scanner.cc +./re2c -b scanner.re > scanner.cc rm -f re2c scanner.o make Modified: trunk/re2c/scanner.re =================================================================== --- trunk/re2c/scanner.re 2006-07-27 00:56:38 UTC (rev 592) +++ trunk/re2c/scanner.re 2006-07-27 00:59:39 UTC (rev 593) @@ -17,7 +17,7 @@ #define BSIZE 8192 -#define YYCTYPE char +#define YYCTYPE unsigned char #define YYCURSOR cursor #define YYLIMIT lim #define YYMARKER ptr This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2006-07-27 22:35:56
|
Revision: 599 Author: helly Date: 2006-07-26 18:34:29 -0700 (Wed, 26 Jul 2006) ViewCVS: http://svn.sourceforge.net/re2c/?rev=599&view=rev Log Message: ----------- - Add new test Added Paths: ----------- trunk/re2c/test/bug1528269.c trunk/re2c/test/bug1528269.re Added: trunk/re2c/test/bug1528269.c =================================================================== --- trunk/re2c/test/bug1528269.c (rev 0) +++ trunk/re2c/test/bug1528269.c 2006-07-27 01:34:29 UTC (rev 599) @@ -0,0 +1,6 @@ +/* Generated by re2c */ +#line 1 "bug1528269.re" +void foo() +{ + x='\xFC'; +} Property changes on: trunk/re2c/test/bug1528269.c ___________________________________________________________________ Name: svn:executable + * Name: svn:eol-style + native Added: trunk/re2c/test/bug1528269.re =================================================================== --- trunk/re2c/test/bug1528269.re (rev 0) +++ trunk/re2c/test/bug1528269.re 2006-07-27 01:34:29 UTC (rev 599) @@ -0,0 +1,4 @@ +void foo() +{ + x='\xFC'; +} Property changes on: trunk/re2c/test/bug1528269.re ___________________________________________________________________ Name: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2006-07-27 22:31:35
|
Revision: 592 Author: helly Date: 2006-07-26 17:56:38 -0700 (Wed, 26 Jul 2006) ViewCVS: http://svn.sourceforge.net/re2c/?rev=592&view=rev Log Message: ----------- - Add addtional temp file Modified Paths: -------------- trunk/re2c/.cvsignore Modified: trunk/re2c/.cvsignore =================================================================== --- trunk/re2c/.cvsignore 2006-06-18 18:37:00 UTC (rev 591) +++ trunk/re2c/.cvsignore 2006-07-27 00:56:38 UTC (rev 592) @@ -15,6 +15,7 @@ config.log config.sub config.guess +config_w32.h config.h depcomp compile This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2006-07-27 22:27:50
|
Revision: 598 Author: helly Date: 2006-07-26 18:30:35 -0700 (Wed, 26 Jul 2006) ViewCVS: http://svn.sourceforge.net/re2c/?rev=598&view=rev Log Message: ----------- - Fixed #1528269 Invalid code generation. Modified Paths: -------------- tags/RELEASE_0_10_6/CHANGELOG tags/RELEASE_0_10_6/bootstrap/scanner.cc tags/RELEASE_0_10_6/config_w32.h tags/RELEASE_0_10_6/configure.in tags/RELEASE_0_10_6/scanner.re Added Paths: ----------- tags/RELEASE_0_10_6/test/bug1528269.c tags/RELEASE_0_10_6/test/bug1528269.re Modified: tags/RELEASE_0_10_6/CHANGELOG =================================================================== --- tags/RELEASE_0_10_6/CHANGELOG 2006-07-27 01:23:47 UTC (rev 597) +++ tags/RELEASE_0_10_6/CHANGELOG 2006-07-27 01:30:35 UTC (rev 598) @@ -1,3 +1,7 @@ +Version 0.10.6 (2006-??-??) +--------------------------- +- Fixed #1528269 Invalid code generation. + Version 0.10.5 (2006-06-11) --------------------------- - Fixed long form of -1 switch to --single-pass as noted in man page and help. Modified: tags/RELEASE_0_10_6/bootstrap/scanner.cc =================================================================== --- tags/RELEASE_0_10_6/bootstrap/scanner.cc 2006-07-27 01:23:47 UTC (rev 597) +++ tags/RELEASE_0_10_6/bootstrap/scanner.cc 2006-07-27 01:30:35 UTC (rev 598) @@ -1,4 +1,4 @@ -/* Generated by re2c 0.10.2.dev on Sun Apr 16 20:12:14 2006 */ +/* Generated by re2c 0.10.6 on Thu Jul 27 04:06:32 2006 */ #line 1 "scanner.re" /* $Id$ */ #include <stdlib.h> @@ -19,7 +19,7 @@ #define BSIZE 8192 -#define YYCTYPE char +#define YYCTYPE unsigned char #define YYCURSOR cursor #define YYLIMIT lim #define YYMARKER ptr @@ -92,39 +92,40 @@ tok = cursor; echo: - -#line 97 "scanner.cc" { - YYCTYPE yych; - unsigned int yyaccept = 0; - if((YYLIMIT - YYCURSOR) < 16) YYFILL(16); - yych = *YYCURSOR; - if(yych <= ')') { - if(yych <= 0x00) goto yy7; - if(yych == 0x0A) goto yy5; - goto yy9; - } else { - if(yych <= '*') goto yy4; - if(yych != '/') goto yy9; - } - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if(yych == '*') goto yy16; +#line 98 "<stdout>" + { + YYCTYPE yych; + unsigned int yyaccept = 0; + + if((YYLIMIT - YYCURSOR) < 16) YYFILL(16); + yych = *YYCURSOR; + if(yych <= ')') { + if(yych <= 0x00) goto yy7; + if(yych == 0x0A) goto yy5; + goto yy9; + } else { + if(yych <= '*') goto yy4; + if(yych != '/') goto yy9; + } + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + if(yych == '*') goto yy16; yy3: #line 184 "scanner.re" - { + { goto echo; } -#line 120 "scanner.cc" +#line 121 "<stdout>" yy4: - yych = *++YYCURSOR; - if(yych == '/') goto yy10; - goto yy3; + yych = *++YYCURSOR; + if(yych == '/') goto yy10; + goto yy3; yy5: - ++YYCURSOR; + ++YYCURSOR; #line 167 "scanner.re" - { + { if (ignore_eoc) { ignore_cnt++; } else { @@ -133,11 +134,11 @@ tok = pos = cursor; cline++; goto echo; } -#line 137 "scanner.cc" +#line 138 "<stdout>" yy7: - ++YYCURSOR; + ++YYCURSOR; #line 176 "scanner.re" - { + { if (!ignore_eoc) { out.write((const char*)(tok), (const char*)(cursor) - (const char*)(tok) - 1); // -1 so we don't write out the \0 } @@ -145,18 +146,18 @@ RETURN(0); } } -#line 149 "scanner.cc" +#line 150 "<stdout>" yy9: - yych = *++YYCURSOR; - goto yy3; + yych = *++YYCURSOR; + goto yy3; yy10: - yyaccept = 1; - yych = *(YYMARKER = ++YYCURSOR); - if(yych == 0x0A) goto yy14; - if(yych == 0x0D) goto yy12; + yyaccept = 1; + yych = *(YYMARKER = ++YYCURSOR); + if(yych == 0x0A) goto yy14; + if(yych == 0x0D) goto yy12; yy11: #line 154 "scanner.re" - { + { if (ignore_eoc) { if (ignore_cnt) { out << "\n" << sourceFileInfo; @@ -169,20 +170,21 @@ tok = pos = cursor; goto echo; } -#line 173 "scanner.cc" +#line 174 "<stdout>" yy12: - yych = *++YYCURSOR; - if(yych == 0x0A) goto yy14; + yych = *++YYCURSOR; + if(yych == 0x0A) goto yy14; yy13: - YYCURSOR = YYMARKER; - switch(yyaccept) { - case 1: goto yy11; - case 0: goto yy3; - } + YYCURSOR = YYMARKER; + if(yyaccept <= 0) { + goto yy3; + } else { + goto yy11; + } yy14: - ++YYCURSOR; + ++YYCURSOR; #line 140 "scanner.re" - { + { cline++; if (ignore_eoc) { if (ignore_cnt) { @@ -196,40 +198,40 @@ tok = pos = cursor; goto echo; } -#line 200 "scanner.cc" +#line 202 "<stdout>" yy16: - yych = *++YYCURSOR; - if(yych != '!') goto yy13; - yych = *++YYCURSOR; - switch(yych){ - case 'g': goto yy19; - case 'i': goto yy18; - case 'm': goto yy20; - case 'r': goto yy21; - default: goto yy13; - } + yych = *++YYCURSOR; + if(yych != '!') goto yy13; + yych = *++YYCURSOR; + switch(yych) { + case 'g': goto yy19; + case 'i': goto yy18; + case 'm': goto yy20; + case 'r': goto yy21; + default: goto yy13; + } yy18: - yych = *++YYCURSOR; - if(yych == 'g') goto yy47; - goto yy13; + yych = *++YYCURSOR; + if(yych == 'g') goto yy47; + goto yy13; yy19: - yych = *++YYCURSOR; - if(yych == 'e') goto yy34; - goto yy13; + yych = *++YYCURSOR; + if(yych == 'e') goto yy34; + goto yy13; yy20: - yych = *++YYCURSOR; - if(yych == 'a') goto yy26; - goto yy13; + yych = *++YYCURSOR; + if(yych == 'a') goto yy26; + goto yy13; yy21: - yych = *++YYCURSOR; - if(yych != 'e') goto yy13; - yych = *++YYCURSOR; - if(yych != '2') goto yy13; - yych = *++YYCURSOR; - if(yych != 'c') goto yy13; - ++YYCURSOR; + yych = *++YYCURSOR; + if(yych != 'e') goto yy13; + yych = *++YYCURSOR; + if(yych != '2') goto yy13; + yych = *++YYCURSOR; + if(yych != 'c') goto yy13; + ++YYCURSOR; #line 111 "scanner.re" - { + { if (bUsedYYMaxFill && bSinglePass) { fatal("found scanner block after YYMAXFILL declaration"); } @@ -237,23 +239,23 @@ tok = cursor; RETURN(1); } -#line 241 "scanner.cc" +#line 243 "<stdout>" yy26: - yych = *++YYCURSOR; - if(yych != 'x') goto yy13; - yych = *++YYCURSOR; - if(yych != ':') goto yy13; - yych = *++YYCURSOR; - if(yych != 'r') goto yy13; - yych = *++YYCURSOR; - if(yych != 'e') goto yy13; - yych = *++YYCURSOR; - if(yych != '2') goto yy13; - yych = *++YYCURSOR; - if(yych != 'c') goto yy13; - ++YYCURSOR; + yych = *++YYCURSOR; + if(yych != 'x') goto yy13; + yych = *++YYCURSOR; + if(yych != ':') goto yy13; + yych = *++YYCURSOR; + if(yych != 'r') goto yy13; + yych = *++YYCURSOR; + if(yych != 'e') goto yy13; + yych = *++YYCURSOR; + if(yych != '2') goto yy13; + yych = *++YYCURSOR; + if(yych != 'c') goto yy13; + ++YYCURSOR; #line 119 "scanner.re" - { + { if (bUsedYYMaxFill) { fatal("cannot generate YYMAXFILL twice"); } @@ -263,66 +265,67 @@ bUsedYYMaxFill = true; goto echo; } -#line 267 "scanner.cc" +#line 269 "<stdout>" yy34: - yych = *++YYCURSOR; - if(yych != 't') goto yy13; - yych = *++YYCURSOR; - if(yych != 's') goto yy13; - yych = *++YYCURSOR; - if(yych != 't') goto yy13; - yych = *++YYCURSOR; - if(yych != 'a') goto yy13; - yych = *++YYCURSOR; - if(yych != 't') goto yy13; - yych = *++YYCURSOR; - if(yych != 'e') goto yy13; - yych = *++YYCURSOR; - if(yych != ':') goto yy13; - yych = *++YYCURSOR; - if(yych != 'r') goto yy13; - yych = *++YYCURSOR; - if(yych != 'e') goto yy13; - yych = *++YYCURSOR; - if(yych != '2') goto yy13; - yych = *++YYCURSOR; - if(yych != 'c') goto yy13; - ++YYCURSOR; + yych = *++YYCURSOR; + if(yych != 't') goto yy13; + yych = *++YYCURSOR; + if(yych != 's') goto yy13; + yych = *++YYCURSOR; + if(yych != 't') goto yy13; + yych = *++YYCURSOR; + if(yych != 'a') goto yy13; + yych = *++YYCURSOR; + if(yych != 't') goto yy13; + yych = *++YYCURSOR; + if(yych != 'e') goto yy13; + yych = *++YYCURSOR; + if(yych != ':') goto yy13; + yych = *++YYCURSOR; + if(yych != 'r') goto yy13; + yych = *++YYCURSOR; + if(yych != 'e') goto yy13; + yych = *++YYCURSOR; + if(yych != '2') goto yy13; + yych = *++YYCURSOR; + if(yych != 'c') goto yy13; + ++YYCURSOR; #line 129 "scanner.re" - { + { tok = pos = cursor; genGetState(out, topIndent, 0); ignore_eoc = true; goto echo; } -#line 299 "scanner.cc" +#line 301 "<stdout>" yy47: - yych = *++YYCURSOR; - if(yych != 'n') goto yy13; - yych = *++YYCURSOR; - if(yych != 'o') goto yy13; - yych = *++YYCURSOR; - if(yych != 'r') goto yy13; - yych = *++YYCURSOR; - if(yych != 'e') goto yy13; - yych = *++YYCURSOR; - if(yych != ':') goto yy13; - yych = *++YYCURSOR; - if(yych != 'r') goto yy13; - yych = *++YYCURSOR; - if(yych != 'e') goto yy13; - yych = *++YYCURSOR; - if(yych != '2') goto yy13; - yych = *++YYCURSOR; - if(yych != 'c') goto yy13; - ++YYCURSOR; + yych = *++YYCURSOR; + if(yych != 'n') goto yy13; + yych = *++YYCURSOR; + if(yych != 'o') goto yy13; + yych = *++YYCURSOR; + if(yych != 'r') goto yy13; + yych = *++YYCURSOR; + if(yych != 'e') goto yy13; + yych = *++YYCURSOR; + if(yych != ':') goto yy13; + yych = *++YYCURSOR; + if(yych != 'r') goto yy13; + yych = *++YYCURSOR; + if(yych != 'e') goto yy13; + yych = *++YYCURSOR; + if(yych != '2') goto yy13; + yych = *++YYCURSOR; + if(yych != 'c') goto yy13; + ++YYCURSOR; #line 135 "scanner.re" - { + { tok = pos = cursor; ignore_eoc = true; goto echo; } -#line 326 "scanner.cc" +#line 328 "<stdout>" + } } #line 187 "scanner.re" @@ -346,902 +349,999 @@ { goto value; } +{ + static unsigned char yybm[] = { + 112, 112, 112, 112, 112, 112, 112, 112, + 112, 114, 0, 112, 112, 112, 112, 112, + 112, 112, 112, 112, 112, 112, 112, 112, + 112, 112, 112, 112, 112, 112, 112, 112, + 114, 112, 48, 112, 112, 112, 112, 80, + 112, 112, 112, 112, 112, 112, 112, 112, + 252, 252, 252, 252, 252, 252, 252, 252, + 252, 252, 112, 112, 112, 112, 112, 112, + 112, 124, 124, 124, 124, 124, 124, 124, + 124, 124, 124, 124, 124, 124, 124, 124, + 124, 124, 124, 124, 124, 124, 124, 124, + 124, 124, 124, 112, 0, 96, 112, 120, + 112, 124, 124, 124, 124, 124, 124, 124, + 124, 124, 124, 124, 124, 124, 124, 124, + 124, 124, 124, 124, 124, 124, 124, 124, + 124, 124, 124, 112, 112, 112, 112, 112, + 112, 112, 112, 112, 112, 112, 112, 112, + 112, 112, 112, 112, 112, 112, 112, 112, + 112, 112, 112, 112, 112, 112, 112, 112, + 112, 112, 112, 112, 112, 112, 112, 112, + 112, 112, 112, 112, 112, 112, 112, 112, + 112, 112, 112, 112, 112, 112, 112, 112, + 112, 112, 112, 112, 112, 112, 112, 112, + 112, 112, 112, 112, 112, 112, 112, 112, + 112, 112, 112, 112, 112, 112, 112, 112, + 112, 112, 112, 112, 112, 112, 112, 112, + 112, 112, 112, 112, 112, 112, 112, 112, + 112, 112, 112, 112, 112, 112, 112, 112, + 112, 112, 112, 112, 112, 112, 112, 112, + 112, 112, 112, 112, 112, 112, 112, 112, + 112, 112, 112, 112, 112, 112, 112, 112, + 112, 112, 112, 112, 112, 112, 112, 112, + }; -#line 351 "scanner.cc" -{ - YYCTYPE yych; - unsigned int yyaccept = 0; - if((YYLIMIT - YYCURSOR) < 5) YYFILL(5); - yych = *YYCURSOR; - if(yych <= '/') { - if(yych <= '!') { - if(yych <= 0x0C) { - if(yych <= 0x08) goto yy85; - if(yych <= 0x09) goto yy79; - if(yych <= 0x0A) goto yy81; - goto yy85; +#line 389 "<stdout>" + { + YYCTYPE yych; + unsigned int yyaccept = 0; + if((YYLIMIT - YYCURSOR) < 5) YYFILL(5); + yych = *YYCURSOR; + if(yych <= '/') { + if(yych <= '!') { + if(yych <= 0x0C) { + if(yych <= 0x08) goto yy85; + if(yych <= 0x09) goto yy79; + if(yych <= 0x0A) goto yy81; + goto yy85; + } else { + if(yych <= 0x0D) goto yy83; + if(yych == ' ') goto yy79; + goto yy85; + } } else { - if(yych <= 0x0D) goto yy83; - if(yych == ' ') goto yy79; - goto yy85; + if(yych <= ')') { + if(yych <= '"') goto yy66; + if(yych <= '&') goto yy85; + if(yych <= '\'') goto yy68; + goto yy72; + } else { + if(yych <= '+') { + if(yych <= '*') goto yy64; + goto yy73; + } else { + if(yych <= '-') goto yy85; + if(yych <= '.') goto yy77; + goto yy62; + } + } } } else { - if(yych <= ')') { - if(yych <= '"') goto yy66; - if(yych <= '&') goto yy85; - if(yych <= '\'') goto yy68; - goto yy72; - } else { - if(yych <= '+') { - if(yych <= '*') goto yy64; - goto yy73; + if(yych <= 'Z') { + if(yych <= '=') { + if(yych == ';') goto yy72; + if(yych <= '<') goto yy85; + goto yy72; } else { - if(yych <= '-') goto yy85; - if(yych <= '.') goto yy77; - goto yy62; + if(yych == '?') goto yy73; + if(yych <= '@') goto yy85; + goto yy76; } - } - } - } else { - if(yych <= 'Z') { - if(yych <= '=') { - if(yych == ';') goto yy72; - if(yych <= '<') goto yy85; - goto yy72; } else { - if(yych == '?') goto yy73; - if(yych <= '@') goto yy85; - goto yy76; - } - } else { - if(yych <= 'q') { - if(yych <= '[') goto yy70; - if(yych <= '\\') goto yy72; - if(yych <= '`') goto yy85; - goto yy76; - } else { - if(yych <= 'z') { - if(yych <= 'r') goto yy74; + if(yych <= 'q') { + if(yych <= '[') goto yy70; + if(yych <= '\\') goto yy72; + if(yych <= '`') goto yy85; goto yy76; } else { - if(yych <= '{') goto yy60; - if(yych <= '|') goto yy72; - goto yy85; + if(yych <= 'z') { + if(yych <= 'r') goto yy74; + goto yy76; + } else { + if(yych <= '{') goto yy60; + if(yych <= '|') goto yy72; + goto yy85; + } } } } - } yy60: - yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - if(yych <= '/') { - if(yych == ',') goto yy126; - } else { - if(yych <= '0') goto yy123; - if(yych <= '9') goto yy124; - } + yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + if(yych <= '/') { + if(yych == ',') goto yy126; + } else { + if(yych <= '0') goto yy123; + if(yych <= '9') goto yy124; + } yy61: #line 209 "scanner.re" - { depth = 1; + { depth = 1; goto code; } -#line 429 "scanner.cc" +#line 467 "<stdout>" yy62: - ++YYCURSOR; - if((yych = *YYCURSOR) == '*') goto yy121; + ++YYCURSOR; + if((yych = *YYCURSOR) == '*') goto yy121; yy63: #line 239 "scanner.re" - { RETURN(*tok); } -#line 436 "scanner.cc" + { RETURN(*tok); } +#line 474 "<stdout>" yy64: - ++YYCURSOR; - if((yych = *YYCURSOR) == '/') goto yy119; + ++YYCURSOR; + if((yych = *YYCURSOR) == '/') goto yy119; yy65: #line 241 "scanner.re" - { yylval.op = *tok; + { yylval.op = *tok; RETURN(CLOSE); } -#line 444 "scanner.cc" +#line 482 "<stdout>" yy66: - yyaccept = 1; - yych = *(YYMARKER = ++YYCURSOR); - if(yych != 0x0A) goto yy115; + yyaccept = 1; + yych = *(YYMARKER = ++YYCURSOR); + if(yych != 0x0A) goto yy115; yy67: #line 226 "scanner.re" - { fatal("unterminated string constant (missing \")"); } -#line 452 "scanner.cc" + { fatal("unterminated string constant (missing \")"); } +#line 490 "<stdout>" yy68: - yyaccept = 2; - yych = *(YYMARKER = ++YYCURSOR); - if(yych != 0x0A) goto yy110; + yyaccept = 2; + yych = *(YYMARKER = ++YYCURSOR); + if(yych != 0x0A) goto yy110; yy69: #line 227 "scanner.re" - { fatal("unterminated string constant (missing ')"); } -#line 460 "scanner.cc" + { fatal("unterminated string constant (missing ')"); } +#line 498 "<stdout>" yy70: - yyaccept = 3; - yych = *(YYMARKER = ++YYCURSOR); - if(yych == 0x0A) goto yy71; - if(yych == '^') goto yy101; - goto yy100; + yyaccept = 3; + yych = *(YYMARKER = ++YYCURSOR); + if(yych == 0x0A) goto yy71; + if(yych == '^') goto yy101; + goto yy100; yy71: #line 237 "scanner.re" - { fatal("unterminated range (missing ])"); } -#line 470 "scanner.cc" + { fatal("unterminated range (missing ])"); } +#line 508 "<stdout>" yy72: - yych = *++YYCURSOR; - goto yy63; + yych = *++YYCURSOR; + goto yy63; yy73: - yych = *++YYCURSOR; - goto yy65; + yych = *++YYCURSOR; + goto yy65; yy74: - ++YYCURSOR; - if((yych = *YYCURSOR) == 'e') goto yy91; - goto yy90; + ++YYCURSOR; + if((yych = *YYCURSOR) == 'e') goto yy91; + goto yy90; yy75: #line 268 "scanner.re" - { cur = cursor; + { cur = cursor; yylval.symbol = Symbol::find(token()); return ID; } -#line 486 "scanner.cc" +#line 524 "<stdout>" yy76: - yych = *++YYCURSOR; - goto yy90; + yych = *++YYCURSOR; + goto yy90; yy77: - ++YYCURSOR; + ++YYCURSOR; #line 272 "scanner.re" - { cur = cursor; + { cur = cursor; yylval.regexp = mkDot(); return RANGE; } -#line 497 "scanner.cc" +#line 535 "<stdout>" yy79: - ++YYCURSOR; - yych = *YYCURSOR; - goto yy88; + ++YYCURSOR; + yych = *YYCURSOR; + goto yy88; yy80: #line 277 "scanner.re" - { goto scan; } -#line 505 "scanner.cc" + { goto scan; } +#line 543 "<stdout>" yy81: - ++YYCURSOR; + ++YYCURSOR; yy82: #line 279 "scanner.re" - { if(cursor == eof) RETURN(0); + { if(cursor == eof) RETURN(0); pos = cursor; cline++; goto scan; } -#line 514 "scanner.cc" +#line 552 "<stdout>" yy83: - ++YYCURSOR; - if((yych = *YYCURSOR) == 0x0A) goto yy86; + ++YYCURSOR; + if((yych = *YYCURSOR) == 0x0A) goto yy86; yy84: #line 284 "scanner.re" - { std::ostringstream msg; + { std::ostringstream msg; msg << "unexpected character: "; prtChOrHex(msg, *tok); fatal(msg.str().c_str()); goto scan; } -#line 526 "scanner.cc" +#line 564 "<stdout>" yy85: - yych = *++YYCURSOR; - goto yy84; + yych = *++YYCURSOR; + goto yy84; yy86: - yych = *++YYCURSOR; - goto yy82; + yych = *++YYCURSOR; + goto yy82; yy87: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; yy88: - if(yych == 0x09) goto yy87; - if(yych == ' ') goto yy87; - goto yy80; + if(yybm[0+yych] & 2) { + goto yy87; + } + goto yy80; yy89: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; yy90: - if(yych <= '@') { - if(yych <= '/') goto yy75; - if(yych <= '9') goto yy89; + if(yybm[0+yych] & 4) { + goto yy89; + } goto yy75; - } else { - if(yych <= 'Z') goto yy89; - if(yych <= '`') goto yy75; - if(yych <= 'z') goto yy89; - goto yy75; - } yy91: - yych = *++YYCURSOR; - if(yych != '2') goto yy90; - yych = *++YYCURSOR; - if(yych != 'c') goto yy90; - yyaccept = 4; - yych = *(YYMARKER = ++YYCURSOR); - if(yych != ':') goto yy90; + yych = *++YYCURSOR; + if(yych != '2') goto yy90; + yych = *++YYCURSOR; + if(yych != 'c') goto yy90; + yyaccept = 4; + yych = *(YYMARKER = ++YYCURSOR); + if(yych != ':') goto yy90; yy94: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if(yych <= '@') goto yy95; - if(yych <= 'Z') goto yy96; - if(yych <= '`') goto yy95; - if(yych <= 'z') goto yy96; + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + if(yych <= '@') goto yy95; + if(yych <= 'Z') goto yy96; + if(yych <= '`') goto yy95; + if(yych <= 'z') goto yy96; yy95: - YYCURSOR = YYMARKER; - switch(yyaccept) { - case 0: goto yy61; - case 1: goto yy67; - case 2: goto yy69; - case 3: goto yy71; - case 6: goto yy127; - case 5: goto yy98; - case 4: goto yy75; - } -yy96: - yyaccept = 5; - YYMARKER = ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if(yych <= 'Z') { - if(yych <= '9') { - if(yych >= '0') goto yy96; + YYCURSOR = YYMARKER; + if(yyaccept <= 3) { + if(yyaccept <= 1) { + if(yyaccept <= 0) { + goto yy61; + } else { + goto yy67; + } + } else { + if(yyaccept <= 2) { + goto yy69; + } else { + goto yy71; + } + } } else { - if(yych <= ':') goto yy94; - if(yych >= 'A') goto yy96; + if(yyaccept <= 5) { + if(yyaccept <= 4) { + goto yy75; + } else { + goto yy98; + } + } else { + goto yy127; + } } - } else { - if(yych <= '_') { - if(yych >= '_') goto yy96; - } else { - if(yych <= '`') goto yy98; - if(yych <= 'z') goto yy96; +yy96: + yyaccept = 5; + YYMARKER = ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + if(yybm[0+yych] & 8) { + goto yy96; } - } + if(yych == ':') goto yy94; yy98: #line 261 "scanner.re" - { cur = cursor; + { cur = cursor; tok+= 5; /* skip "re2c:" */ iscfg = 1; yylval.str = new Str(token()); return CONFIG; } -#line 611 "scanner.cc" +#line 649 "<stdout>" yy99: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; yy100: - if(yych <= '[') { - if(yych == 0x0A) goto yy95; - goto yy99; - } else { + if(yybm[0+yych] & 16) { + goto yy99; + } + if(yych <= '[') goto yy95; if(yych <= '\\') goto yy103; - if(yych <= ']') goto yy104; - goto yy99; - } + goto yy104; yy101: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if(yych <= '[') { + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + if(yych <= '[') { + if(yych == 0x0A) goto yy95; + goto yy101; + } else { + if(yych <= '\\') goto yy106; + if(yych <= ']') goto yy107; + goto yy101; + } +yy103: + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; if(yych == 0x0A) goto yy95; - goto yy101; - } else { - if(yych <= '\\') goto yy106; - if(yych <= ']') goto yy107; - goto yy101; - } -yy103: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if(yych == 0x0A) goto yy95; - goto yy99; + goto yy99; yy104: - ++YYCURSOR; + ++YYCURSOR; #line 233 "scanner.re" - { cur = cursor; + { cur = cursor; yylval.regexp = ranToRE(token()); return RANGE; } -#line 649 "scanner.cc" +#line 685 "<stdout>" yy106: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if(yych == 0x0A) goto yy95; - goto yy101; + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + if(yych == 0x0A) goto yy95; + goto yy101; yy107: - ++YYCURSOR; + ++YYCURSOR; #line 229 "scanner.re" - { cur = cursor; + { cur = cursor; yylval.regexp = invToRE(token()); return RANGE; } -#line 662 "scanner.cc" +#line 698 "<stdout>" yy109: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; yy110: - if(yych <= '&') { + if(yybm[0+yych] & 32) { + goto yy109; + } + if(yych <= '&') goto yy95; + if(yych <= '\'') goto yy112; + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; if(yych == 0x0A) goto yy95; goto yy109; - } else { - if(yych <= '\'') goto yy112; - if(yych != '\\') goto yy109; - } - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if(yych == 0x0A) goto yy95; - goto yy109; yy112: - ++YYCURSOR; + ++YYCURSOR; #line 222 "scanner.re" - { cur = cursor; + { cur = cursor; yylval.regexp = strToCaseInsensitiveRE(token()); return STRING; } -#line 686 "scanner.cc" +#line 720 "<stdout>" yy114: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; yy115: - if(yych <= '!') { + if(yybm[0+yych] & 64) { + goto yy114; + } + if(yych <= '!') goto yy95; + if(yych <= '"') goto yy117; + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; if(yych == 0x0A) goto yy95; goto yy114; - } else { - if(yych <= '"') goto yy117; - if(yych != '\\') goto yy114; - } - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if(yych == 0x0A) goto yy95; - goto yy114; yy117: - ++YYCURSOR; + ++YYCURSOR; #line 218 "scanner.re" - { cur = cursor; + { cur = cursor; yylval.regexp = strToRE(token()); return STRING; } -#line 710 "scanner.cc" +#line 742 "<stdout>" yy119: - ++YYCURSOR; + ++YYCURSOR; #line 215 "scanner.re" - { tok = cursor; + { tok = cursor; RETURN(0); } -#line 716 "scanner.cc" +#line 748 "<stdout>" yy121: - ++YYCURSOR; + ++YYCURSOR; #line 212 "scanner.re" - { depth = 1; + { depth = 1; goto comment; } -#line 722 "scanner.cc" +#line 754 "<stdout>" yy123: - yych = *++YYCURSOR; - if(yych == ',') goto yy137; - goto yy125; + yych = *++YYCURSOR; + if(yych == ',') goto yy137; + goto yy125; yy124: - ++YYCURSOR; - if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); - yych = *YYCURSOR; + ++YYCURSOR; + if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); + yych = *YYCURSOR; yy125: - if(yych <= '/') { + if(yybm[0+yych] & 128) { + goto yy124; + } if(yych == ',') goto yy130; - goto yy95; - } else { - if(yych <= '9') goto yy124; if(yych == '}') goto yy128; goto yy95; - } yy126: - ++YYCURSOR; + ++YYCURSOR; yy127: #line 259 "scanner.re" - { fatal("illegal closure form, use '{n}', '{n,}', '{n,m}' where n and m are numbers"); } -#line 745 "scanner.cc" + { fatal("illegal closure form, use '{n}', '{n,}', '{n,m}' where n and m are numbers"); } +#line 775 "<stdout>" yy128: - ++YYCURSOR; + ++YYCURSOR; #line 247 "scanner.re" - { yylval.extop.minsize = atoi((char *)tok+1); + { yylval.extop.minsize = atoi((char *)tok+1); yylval.extop.maxsize = atoi((char *)tok+1); RETURN(CLOSESIZE); } -#line 752 "scanner.cc" +#line 782 "<stdout>" yy130: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if(yych <= '/') goto yy127; - if(yych <= '9') goto yy133; - if(yych != '}') goto yy127; - ++YYCURSOR; + yyaccept = 6; + yych = *(YYMARKER = ++YYCURSOR); + if(yych <= '/') goto yy127; + if(yych <= '9') goto yy133; + if(yych != '}') goto yy127; + ++YYCURSOR; #line 255 "scanner.re" - { yylval.extop.minsize = atoi((char *)tok+1); + { yylval.extop.minsize = atoi((char *)tok+1); yylval.extop.maxsize = -1; RETURN(CLOSESIZE); } -#line 764 "scanner.cc" +#line 794 "<stdout>" yy133: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if(yych <= '/') goto yy95; - if(yych <= '9') goto yy133; - if(yych != '}') goto yy95; - ++YYCURSOR; + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + if(yych <= '/') goto yy95; + if(yych <= '9') goto yy133; + if(yych != '}') goto yy95; + ++YYCURSOR; #line 251 "scanner.re" - { yylval.extop.minsize = atoi((char *)tok+1); + { yylval.extop.minsize = atoi((char *)tok+1); yylval.extop.maxsize = MAX(yylval.extop.minsize,atoi(strchr((char *)tok, ',')+1)); RETURN(CLOSESIZE); } -#line 777 "scanner.cc" +#line 807 "<stdout>" yy137: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if(yych <= '/') goto yy127; - if(yych <= '9') goto yy133; - if(yych != '}') goto yy127; - ++YYCURSOR; + yyaccept = 6; + yych = *(YYMARKER = ++YYCURSOR); + if(yych <= '/') goto yy127; + if(yych <= '9') goto yy133; + if(yych != '}') goto yy127; + ++YYCURSOR; #line 244 "scanner.re" - { yylval.op = '*'; + { yylval.op = '*'; RETURN(CLOSE); } -#line 788 "scanner.cc" +#line 818 "<stdout>" + } } #line 290 "scanner.re" code: +{ + static unsigned char yybm[] = { + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 0, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 64, 192, 192, 192, 192, 128, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 0, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, + }; -#line 795 "scanner.cc" -{ - YYCTYPE yych; - if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); - yych = *YYCURSOR; - if(yych <= '&') { - if(yych <= 0x0A) { - if(yych <= 0x09) goto yy148; - goto yy146; +#line 861 "<stdout>" + { + YYCTYPE yych; + if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); + yych = *YYCURSOR; + if(yych <= '&') { + if(yych <= 0x0A) { + if(yych <= 0x09) goto yy148; + goto yy146; + } else { + if(yych == '"') goto yy150; + goto yy148; + } } else { - if(yych == '"') goto yy150; - goto yy148; + if(yych <= '{') { + if(yych <= '\'') goto yy151; + if(yych <= 'z') goto yy148; + goto yy144; + } else { + if(yych != '}') goto yy148; + } } - } else { - if(yych <= '{') { - if(yych <= '\'') goto yy151; - if(yych <= 'z') goto yy148; - goto yy144; - } else { - if(yych != '}') goto yy148; - } - } - ++YYCURSOR; + ++YYCURSOR; #line 294 "scanner.re" - { if(--depth == 0){ + { if(--depth == 0){ cur = cursor; yylval.token = new Token(token(), tline); return CODE; } goto code; } -#line 825 "scanner.cc" +#line 891 "<stdout>" yy144: - ++YYCURSOR; + ++YYCURSOR; #line 300 "scanner.re" - { ++depth; + { ++depth; goto code; } -#line 831 "scanner.cc" +#line 897 "<stdout>" yy146: - ++YYCURSOR; + ++YYCURSOR; #line 302 "scanner.re" - { if(cursor == eof) fatal("missing '}'"); + { if(cursor == eof) fatal("missing '}'"); pos = cursor; cline++; goto code; } -#line 839 "scanner.cc" +#line 905 "<stdout>" yy148: - ++YYCURSOR; + ++YYCURSOR; yy149: #line 306 "scanner.re" - { goto code; } -#line 845 "scanner.cc" + { goto code; } +#line 911 "<stdout>" yy150: - yych = *(YYMARKER = ++YYCURSOR); - if(yych == 0x0A) goto yy149; - goto yy157; + yych = *(YYMARKER = ++YYCURSOR); + if(yych == 0x0A) goto yy149; + goto yy157; yy151: - yych = *(YYMARKER = ++YYCURSOR); - if(yych == 0x0A) goto yy149; - goto yy153; + yych = *(YYMARKER = ++YYCURSOR); + if(yych == 0x0A) goto yy149; + goto yy153; yy152: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; yy153: - if(yych <= '&') { - if(yych != 0x0A) goto yy152; - } else { + if(yybm[0+yych] & 64) { + goto yy152; + } + if(yych <= '&') goto yy154; if(yych <= '\'') goto yy148; - if(yych == '\\') goto yy155; - goto yy152; - } + goto yy155; yy154: - YYCURSOR = YYMARKER; - goto yy149; + YYCURSOR = YYMARKER; + goto yy149; yy155: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if(yych == 0x0A) goto yy154; - goto yy152; + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + if(yych == 0x0A) goto yy154; + goto yy152; yy156: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; yy157: - if(yych <= '!') { + if(yybm[0+yych] & 128) { + goto yy156; + } + if(yych <= '!') goto yy154; + if(yych <= '"') goto yy148; + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; if(yych == 0x0A) goto yy154; goto yy156; - } else { - if(yych <= '"') goto yy148; - if(yych != '\\') goto yy156; } - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if(yych == 0x0A) goto yy154; - goto yy156; } #line 307 "scanner.re" comment: +{ -#line 898 "scanner.cc" -{ - YYCTYPE yych; - if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); - yych = *YYCURSOR; - if(yych <= ')') { - if(yych == 0x0A) goto yy164; - goto yy166; - } else { - if(yych <= '*') goto yy161; - if(yych == '/') goto yy163; - goto yy166; - } +#line 963 "<stdout>" + { + YYCTYPE yych; + if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); + yych = *YYCURSOR; + if(yych <= ')') { + if(yych == 0x0A) goto yy164; + goto yy166; + } else { + if(yych <= '*') goto yy161; + if(yych == '/') goto yy163; + goto yy166; + } yy161: - ++YYCURSOR; - if((yych = *YYCURSOR) == '/') goto yy169; + ++YYCURSOR; + if((yych = *YYCURSOR) == '/') goto yy169; yy162: #line 322 "scanner.re" - { if(cursor == eof) RETURN(0); + { if(cursor == eof) RETURN(0); goto comment; } -#line 918 "scanner.cc" +#line 983 "<stdout>" yy163: - yych = *++YYCURSOR; - if(yych == '*') goto yy167; - goto yy162; + yych = *++YYCURSOR; + if(yych == '*') goto yy167; + goto yy162; yy164: - ++YYCURSOR; + ++YYCURSOR; #line 318 "scanner.re" - { if(cursor == eof) RETURN(0); + { if(cursor == eof) RETURN(0); tok = pos = cursor; cline++; goto comment; } -#line 930 "scanner.cc" +#line 995 "<stdout>" yy166: - yych = *++YYCURSOR; - goto yy162; + yych = *++YYCURSOR; + goto yy162; yy167: - ++YYCURSOR; + ++YYCURSOR; #line 315 "scanner.re" - { ++depth; + { ++depth; fatal("ambiguous /* found"); goto comment; } -#line 940 "scanner.cc" +#line 1005 "<stdout>" yy169: - ++YYCURSOR; + ++YYCURSOR; #line 311 "scanner.re" - { if(--depth == 0) + { if(--depth == 0) goto scan; else goto comment; } -#line 948 "scanner.cc" +#line 1013 "<stdout>" + } } #line 324 "scanner.re" config: +{ + static unsigned char yybm[] = { + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 128, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 128, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + }; -#line 955 "scanner.cc" -{ - YYCTYPE yych; - if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); - yych = *YYCURSOR; - if(yych <= 0x1F) { - if(yych != 0x09) goto yy177; - } else { - if(yych <= ' ') goto yy173; - if(yych == '=') goto yy175; - goto yy177; - } +#line 1056 "<stdout>" + { + YYCTYPE yych; + if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); + yych = *YYCURSOR; + if(yych <= 0x1F) { + if(yych != 0x09) goto yy177; + } else { + if(yych <= ' ') goto yy173; + if(yych == '=') goto yy175; + goto yy177; + } yy173: - ++YYCURSOR; - yych = *YYCURSOR; - goto yy182; + ++YYCURSOR; + yych = *YYCURSOR; + goto yy182; yy174: #line 328 "scanner.re" - { goto config; } -#line 974 "scanner.cc" + { goto config; } +#line 1075 "<stdout>" yy175: - ++YYCURSOR; - yych = *YYCURSOR; - goto yy180; + ++YYCURSOR; + yych = *YYCURSOR; + goto yy180; yy176: #line 329 "scanner.re" - { iscfg = 2; + { iscfg = 2; cur = cursor; RETURN('='); } -#line 985 "scanner.cc" +#line 1086 "<stdout>" yy177: - ++YYCURSOR; + ++YYCURSOR; #line 333 "scanner.re" - { fatal("missing '='"); } -#line 990 "scanner.cc" + { fatal("missing '='"); } +#line 1091 "<stdout>" yy179: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; yy180: - if(yych == 0x09) goto yy179; - if(yych == ' ') goto yy179; - goto yy176; + if(yybm[0+yych] & 128) { + goto yy179; + } + goto yy176; yy181: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; yy182: - if(yych == 0x09) goto yy181; - if(yych == ' ') goto yy181; - goto yy174; + if(yych == 0x09) goto yy181; + if(yych == ' ') goto yy181; + goto yy174; + } } #line 334 "scanner.re" value: +{ + static unsigned char yybm[] = { + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 192, 0, 248, 248, 192, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 192, 248, 104, 248, 248, 248, 248, 152, + 248, 248, 248, 248, 248, 248, 248, 248, + 252, 252, 252, 252, 252, 252, 252, 252, + 252, 252, 248, 192, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 8, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, + }; -#line 1013 "scanner.cc" -{ - YYCTYPE yych; - if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); - yych = *YYCURSOR; - if(yych <= '&') { - if(yych <= 0x0D) { - if(yych <= 0x08) goto yy191; - if(yych <= 0x0A) goto yy185; - if(yych <= 0x0C) goto yy191; - } else { - if(yych <= ' ') { - if(yych <= 0x1F) goto yy191; +#line 1151 "<stdout>" + { + YYCTYPE yych; + if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); + yych = *YYCURSOR; + if(yych <= '&') { + if(yych <= 0x0D) { + if(yych <= 0x08) goto yy191; + if(yych <= 0x0A) goto yy185; + if(yych <= 0x0C) goto yy191; } else { - if(yych == '"') goto yy193; - goto yy191; + if(yych <= ' ') { + if(yych <= 0x1F) goto yy191; + } else { + if(yych == '"') goto yy193; + goto yy191; + } } - } - } else { - if(yych <= '/') { - if(yych <= '\'') goto yy195; - if(yych == '-') goto yy188; - goto yy191; } else { - if(yych <= '9') { - if(yych <= '0') goto yy186; - goto yy189; + if(yych <= '/') { + if(yych <= '\'') goto yy195; + if(yych == '-') goto yy188; + goto yy191; } else { - if(yych != ';') goto yy191; + if(yych <= '9') { + if(yych <= '0') goto yy186; + goto yy189; + } else { + if(yych != ';') goto yy191; + } } } - } yy185: #line 343 "scanner.re" - { cur = cursor; + { cur = cursor; yylval.str = new Str(token()); iscfg = 0; return VALUE; } -#line 1052 "scanner.cc" +#line 1190 "<stdout>" yy186: - ++YYCURSOR; - if((yych = *YYCURSOR) <= 0x0D) { - if(yych <= 0x08) goto yy191; - if(yych <= 0x0A) goto yy187; - if(yych <= 0x0C) goto yy191; - } else { - if(yych <= ' ') { - if(yych <= 0x1F) goto yy191; - } else { - if(yych != ';') goto yy191; + ++YYCURSOR; + if(yybm[0+(yych = *YYCURSOR)] & 8) { + goto yy191; } - } yy187: #line 338 "scanner.re" - { cur = cursor; + { cur = cursor; yylval.number = atoi(token().to_string().c_str()); iscfg = 0; return NUMBER; } -#line 1073 "scanner.cc" +#line 1203 "<stdout>" yy188: - yych = *++YYCURSOR; - if(yych <= '0') goto yy192; - if(yych >= ':') goto yy192; + yych = *++YYCURSOR; + if(yych <= '0') goto yy192; + if(yych >= ':') goto yy192; yy189: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if(yych <= 0x1F) { - if(yych <= 0x0A) { - if(yych >= 0x09) goto yy187; - } else { - if(yych == 0x0D) goto yy187; + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + if(yybm[0+yych] & 4) { + goto yy189; } - } else { - if(yych <= '9') { - if(yych <= ' ') goto yy187; - if(yych >= '0') goto yy189; + if(yych <= 0x0D) { + if(yych <= 0x08) goto yy191; + if(yych <= 0x0A) goto yy187; + if(yych >= 0x0D) goto yy187; } else { - if(yych == ';') goto yy187; + if(yych <= ' ') { + if(yych >= ' ') goto yy187; + } else { + if(yych == ';') goto yy187; + } } - } yy191: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; yy192: - if(yych <= 0x0D) { - if(yych <= 0x08) goto yy191; - if(yych <= 0x0A) goto yy185; - if(yych <= 0x0C) goto yy191; - goto yy185; - } else { - if(yych <= ' ') { - if(yych <= 0x1F) goto yy191; - goto yy185; - } else { - if(yych == ';') goto yy185; + if(yybm[0+yych] & 8) { goto yy191; } - } + goto yy185; yy193: - YYMARKER = ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if(yych <= ' ') { - if(yych <= 0x0A) { - if(yych <= 0x08) goto yy193; - if(yych <= 0x09) goto yy203; - goto yy185; - } else { - if(yych == 0x0D) goto yy203; - if(yych <= 0x1F) goto yy193; + YYMARKER = ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + if(yybm[0+yych] & 16) { + goto yy193; + } + if(yych <= '!') { + if(yych == 0x0A) goto yy185; goto yy203; - } - } else { - if(yych <= ':') { - if(yych == '"') goto yy191; - goto yy193; } else { - if(yych <= ';') goto yy203; - if(yych == '\\') goto yy205; - goto yy193; + if(yych <= '"') goto yy191; + if(yych <= '[') goto yy203; + goto yy205; } - } yy195: - YYMARKER = ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if(yych <= ' ') { - if(yych <= 0x0A) { - if(yych <= 0x08) goto yy195; - if(yych >= 0x0A) goto yy185; - } else { - if(yych == 0x0D) goto yy197; - if(yych <= 0x1F) goto yy195; + YYMARKER = ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + if(yybm[0+yych] & 32) { + goto yy195; } - } else { - if(yych <= ':') { - if(yych == '\'') goto yy191; - goto yy195; + if(yych <= '&') { + if(yych == 0x0A) goto yy185; } else { - if(yych <= ';') goto yy197; - if(yych == '\\') goto yy200; - goto yy195; + if(yych <= '\'') goto yy191; + if(yych >= '\\') goto yy200; } - } yy197: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if(yych <= '&') { - if(yych != 0x0A) goto yy197; - } else { + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + if(yybm[0+yych] & 64) { + goto yy197; + } + if(yych <= '&') goto yy199; if(yych <= '\'') goto yy201; - if(yych == '\\') goto yy202; - goto yy197; - } + goto yy202; yy199: - YYCURSOR = YYMARKER; - goto yy185; + YYCURSOR = YYMARKER; + goto yy185; yy200: - YYMARKER = ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if(yych <= 0x0D) { - if(yych <= 0x09) { - if(yych <= 0x08) goto yy195; - goto yy197; + YYMARKER = ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + if(yych <= 0x0D) { + if(yych <= 0x09) { + if(yych <= 0x08) goto yy195; + goto yy197; + } else { + if(yych <= 0x0A) goto yy185; + if(yych <= 0x0C) goto yy195; + goto yy197; + } } else { - if(yych <= 0x0A) goto yy185; - if(yych <= 0x0C) goto yy195; - goto yy197; + if(yych <= ' ') { + if(yych <= 0x1F) goto yy195; + goto yy197; + } else { + if(yych == ';') goto yy197; + goto yy195; + } } - } else { - if(yych <= ' ') { - if(yych <= 0x1F) goto yy195; - goto yy197; - } else { - if(yych == ';') goto yy197; - goto yy195; - } - } yy201: - yych = *++YYCURSOR; - goto yy185; + yych = *++YYCURSOR; + goto yy185; yy202: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if(yych == 0x0A) goto yy199; - goto yy197; + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + if(yych == 0x0A) goto yy199; + goto yy197; yy203: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if(yych <= '!') { - if(yych == 0x0A) goto yy199; - goto yy203; - } else { + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + if(yybm[0+yych] & 128) { + goto yy203; + } + if(yych <= '!') goto yy199; if(yych <= '"') goto yy201; - if(yych == '\\') goto yy206; - goto yy203; - } + goto yy206; yy205: - YYMARKER = ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if(yych <= 0x0D) { - if(yych <= 0x09) { - if(yych <= 0x08) goto yy193; - goto yy203; + YYMARKER = ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + if(yych <= 0x0D) { + if(yych <= 0x09) { + if(yych <= 0x08) goto yy193; + goto yy203; + } else { + if(yych <= 0x0A) goto yy185; + if(yych <= 0x0C) goto yy193; + goto yy203; + } } else { - if(yych <= 0x0A) goto yy185; - if(yych <= 0x0C) goto yy193; - goto yy203; + if(yych <= ' ') { + if(yych <= 0x1F) goto yy193; + goto yy203; + } else { + if(yych == ';') goto yy203; + goto yy193; + } } - } else { - if(yych <= ' ') { - if(yych <= 0x1F) goto yy193; - goto yy203; - } else { - if(yych == ';') goto yy203; - goto yy193; - } +yy206: + ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + if(yych == 0x0A) goto yy199; + goto yy203; } -yy206: - ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - if(yych == 0x0A) goto yy199; - goto yy203; } #line 348 "scanner.re" Modified: tags/RELEASE_0_10_6/config_w32.h =================================================================== --- tags/RELEASE_0_10_6/config_w32.h 2006-07-27 01:23:47 UTC (rev 597) +++ tags/RELEASE_0_10_6/config_w32.h 2006-07-27 01:30:35 UTC (rev 598) @@ -63,13 +63,13 @@ #define PACKAGE_NAME "re2c" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "re2c 0.10.5" +#define PACKAGE_STRING "re2c 0.10.6" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "re2c" /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.10.5" +#define PACKAGE_VERSION "0.10.6" /* The size of a `char', as computed by sizeof. */ #define SIZEOF_CHAR 1 @@ -87,7 +87,7 @@ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "0.10.5" +#define VERSION "0.10.6" /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ Modified: tags/RELEASE_0_10_6/configure.in =================================================================== --- tags/RELEASE_0_10_6/configure.in 2006-07-27 01:23:47 UTC (rev 597) +++ tags/RELEASE_0_10_6/configure.in 2006-07-27 01:30:35 UTC (rev 598) @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT(re2c, 0.10.5, re2...@li...) +AC_INIT(re2c, 0.10.6, re2...@li...) AM_INIT_AUTOMAKE(re2c, $PACKAGE_VERSION) AC_CONFIG_SRCDIR(actions.cc) AM_CONFIG_HEADER(config.h) Modified: tags/RELEASE_0_10_6/scanner.re =================================================================== --- tags/RELEASE_0_10_6/scanner.re 2006-07-27 01:23:47 UTC (rev 597) +++ tags/RELEASE_0_10_6/scanner.re 2006-07-27 01:30:35 UTC (rev 598) @@ -17,7 +17,7 @@ #define BSIZE 8192 -#define YYCTYPE char +#define YYCTYPE unsigned char #define YYCURSOR cursor #define YYLIMIT lim #define YYMARKER ptr Added: tags/RELEASE_0_10_6/test/bug1528269.c =================================================================== --- tags/RELEASE_0_10_6/test/bug1528269.c (rev 0) +++ tags/RELEASE_0_10_6/test/bug1528269.c 2006-07-27 01:30:35 UTC (rev 598) @@ -0,0 +1,6 @@ +/* Generated by re2c */ +#line 1 "bug1528269.re" +void foo() +{ + x='\xFC'; +} Property changes on: tags/RELEASE_0_10_6/test/bug1528269.c ___________________________________________________________________ Name: svn:executable + * Name: svn:eol-style + native Added: tags/RELEASE_0_10_6/test/bug1528269.re =================================================================== --- tags/RELEASE_0_10_6/test/bug1528269.re (rev 0) +++ tags/RELEASE_0_10_6/test/bug1528269.re 2006-07-27 01:30:35 UTC (rev 598) @@ -0,0 +1,4 @@ +void foo() +{ + x='\xFC'; +} Property changes on: tags/RELEASE_0_10_6/test/bug1528269.re ___________________________________________________________________ Name: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2006-07-27 10:05:13
|
Revision: 597 Author: helly Date: 2006-07-26 18:23:47 -0700 (Wed, 26 Jul 2006) ViewCVS: http://svn.sourceforge.net/re2c/?rev=597&view=rev Log Message: ----------- - Added wrong file, fixed now correctly Modified Paths: -------------- tags/RELEASE_0_10_6/.cvsignore Property Changed: ---------------- tags/RELEASE_0_10_6/ Property changes on: tags/RELEASE_0_10_6 ___________________________________________________________________ Name: svn:ignore - re2c re2c.1 .deps autoscan.log autom4te.cache config.cache configure install-sh README aclocal.m4 Makefile Makefile.in config.h.in config.status config.log config.sub config.guess config.h config_w32.h.in depcomp compile makerpm missing mkinstalldirs stamp-h stamp-h1 stamp-h.in parser.cc scanner.cc y.tab.c y.tab.h version.h *~ *.bak *.ncb *.o *.rpm *.spec *.suo *.tar.gz *.tar.bz2 *.zip .#* run_tests.sh Release Debug re2c.ncb re2c.suo Debug-2002 Release-2002 Debug-2003 Release-2003 Debug-2005 Release-2005 re2c-2005.vcproj.* + re2c re2c.1 .deps autoscan.log autom4te.cache config.cache configure install-sh README aclocal.m4 Makefile Makefile.in config.h.in config.status config.log config.sub config.guess config.h config_w32.h depcomp compile makerpm missing mkinstalldirs stamp-h stamp-h1 stamp-h.in parser.cc scanner.cc y.tab.c y.tab.h version.h *~ *.bak *.ncb *.o *.rpm *.spec *.suo *.tar.gz *.tar.bz2 *.zip .#* run_tests.sh Release Debug re2c.ncb re2c.suo Debug-2002 Release-2002 Debug-2003 Release-2003 Debug-2005 Release-2005 re2c-2005.vcproj.* Modified: tags/RELEASE_0_10_6/.cvsignore =================================================================== --- tags/RELEASE_0_10_6/.cvsignore 2006-07-27 01:21:16 UTC (rev 596) +++ tags/RELEASE_0_10_6/.cvsignore 2006-07-27 01:23:47 UTC (rev 597) @@ -16,7 +16,7 @@ config.sub config.guess config.h -config_w32.h.in +config_w32.h depcomp compile makerpm This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2006-07-27 05:51:34
|
Revision: 594 Author: helly Date: 2006-07-26 18:07:00 -0700 (Wed, 26 Jul 2006) ViewCVS: http://svn.sourceforge.net/re2c/?rev=594&view=rev Log Message: ----------- - Update svn:ignore property Property Changed: ---------------- trunk/re2c/ Property changes on: trunk/re2c ___________________________________________________________________ Name: svn:ignore - re2c re2c.1 .deps autoscan.log autom4te.cache config.cache configure install-sh README aclocal.m4 Makefile Makefile.in config.h.in config.status config.log config.sub config.guess config.h depcomp compile makerpm missing mkinstalldirs stamp-h stamp-h1 stamp-h.in parser.cc scanner.cc y.tab.c y.tab.h version.h *~ *.bak *.ncb *.o *.rpm *.spec *.suo *.tar.gz *.tar.bz2 *.zip .#* run_tests.sh Release Debug re2c.ncb re2c.suo Debug-2002 Release-2002 Debug-2003 Release-2003 Debug-2005 Release-2005 re2c-2005.vcproj.* + re2c re2c.1 .deps autoscan.log autom4te.cache config.cache configure install-sh README aclocal.m4 Makefile Makefile.in config.h.in config.status config.log config.sub config.guess config_w32.h config.h depcomp compile makerpm missing mkinstalldirs stamp-h stamp-h1 stamp-h.in parser.cc scanner.cc y.tab.c y.tab.h version.h *~ *.bak *.ncb *.o *.rpm *.spec *.suo *.tar.gz *.tar.bz2 *.zip .#* run_tests.sh Release Debug re2c.ncb re2c.suo Debug-2002 Release-2002 Debug-2003 Release-2003 Debug-2005 Release-2005 re2c-2005.vcproj.* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2006-07-27 03:21:08
|
Revision: 595 Author: helly Date: 2006-07-26 18:08:54 -0700 (Wed, 26 Jul 2006) ViewCVS: http://svn.sourceforge.net/re2c/?rev=595&view=rev Log Message: ----------- - Create new version 0.10.6 to fix two bugs Added Paths: ----------- tags/RELEASE_0_10_6/ Copied: tags/RELEASE_0_10_6 (from rev 594, tags/RELEASE_0_10_5) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2006-07-27 01:21:25
|
Revision: 596 Author: helly Date: 2006-07-26 18:21:16 -0700 (Wed, 26 Jul 2006) ViewCVS: http://svn.sourceforge.net/re2c/?rev=596&view=rev Log Message: ----------- - MFH Update svn:ignore Modified Paths: -------------- tags/RELEASE_0_10_6/.cvsignore Property Changed: ---------------- tags/RELEASE_0_10_6/ Property changes on: tags/RELEASE_0_10_6 ___________________________________________________________________ Name: svn:ignore - re2c re2c.1 .deps autoscan.log autom4te.cache config.cache configure install-sh README aclocal.m4 Makefile Makefile.in config.h.in config.status config.log config.sub config.guess config.h depcomp compile makerpm missing mkinstalldirs stamp-h stamp-h1 stamp-h.in parser.cc scanner.cc y.tab.c y.tab.h version.h *~ *.bak *.ncb *.o *.rpm *.spec *.suo *.tar.gz *.tar.bz2 *.zip .#* run_tests.sh Release Debug re2c.ncb re2c.suo Debug-2002 Release-2002 Debug-2003 Release-2003 Debug-2005 Release-2005 re2c-2005.vcproj.* + re2c re2c.1 .deps autoscan.log autom4te.cache config.cache configure install-sh README aclocal.m4 Makefile Makefile.in config.h.in config.status config.log config.sub config.guess config.h config_w32.h.in depcomp compile makerpm missing mkinstalldirs stamp-h stamp-h1 stamp-h.in parser.cc scanner.cc y.tab.c y.tab.h version.h *~ *.bak *.ncb *.o *.rpm *.spec *.suo *.tar.gz *.tar.bz2 *.zip .#* run_tests.sh Release Debug re2c.ncb re2c.suo Debug-2002 Release-2002 Debug-2003 Release-2003 Debug-2005 Release-2005 re2c-2005.vcproj.* Modified: tags/RELEASE_0_10_6/.cvsignore =================================================================== --- tags/RELEASE_0_10_6/.cvsignore 2006-07-27 01:08:54 UTC (rev 595) +++ tags/RELEASE_0_10_6/.cvsignore 2006-07-27 01:21:16 UTC (rev 596) @@ -16,6 +16,7 @@ config.sub config.guess config.h +config_w32.h.in depcomp compile makerpm This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2006-06-18 18:37:07
|
Revision: 591 Author: helly Date: 2006-06-18 11:37:00 -0700 (Sun, 18 Jun 2006) ViewCVS: http://svn.sourceforge.net/re2c/?rev=591&view=rev Log Message: ----------- - Fix Changelog Modified Paths: -------------- trunk/re2c/CHANGELOG trunk/re2c/htdocs/index.html Modified: trunk/re2c/CHANGELOG =================================================================== --- trunk/re2c/CHANGELOG 2006-06-18 18:36:20 UTC (rev 590) +++ trunk/re2c/CHANGELOG 2006-06-18 18:37:00 UTC (rev 591) @@ -20,7 +20,7 @@ - Fixed -i switch. - Added configuration 'yyfill:enable' to allow suppression of YYFILL() blocks. - Added tutorial like lessons to re2c. -- Added /*!ignore!re2c */ to support documenting of re2c source. +- Added /*!ignore:re2c */ to support documenting of re2c source. - Fixed issue with multiline re2c comments (/*!max:re2c ... */ and alike). - Fixed generation of YYDEBUG() when using -d switch. - Added /*!getstate:re2c */ which triggers generation of the YYGETSTATE() block. Modified: trunk/re2c/htdocs/index.html =================================================================== --- trunk/re2c/htdocs/index.html 2006-06-18 18:36:20 UTC (rev 590) +++ trunk/re2c/htdocs/index.html 2006-06-18 18:37:00 UTC (rev 591) @@ -101,7 +101,7 @@ <li>Fixed -i switch.</li> <li>Added configuration 'yyfill:enable' to allow suppression of YYFILL() blocks.</li> <li>Added tutorial like lessons to re2c.</li> -<li>Added /*!ignore!re2c */ to support documenting of re2c source.</li> +<li>Added /*!ignore:re2c */ to support documenting of re2c source.</li> <li>Fixed issue with multiline re2c comments (/*!max:re2c ... */ and alike).</li> <li>Fixed generation of YYDEBUG() when using -d switch.</li> <li>Added /*!getstate:re2c */ which triggers generation of the YYGETSTATE() block.</li> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2006-06-18 18:36:29
|
Revision: 590 Author: helly Date: 2006-06-18 11:36:20 -0700 (Sun, 18 Jun 2006) ViewCVS: http://svn.sourceforge.net/re2c/?rev=590&view=rev Log Message: ----------- - Drop BOM Modified Paths: -------------- trunk/re2c/htdocs/index.html Modified: trunk/re2c/htdocs/index.html =================================================================== --- trunk/re2c/htdocs/index.html 2006-06-14 20:52:47 UTC (rev 589) +++ trunk/re2c/htdocs/index.html 2006-06-18 18:36:20 UTC (rev 590) @@ -1,4 +1,4 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2006-06-14 20:53:04
|
Revision: 589 Author: helly Date: 2006-06-14 13:52:47 -0700 (Wed, 14 Jun 2006) ViewCVS: http://svn.sourceforge.net/re2c/?rev=589&view=rev Log Message: ----------- - Version 0.10.5 was released Modified Paths: -------------- trunk/re2c/CHANGELOG trunk/re2c/htdocs/index.html Modified: trunk/re2c/CHANGELOG =================================================================== --- trunk/re2c/CHANGELOG 2006-06-11 15:41:13 UTC (rev 588) +++ trunk/re2c/CHANGELOG 2006-06-14 20:52:47 UTC (rev 589) @@ -1,4 +1,4 @@ -Version 0.10.5 (200?-??-??) +Version 0.10.5 (2006-06-11) --------------------------- - Fixed long form of -1 switch to --single-pass as noted in man page and help. - Added MSVC 2003 project files and renamed old 2002 ones. Modified: trunk/re2c/htdocs/index.html =================================================================== --- trunk/re2c/htdocs/index.html 2006-06-11 15:41:13 UTC (rev 588) +++ trunk/re2c/htdocs/index.html 2006-06-14 20:52:47 UTC (rev 589) @@ -1,4 +1,4 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> @@ -79,7 +79,7 @@ </ul> <hr /> <h1>Changelog</h1> -<h2>200?-??-??: 0.10.5</h2> +<h2>2006-06-11: 0.10.5</h2> <ul> <li>Fixed long form of -1 switch to --single-pass as noted in man page and help.</li> <li>Added MSVC 2003 project files and renamed old 2002 ones.</li> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2006-06-11 15:41:28
|
Revision: 588 Author: helly Date: 2006-06-11 08:41:13 -0700 (Sun, 11 Jun 2006) ViewCVS: http://svn.sourceforge.net/re2c/?rev=588&view=rev Log Message: ----------- - Update after release Modified Paths: -------------- tags/RELEASE_0_10_5/htdocs/manual.html Modified: tags/RELEASE_0_10_5/htdocs/manual.html =================================================================== --- tags/RELEASE_0_10_5/htdocs/manual.html 2006-06-11 12:32:24 UTC (rev 587) +++ tags/RELEASE_0_10_5/htdocs/manual.html 2006-06-11 15:41:13 UTC (rev 588) @@ -454,6 +454,6 @@ <br /> <hr /> <p>This document was created by man2html, using the manual pages.<br /> -Time: 00:00:00 GMT, June 1, 2006</p> +Time: 00:00:00 GMT, June 11, 2006</p> </body> </html> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2006-06-11 12:32:34
|
Revision: 587 Author: helly Date: 2006-06-11 05:32:24 -0700 (Sun, 11 Jun 2006) ViewCVS: http://svn.sourceforge.net/re2c/?rev=587&view=rev Log Message: ----------- - Prepare release 0.10.5 Modified Paths: -------------- tags/RELEASE_0_10_5/CHANGELOG tags/RELEASE_0_10_5/config_w32.h tags/RELEASE_0_10_5/configure.in tags/RELEASE_0_10_5/htdocs/index.html Modified: tags/RELEASE_0_10_5/CHANGELOG =================================================================== --- tags/RELEASE_0_10_5/CHANGELOG 2006-06-11 10:36:29 UTC (rev 586) +++ tags/RELEASE_0_10_5/CHANGELOG 2006-06-11 12:32:24 UTC (rev 587) @@ -1,4 +1,4 @@ -Version 0.10.5 (200?-??-??) +Version 0.10.5 (2006-06-11) --------------------------- - Fixed long form of -1 switch to --single-pass as noted in man page and help. - Added MSVC 2003 project files and renamed old 2002 ones. Modified: tags/RELEASE_0_10_5/config_w32.h =================================================================== --- tags/RELEASE_0_10_5/config_w32.h 2006-06-11 10:36:29 UTC (rev 586) +++ tags/RELEASE_0_10_5/config_w32.h 2006-06-11 12:32:24 UTC (rev 587) @@ -63,13 +63,13 @@ #define PACKAGE_NAME "re2c" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "re2c 0.10.5.dev" +#define PACKAGE_STRING "re2c 0.10.5" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "re2c" /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.10.5.dev" +#define PACKAGE_VERSION "0.10.5" /* The size of a `char', as computed by sizeof. */ #define SIZEOF_CHAR 1 @@ -87,7 +87,7 @@ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "0.10.5.dev" +#define VERSION "0.10.5" /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ Modified: tags/RELEASE_0_10_5/configure.in =================================================================== --- tags/RELEASE_0_10_5/configure.in 2006-06-11 10:36:29 UTC (rev 586) +++ tags/RELEASE_0_10_5/configure.in 2006-06-11 12:32:24 UTC (rev 587) @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT(re2c, 0.10.5.dev, re2...@li...) +AC_INIT(re2c, 0.10.5, re2...@li...) AM_INIT_AUTOMAKE(re2c, $PACKAGE_VERSION) AC_CONFIG_SRCDIR(actions.cc) AM_CONFIG_HEADER(config.h) Modified: tags/RELEASE_0_10_5/htdocs/index.html =================================================================== --- tags/RELEASE_0_10_5/htdocs/index.html 2006-06-11 10:36:29 UTC (rev 586) +++ tags/RELEASE_0_10_5/htdocs/index.html 2006-06-11 12:32:24 UTC (rev 587) @@ -79,7 +79,7 @@ </ul> <hr /> <h1>Changelog</h1> -<h2>200?-??-??: 0.10.5</h2> +<h2>2005-06-11: 0.10.5</h2> <ul> <li>Fixed long form of -1 switch to --single-pass as noted in man page and help.</li> <li>Added MSVC 2003 project files and renamed old 2002 ones.</li> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2006-06-11 10:36:34
|
Revision: 586 Author: helly Date: 2006-06-11 03:36:29 -0700 (Sun, 11 Jun 2006) ViewCVS: http://svn.sourceforge.net/re2c/?rev=586&view=rev Log Message: ----------- - Works with MSVC 2003 Modified Paths: -------------- trunk/re2c/htdocs/index.html Modified: trunk/re2c/htdocs/index.html =================================================================== --- trunk/re2c/htdocs/index.html 2006-06-11 10:36:25 UTC (rev 585) +++ trunk/re2c/htdocs/index.html 2006-06-11 10:36:29 UTC (rev 586) @@ -128,8 +128,9 @@ <li>gcc-Version 3.3.5 (Debian 1:3.3.5-13)</li> <li>gcc-Version 3.3.0 (mips-sgi-irix6.5/3.3.0/specs)</li> <li>MIPSpro Compilers: Version 7.4.4m</li> -<li>Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 14.00.50727.42 for 80x86 (Microsoft Visual C 2005)</li> -<li>Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 13.00.9466 for 80x86 (Microsoft Visual C 2002)</li> +<li>Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 14.00.50727.42 for 80x86 (Microsoft Visual C++ 2005)</li> +<li>Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 13.10.3077 for 80x86 (Mictosoft Visual C++ 2003)</li> +<li>Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 13.00.9466 for 80x86 (Microsoft Visual C++ 2002)</li> <li>Intel(R) C++ Compiler for Intel(R) EM64T-based applications, Version 9.0 Build 20050430 Package ID: l_cc_p_9.0.021</li> <li>CC: Sun C++ 5.8 2005/10/13 (CXXFLAGS='-compat5 -library=stlport4')</li> </ul> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2006-06-11 10:36:33
|
Revision: 585 Author: helly Date: 2006-06-11 03:36:25 -0700 (Sun, 11 Jun 2006) ViewCVS: http://svn.sourceforge.net/re2c/?rev=585&view=rev Log Message: ----------- - MFH Works with MSVC 2003 Modified Paths: -------------- tags/RELEASE_0_10_5/htdocs/index.html Modified: tags/RELEASE_0_10_5/htdocs/index.html =================================================================== --- tags/RELEASE_0_10_5/htdocs/index.html 2006-06-11 10:25:44 UTC (rev 584) +++ tags/RELEASE_0_10_5/htdocs/index.html 2006-06-11 10:36:25 UTC (rev 585) @@ -128,8 +128,9 @@ <li>gcc-Version 3.3.5 (Debian 1:3.3.5-13)</li> <li>gcc-Version 3.3.0 (mips-sgi-irix6.5/3.3.0/specs)</li> <li>MIPSpro Compilers: Version 7.4.4m</li> -<li>Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 14.00.50727.42 for 80x86 (Microsoft Visual C 2005)</li> -<li>Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 13.00.9466 for 80x86 (Microsoft Visual C 2002)</li> +<li>Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 14.00.50727.42 for 80x86 (Microsoft Visual C++ 2005)</li> +<li>Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 13.10.3077 for 80x86 (Mictosoft Visual C++ 2003)</li> +<li>Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 13.00.9466 for 80x86 (Microsoft Visual C++ 2002)</li> <li>Intel(R) C++ Compiler for Intel(R) EM64T-based applications, Version 9.0 Build 20050430 Package ID: l_cc_p_9.0.021</li> <li>CC: Sun C++ 5.8 2005/10/13 (CXXFLAGS='-compat5 -library=stlport4')</li> </ul> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2006-06-11 10:26:09
|
Revision: 584 Author: helly Date: 2006-06-11 03:25:44 -0700 (Sun, 11 Jun 2006) ViewCVS: http://svn.sourceforge.net/re2c/?rev=584&view=rev Log Message: ----------- - MFH Provide MSVC 2003 project files and rename 2002 files to contain version in name Modified Paths: -------------- tags/RELEASE_0_10_5/.cvsignore tags/RELEASE_0_10_5/CHANGELOG tags/RELEASE_0_10_5/htdocs/index.html Added Paths: ----------- tags/RELEASE_0_10_5/re2c-2002.sln tags/RELEASE_0_10_5/re2c-2002.vcproj tags/RELEASE_0_10_5/re2c-2003.sln tags/RELEASE_0_10_5/re2c-2003.vcproj Removed Paths: ------------- tags/RELEASE_0_10_5/re2c.sln tags/RELEASE_0_10_5/re2c.vcproj Property Changed: ---------------- tags/RELEASE_0_10_5/ Property changes on: tags/RELEASE_0_10_5 ___________________________________________________________________ Name: svn:ignore - re2c re2c.1 .deps autoscan.log autom4te.cache config.cache configure install-sh README aclocal.m4 Makefile Makefile.in config.h.in config.status config.log config.sub config.guess config.h depcomp compile makerpm missing mkinstalldirs stamp-h stamp-h1 stamp-h.in parser.cc scanner.cc y.tab.c y.tab.h version.h *~ *.bak *.ncb *.o *.rpm *.spec *.suo *.tar.gz *.tar.bz2 *.zip .#* run_tests.sh Release Debug re2c.ncb re2c.suo Debug-2005 Release-2005 re2c-2005.vcproj.* + re2c re2c.1 .deps autoscan.log autom4te.cache config.cache configure install-sh README aclocal.m4 Makefile Makefile.in config.h.in config.status config.log config.sub config.guess config.h depcomp compile makerpm missing mkinstalldirs stamp-h stamp-h1 stamp-h.in parser.cc scanner.cc y.tab.c y.tab.h version.h *~ *.bak *.ncb *.o *.rpm *.spec *.suo *.tar.gz *.tar.bz2 *.zip .#* run_tests.sh Release Debug re2c.ncb re2c.suo Debug-2002 Release-2002 Debug-2003 Release-2003 Debug-2005 Release-2005 re2c-2005.vcproj.* Modified: tags/RELEASE_0_10_5/.cvsignore =================================================================== --- tags/RELEASE_0_10_5/.cvsignore 2006-06-11 10:24:47 UTC (rev 583) +++ tags/RELEASE_0_10_5/.cvsignore 2006-06-11 10:25:44 UTC (rev 584) @@ -45,6 +45,10 @@ Debug re2c.ncb re2c.suo +Debug-2002 +Release-2002 +Debug-2003 +Release-2003 Debug-2005 Release-2005 re2c-2005.vcproj.* Modified: tags/RELEASE_0_10_5/CHANGELOG =================================================================== --- tags/RELEASE_0_10_5/CHANGELOG 2006-06-11 10:24:47 UTC (rev 583) +++ tags/RELEASE_0_10_5/CHANGELOG 2006-06-11 10:25:44 UTC (rev 584) @@ -1,6 +1,7 @@ Version 0.10.5 (200?-??-??) --------------------------- - Fixed long form of -1 switch to --single-pass as noted in man page and help. +- Added MSVC 2003 project files and renamed old 2002 ones. Version 0.10.4 (2006-06-01) --------------------------- Modified: tags/RELEASE_0_10_5/htdocs/index.html =================================================================== --- tags/RELEASE_0_10_5/htdocs/index.html 2006-06-11 10:24:47 UTC (rev 583) +++ tags/RELEASE_0_10_5/htdocs/index.html 2006-06-11 10:25:44 UTC (rev 584) @@ -82,6 +82,7 @@ <h2>200?-??-??: 0.10.5</h2> <ul> <li>Fixed long form of -1 switch to --single-pass as noted in man page and help.</li> +<li>Added MSVC 2003 project files and renamed old 2002 ones.</li> </ul> <h2>2006-06-01: 0.10.4</h2> <ul> Copied: tags/RELEASE_0_10_5/re2c-2002.sln (from rev 578, tags/RELEASE_0_10_5/re2c.sln) =================================================================== --- tags/RELEASE_0_10_5/re2c-2002.sln (rev 0) +++ tags/RELEASE_0_10_5/re2c-2002.sln 2006-06-11 10:25:44 UTC (rev 584) @@ -0,0 +1,21 @@ +Microsoft Visual Studio Solution File, Format Version 7.00 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "re2c", "re2c-2002.vcproj", "{18C5E289-8D90-400D-9F80-766F174CEDC9}" +EndProject +Global + GlobalSection(SolutionConfiguration) = preSolution + ConfigName.0 = Debug + ConfigName.1 = Release + EndGlobalSection + GlobalSection(ProjectDependencies) = postSolution + EndGlobalSection + GlobalSection(ProjectConfiguration) = postSolution + {18C5E289-8D90-400D-9F80-766F174CEDC9}.Debug.ActiveCfg = Debug|Win32 + {18C5E289-8D90-400D-9F80-766F174CEDC9}.Debug.Build.0 = Debug|Win32 + {18C5E289-8D90-400D-9F80-766F174CEDC9}.Release.ActiveCfg = Release|Win32 + {18C5E289-8D90-400D-9F80-766F174CEDC9}.Release.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + EndGlobalSection + GlobalSection(ExtensibilityAddIns) = postSolution + EndGlobalSection +EndGlobal Copied: tags/RELEASE_0_10_5/re2c-2002.vcproj (from rev 578, tags/RELEASE_0_10_5/re2c.vcproj) =================================================================== --- tags/RELEASE_0_10_5/re2c-2002.vcproj (rev 0) +++ tags/RELEASE_0_10_5/re2c-2002.vcproj 2006-06-11 10:25:44 UTC (rev 584) @@ -0,0 +1,201 @@ +<?xml version="1.0" encoding = "Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="7.00" + Name="re2c" + ProjectGUID="{831DB149-B845-4969-9782-E07F2B566CDE}" + Keyword="Win32Proj"> + <Platforms> + <Platform + Name="Win32"/> + </Platforms> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="Debug-2002" + IntermediateDirectory="Debug-2002" + ConfigurationType="1"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + FavorSizeOrSpeed="1" + OptimizeForProcessor="1" + DisableLanguageExtensions="FALSE" + BrowseInformation="1" + DebugInformationFormat="3"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + IgnoreDefaultLibraryNames="winspool.lib comdlg32.lib advapi32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib" + GenerateDebugInformation="TRUE"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="Release-2002" + IntermediateDirectory="Release-2002" + ConfigurationType="1"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="TRUE" + FavorSizeOrSpeed="1" + OmitFramePointers="TRUE" + EnableFiberSafeOptimizations="TRUE" + OptimizeForProcessor="1" + AdditionalIncludeDirectories="" + SmallerTypeCheck="FALSE" + BufferSecurityCheck="FALSE" + DisableLanguageExtensions="FALSE" + RuntimeTypeInfo="FALSE" + DebugInformationFormat="3"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + IgnoreDefaultLibraryNames="winspool.lib comdlg32.lib advapi32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib" + GenerateDebugInformation="FALSE"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + </Configuration> + </Configurations> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;cc"> + <File + RelativePath="actions.cc"> + </File> + <File + RelativePath="code.cc"> + </File> + <File + RelativePath="dfa.cc"> + </File> + <File + RelativePath="main.cc"> + </File> + <File + RelativePath="mbo_getopt.cc"> + </File> + <File + RelativePath="bootstrap\parser.cc"> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=".\."/> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=".\."/> + </FileConfiguration> + </File> + <File + RelativePath="bootstrap\scanner.cc"> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=".\."/> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=".\."/> + </FileConfiguration> + </File> + <File + RelativePath="substr.cc"> + </File> + <File + RelativePath="translate.cc"> + </File> + <File + RelativePath="bootstrap\y.tab.h"> + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc"> + <File + RelativePath="basics.h"> + </File> + <File + RelativePath="code.h"> + </File> + <File + RelativePath="config_w32.h"> + </File> + <File + RelativePath="dfa.h"> + </File> + <File + RelativePath="globals.h"> + </File> + <File + RelativePath="ins.h"> + </File> + <File + RelativePath="mbo_getopt.h"> + </File> + <File + RelativePath="parser.h"> + </File> + <File + RelativePath="parser.tab.h"> + </File> + <File + RelativePath="re.h"> + </File> + <File + RelativePath="scanner.h"> + </File> + <File + RelativePath="stream_lc.h"> + </File> + <File + RelativePath="substr.h"> + </File> + <File + RelativePath="token.h"> + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: tags/RELEASE_0_10_5/re2c-2003.sln =================================================================== --- tags/RELEASE_0_10_5/re2c-2003.sln (rev 0) +++ tags/RELEASE_0_10_5/re2c-2003.sln 2006-06-11 10:25:44 UTC (rev 584) @@ -0,0 +1,21 @@ +Microsoft Visual Studio Solution File, Format Version 8.00 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "re2c", "re2c-2003.vcproj", "{18C5E289-8D90-400D-9F80-766F174CEDC9}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfiguration) = preSolution + Debug = Debug + Release = Release + EndGlobalSection + GlobalSection(ProjectConfiguration) = postSolution + {18C5E289-8D90-400D-9F80-766F174CEDC9}.Debug.ActiveCfg = Debug|Win32 + {18C5E289-8D90-400D-9F80-766F174CEDC9}.Debug.Build.0 = Debug|Win32 + {18C5E289-8D90-400D-9F80-766F174CEDC9}.Release.ActiveCfg = Release|Win32 + {18C5E289-8D90-400D-9F80-766F174CEDC9}.Release.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + EndGlobalSection + GlobalSection(ExtensibilityAddIns) = postSolution + EndGlobalSection +EndGlobal Property changes on: tags/RELEASE_0_10_5/re2c-2003.sln ___________________________________________________________________ Name: svn:executable + * Added: tags/RELEASE_0_10_5/re2c-2003.vcproj =================================================================== --- tags/RELEASE_0_10_5/re2c-2003.vcproj (rev 0) +++ tags/RELEASE_0_10_5/re2c-2003.vcproj 2006-06-11 10:25:44 UTC (rev 584) @@ -0,0 +1,215 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="7.10" + Name="re2c" + ProjectGUID="{831DB149-B845-4969-9782-E07F2B566CDE}" + Keyword="Win32Proj"> + <Platforms> + <Platform + Name="Win32"/> + </Platforms> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="Debug-2003" + IntermediateDirectory="Debug-2003" + ConfigurationType="1"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + FavorSizeOrSpeed="1" + OptimizeForProcessor="1" + DisableLanguageExtensions="FALSE" + BrowseInformation="1" + DebugInformationFormat="3"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + IgnoreDefaultLibraryNames="winspool.lib comdlg32.lib advapi32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib" + GenerateDebugInformation="TRUE"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="Release-2003" + IntermediateDirectory="Release-2003" + ConfigurationType="1"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="TRUE" + FavorSizeOrSpeed="1" + OmitFramePointers="TRUE" + EnableFiberSafeOptimizations="TRUE" + OptimizeForProcessor="1" + AdditionalIncludeDirectories="" + SmallerTypeCheck="FALSE" + BufferSecurityCheck="FALSE" + DisableLanguageExtensions="FALSE" + RuntimeTypeInfo="FALSE" + DebugInformationFormat="3"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + IgnoreDefaultLibraryNames="winspool.lib comdlg32.lib advapi32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib" + GenerateDebugInformation="FALSE"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;cc"> + <File + RelativePath="actions.cc"> + </File> + <File + RelativePath="code.cc"> + </File> + <File + RelativePath="dfa.cc"> + </File> + <File + RelativePath="main.cc"> + </File> + <File + RelativePath="mbo_getopt.cc"> + </File> + <File + RelativePath="bootstrap\parser.cc"> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=".\."/> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=".\."/> + </FileConfiguration> + </File> + <File + RelativePath="bootstrap\scanner.cc"> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=".\."/> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=".\."/> + </FileConfiguration> + </File> + <File + RelativePath="substr.cc"> + </File> + <File + RelativePath="translate.cc"> + </File> + <File + RelativePath="bootstrap\y.tab.h"> + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc"> + <File + RelativePath="basics.h"> + </File> + <File + RelativePath="code.h"> + </File> + <File + RelativePath="config_w32.h"> + </File> + <File + RelativePath="dfa.h"> + </File> + <File + RelativePath="globals.h"> + </File> + <File + RelativePath="ins.h"> + </File> + <File + RelativePath="mbo_getopt.h"> + </File> + <File + RelativePath="parser.h"> + </File> + <File + RelativePath="parser.tab.h"> + </File> + <File + RelativePath="re.h"> + </File> + <File + RelativePath="scanner.h"> + </File> + <File + RelativePath="stream_lc.h"> + </File> + <File + RelativePath="substr.h"> + </File> + <File + RelativePath="token.h"> + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Property changes on: tags/RELEASE_0_10_5/re2c-2003.vcproj ___________________________________________________________________ Name: svn:executable + * Deleted: tags/RELEASE_0_10_5/re2c.sln =================================================================== --- tags/RELEASE_0_10_5/re2c.sln 2006-06-11 10:24:47 UTC (rev 583) +++ tags/RELEASE_0_10_5/re2c.sln 2006-06-11 10:25:44 UTC (rev 584) @@ -1,21 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 7.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "re2c", "re2c.vcproj", "{18C5E289-8D90-400D-9F80-766F174CEDC9}" -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - ConfigName.0 = Debug - ConfigName.1 = Release - EndGlobalSection - GlobalSection(ProjectDependencies) = postSolution - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {18C5E289-8D90-400D-9F80-766F174CEDC9}.Debug.ActiveCfg = Debug|Win32 - {18C5E289-8D90-400D-9F80-766F174CEDC9}.Debug.Build.0 = Debug|Win32 - {18C5E289-8D90-400D-9F80-766F174CEDC9}.Release.ActiveCfg = Release|Win32 - {18C5E289-8D90-400D-9F80-766F174CEDC9}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal Deleted: tags/RELEASE_0_10_5/re2c.vcproj =================================================================== --- tags/RELEASE_0_10_5/re2c.vcproj 2006-06-11 10:24:47 UTC (rev 583) +++ tags/RELEASE_0_10_5/re2c.vcproj 2006-06-11 10:25:44 UTC (rev 584) @@ -1,201 +0,0 @@ -<?xml version="1.0" encoding = "Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="7.00" - Name="re2c" - ProjectGUID="{831DB149-B845-4969-9782-E07F2B566CDE}" - Keyword="Win32Proj"> - <Platforms> - <Platform - Name="Win32"/> - </Platforms> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="Debug" - IntermediateDirectory="Debug" - ConfigurationType="1"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - FavorSizeOrSpeed="1" - OptimizeForProcessor="1" - DisableLanguageExtensions="FALSE" - BrowseInformation="1" - DebugInformationFormat="3"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLinkerTool" - IgnoreDefaultLibraryNames="winspool.lib comdlg32.lib advapi32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib" - GenerateDebugInformation="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="Release" - IntermediateDirectory="Release" - ConfigurationType="1"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="2" - EnableIntrinsicFunctions="TRUE" - FavorSizeOrSpeed="1" - OmitFramePointers="TRUE" - EnableFiberSafeOptimizations="TRUE" - OptimizeForProcessor="1" - AdditionalIncludeDirectories="" - SmallerTypeCheck="FALSE" - BufferSecurityCheck="FALSE" - DisableLanguageExtensions="FALSE" - RuntimeTypeInfo="FALSE" - DebugInformationFormat="3"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLinkerTool" - IgnoreDefaultLibraryNames="winspool.lib comdlg32.lib advapi32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib" - GenerateDebugInformation="FALSE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - </Configuration> - </Configurations> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;cc"> - <File - RelativePath="actions.cc"> - </File> - <File - RelativePath="code.cc"> - </File> - <File - RelativePath="dfa.cc"> - </File> - <File - RelativePath="main.cc"> - </File> - <File - RelativePath="mbo_getopt.cc"> - </File> - <File - RelativePath="bootstrap\parser.cc"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories=".\."/> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories=".\."/> - </FileConfiguration> - </File> - <File - RelativePath="bootstrap\scanner.cc"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories=".\."/> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories=".\."/> - </FileConfiguration> - </File> - <File - RelativePath="substr.cc"> - </File> - <File - RelativePath="translate.cc"> - </File> - <File - RelativePath="bootstrap\y.tab.h"> - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl;inc"> - <File - RelativePath="basics.h"> - </File> - <File - RelativePath="code.h"> - </File> - <File - RelativePath="config_w32.h"> - </File> - <File - RelativePath="dfa.h"> - </File> - <File - RelativePath="globals.h"> - </File> - <File - RelativePath="ins.h"> - </File> - <File - RelativePath="mbo_getopt.h"> - </File> - <File - RelativePath="parser.h"> - </File> - <File - RelativePath="parser.tab.h"> - </File> - <File - RelativePath="re.h"> - </File> - <File - RelativePath="scanner.h"> - </File> - <File - RelativePath="stream_lc.h"> - </File> - <File - RelativePath="substr.h"> - </File> - <File - RelativePath="token.h"> - </File> - </Filter> - <Filter - Name="Resource Files" - Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2006-06-11 10:25:14
|
Revision: 583 Author: helly Date: 2006-06-11 03:24:47 -0700 (Sun, 11 Jun 2006) ViewCVS: http://svn.sourceforge.net/re2c/?rev=583&view=rev Log Message: ----------- - Provide MSVC 2003 project files and rename 2002 files to contain version in name Modified Paths: -------------- trunk/re2c/.cvsignore trunk/re2c/CHANGELOG trunk/re2c/htdocs/index.html Added Paths: ----------- trunk/re2c/re2c-2002.sln trunk/re2c/re2c-2002.vcproj trunk/re2c/re2c-2003.sln trunk/re2c/re2c-2003.vcproj Removed Paths: ------------- trunk/re2c/re2c.sln trunk/re2c/re2c.vcproj Property Changed: ---------------- trunk/re2c/ Property changes on: trunk/re2c ___________________________________________________________________ Name: svn:ignore - re2c re2c.1 .deps autoscan.log autom4te.cache config.cache configure install-sh README aclocal.m4 Makefile Makefile.in config.h.in config.status config.log config.sub config.guess config.h depcomp compile makerpm missing mkinstalldirs stamp-h stamp-h1 stamp-h.in parser.cc scanner.cc y.tab.c y.tab.h version.h *~ *.bak *.ncb *.o *.rpm *.spec *.suo *.tar.gz *.tar.bz2 *.zip .#* run_tests.sh Release Debug re2c.ncb re2c.suo Debug-2005 Release-2005 re2c-2005.vcproj.* + re2c re2c.1 .deps autoscan.log autom4te.cache config.cache configure install-sh README aclocal.m4 Makefile Makefile.in config.h.in config.status config.log config.sub config.guess config.h depcomp compile makerpm missing mkinstalldirs stamp-h stamp-h1 stamp-h.in parser.cc scanner.cc y.tab.c y.tab.h version.h *~ *.bak *.ncb *.o *.rpm *.spec *.suo *.tar.gz *.tar.bz2 *.zip .#* run_tests.sh Release Debug re2c.ncb re2c.suo Debug-2002 Release-2002 Debug-2003 Release-2003 Debug-2005 Release-2005 re2c-2005.vcproj.* Modified: trunk/re2c/.cvsignore =================================================================== --- trunk/re2c/.cvsignore 2006-06-07 20:00:29 UTC (rev 582) +++ trunk/re2c/.cvsignore 2006-06-11 10:24:47 UTC (rev 583) @@ -45,6 +45,10 @@ Debug re2c.ncb re2c.suo +Debug-2002 +Release-2002 +Debug-2003 +Release-2003 Debug-2005 Release-2005 re2c-2005.vcproj.* Modified: trunk/re2c/CHANGELOG =================================================================== --- trunk/re2c/CHANGELOG 2006-06-07 20:00:29 UTC (rev 582) +++ trunk/re2c/CHANGELOG 2006-06-11 10:24:47 UTC (rev 583) @@ -1,6 +1,7 @@ Version 0.10.5 (200?-??-??) --------------------------- - Fixed long form of -1 switch to --single-pass as noted in man page and help. +- Added MSVC 2003 project files and renamed old 2002 ones. Version 0.10.4 (2006-06-01) --------------------------- Modified: trunk/re2c/htdocs/index.html =================================================================== --- trunk/re2c/htdocs/index.html 2006-06-07 20:00:29 UTC (rev 582) +++ trunk/re2c/htdocs/index.html 2006-06-11 10:24:47 UTC (rev 583) @@ -82,6 +82,7 @@ <h2>200?-??-??: 0.10.5</h2> <ul> <li>Fixed long form of -1 switch to --single-pass as noted in man page and help.</li> +<li>Added MSVC 2003 project files and renamed old 2002 ones.</li> </ul> <h2>2006-06-01: 0.10.4</h2> <ul> Copied: trunk/re2c/re2c-2002.sln (from rev 575, trunk/re2c/re2c.sln) =================================================================== --- trunk/re2c/re2c-2002.sln (rev 0) +++ trunk/re2c/re2c-2002.sln 2006-06-11 10:24:47 UTC (rev 583) @@ -0,0 +1,21 @@ +Microsoft Visual Studio Solution File, Format Version 7.00 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "re2c", "re2c-2002.vcproj", "{18C5E289-8D90-400D-9F80-766F174CEDC9}" +EndProject +Global + GlobalSection(SolutionConfiguration) = preSolution + ConfigName.0 = Debug + ConfigName.1 = Release + EndGlobalSection + GlobalSection(ProjectDependencies) = postSolution + EndGlobalSection + GlobalSection(ProjectConfiguration) = postSolution + {18C5E289-8D90-400D-9F80-766F174CEDC9}.Debug.ActiveCfg = Debug|Win32 + {18C5E289-8D90-400D-9F80-766F174CEDC9}.Debug.Build.0 = Debug|Win32 + {18C5E289-8D90-400D-9F80-766F174CEDC9}.Release.ActiveCfg = Release|Win32 + {18C5E289-8D90-400D-9F80-766F174CEDC9}.Release.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + EndGlobalSection + GlobalSection(ExtensibilityAddIns) = postSolution + EndGlobalSection +EndGlobal Copied: trunk/re2c/re2c-2002.vcproj (from rev 575, trunk/re2c/re2c.vcproj) =================================================================== --- trunk/re2c/re2c-2002.vcproj (rev 0) +++ trunk/re2c/re2c-2002.vcproj 2006-06-11 10:24:47 UTC (rev 583) @@ -0,0 +1,201 @@ +<?xml version="1.0" encoding = "Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="7.00" + Name="re2c" + ProjectGUID="{831DB149-B845-4969-9782-E07F2B566CDE}" + Keyword="Win32Proj"> + <Platforms> + <Platform + Name="Win32"/> + </Platforms> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="Debug-2002" + IntermediateDirectory="Debug-2002" + ConfigurationType="1"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + FavorSizeOrSpeed="1" + OptimizeForProcessor="1" + DisableLanguageExtensions="FALSE" + BrowseInformation="1" + DebugInformationFormat="3"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + IgnoreDefaultLibraryNames="winspool.lib comdlg32.lib advapi32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib" + GenerateDebugInformation="TRUE"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="Release-2002" + IntermediateDirectory="Release-2002" + ConfigurationType="1"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="TRUE" + FavorSizeOrSpeed="1" + OmitFramePointers="TRUE" + EnableFiberSafeOptimizations="TRUE" + OptimizeForProcessor="1" + AdditionalIncludeDirectories="" + SmallerTypeCheck="FALSE" + BufferSecurityCheck="FALSE" + DisableLanguageExtensions="FALSE" + RuntimeTypeInfo="FALSE" + DebugInformationFormat="3"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + IgnoreDefaultLibraryNames="winspool.lib comdlg32.lib advapi32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib" + GenerateDebugInformation="FALSE"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + </Configuration> + </Configurations> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;cc"> + <File + RelativePath="actions.cc"> + </File> + <File + RelativePath="code.cc"> + </File> + <File + RelativePath="dfa.cc"> + </File> + <File + RelativePath="main.cc"> + </File> + <File + RelativePath="mbo_getopt.cc"> + </File> + <File + RelativePath="bootstrap\parser.cc"> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=".\."/> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=".\."/> + </FileConfiguration> + </File> + <File + RelativePath="bootstrap\scanner.cc"> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=".\."/> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=".\."/> + </FileConfiguration> + </File> + <File + RelativePath="substr.cc"> + </File> + <File + RelativePath="translate.cc"> + </File> + <File + RelativePath="bootstrap\y.tab.h"> + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc"> + <File + RelativePath="basics.h"> + </File> + <File + RelativePath="code.h"> + </File> + <File + RelativePath="config_w32.h"> + </File> + <File + RelativePath="dfa.h"> + </File> + <File + RelativePath="globals.h"> + </File> + <File + RelativePath="ins.h"> + </File> + <File + RelativePath="mbo_getopt.h"> + </File> + <File + RelativePath="parser.h"> + </File> + <File + RelativePath="parser.tab.h"> + </File> + <File + RelativePath="re.h"> + </File> + <File + RelativePath="scanner.h"> + </File> + <File + RelativePath="stream_lc.h"> + </File> + <File + RelativePath="substr.h"> + </File> + <File + RelativePath="token.h"> + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: trunk/re2c/re2c-2003.sln =================================================================== --- trunk/re2c/re2c-2003.sln (rev 0) +++ trunk/re2c/re2c-2003.sln 2006-06-11 10:24:47 UTC (rev 583) @@ -0,0 +1,21 @@ +Microsoft Visual Studio Solution File, Format Version 8.00 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "re2c", "re2c-2003.vcproj", "{18C5E289-8D90-400D-9F80-766F174CEDC9}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfiguration) = preSolution + Debug = Debug + Release = Release + EndGlobalSection + GlobalSection(ProjectConfiguration) = postSolution + {18C5E289-8D90-400D-9F80-766F174CEDC9}.Debug.ActiveCfg = Debug|Win32 + {18C5E289-8D90-400D-9F80-766F174CEDC9}.Debug.Build.0 = Debug|Win32 + {18C5E289-8D90-400D-9F80-766F174CEDC9}.Release.ActiveCfg = Release|Win32 + {18C5E289-8D90-400D-9F80-766F174CEDC9}.Release.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + EndGlobalSection + GlobalSection(ExtensibilityAddIns) = postSolution + EndGlobalSection +EndGlobal Property changes on: trunk/re2c/re2c-2003.sln ___________________________________________________________________ Name: svn:executable + * Added: trunk/re2c/re2c-2003.vcproj =================================================================== --- trunk/re2c/re2c-2003.vcproj (rev 0) +++ trunk/re2c/re2c-2003.vcproj 2006-06-11 10:24:47 UTC (rev 583) @@ -0,0 +1,215 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="7.10" + Name="re2c" + ProjectGUID="{831DB149-B845-4969-9782-E07F2B566CDE}" + Keyword="Win32Proj"> + <Platforms> + <Platform + Name="Win32"/> + </Platforms> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="Debug-2003" + IntermediateDirectory="Debug-2003" + ConfigurationType="1"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + FavorSizeOrSpeed="1" + OptimizeForProcessor="1" + DisableLanguageExtensions="FALSE" + BrowseInformation="1" + DebugInformationFormat="3"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + IgnoreDefaultLibraryNames="winspool.lib comdlg32.lib advapi32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib" + GenerateDebugInformation="TRUE"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="Release-2003" + IntermediateDirectory="Release-2003" + ConfigurationType="1"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="TRUE" + FavorSizeOrSpeed="1" + OmitFramePointers="TRUE" + EnableFiberSafeOptimizations="TRUE" + OptimizeForProcessor="1" + AdditionalIncludeDirectories="" + SmallerTypeCheck="FALSE" + BufferSecurityCheck="FALSE" + DisableLanguageExtensions="FALSE" + RuntimeTypeInfo="FALSE" + DebugInformationFormat="3"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + IgnoreDefaultLibraryNames="winspool.lib comdlg32.lib advapi32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib" + GenerateDebugInformation="FALSE"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;cc"> + <File + RelativePath="actions.cc"> + </File> + <File + RelativePath="code.cc"> + </File> + <File + RelativePath="dfa.cc"> + </File> + <File + RelativePath="main.cc"> + </File> + <File + RelativePath="mbo_getopt.cc"> + </File> + <File + RelativePath="bootstrap\parser.cc"> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=".\."/> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=".\."/> + </FileConfiguration> + </File> + <File + RelativePath="bootstrap\scanner.cc"> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=".\."/> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=".\."/> + </FileConfiguration> + </File> + <File + RelativePath="substr.cc"> + </File> + <File + RelativePath="translate.cc"> + </File> + <File + RelativePath="bootstrap\y.tab.h"> + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc"> + <File + RelativePath="basics.h"> + </File> + <File + RelativePath="code.h"> + </File> + <File + RelativePath="config_w32.h"> + </File> + <File + RelativePath="dfa.h"> + </File> + <File + RelativePath="globals.h"> + </File> + <File + RelativePath="ins.h"> + </File> + <File + RelativePath="mbo_getopt.h"> + </File> + <File + RelativePath="parser.h"> + </File> + <File + RelativePath="parser.tab.h"> + </File> + <File + RelativePath="re.h"> + </File> + <File + RelativePath="scanner.h"> + </File> + <File + RelativePath="stream_lc.h"> + </File> + <File + RelativePath="substr.h"> + </File> + <File + RelativePath="token.h"> + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Property changes on: trunk/re2c/re2c-2003.vcproj ___________________________________________________________________ Name: svn:executable + * Deleted: trunk/re2c/re2c.sln =================================================================== --- trunk/re2c/re2c.sln 2006-06-07 20:00:29 UTC (rev 582) +++ trunk/re2c/re2c.sln 2006-06-11 10:24:47 UTC (rev 583) @@ -1,21 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 7.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "re2c", "re2c.vcproj", "{18C5E289-8D90-400D-9F80-766F174CEDC9}" -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - ConfigName.0 = Debug - ConfigName.1 = Release - EndGlobalSection - GlobalSection(ProjectDependencies) = postSolution - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {18C5E289-8D90-400D-9F80-766F174CEDC9}.Debug.ActiveCfg = Debug|Win32 - {18C5E289-8D90-400D-9F80-766F174CEDC9}.Debug.Build.0 = Debug|Win32 - {18C5E289-8D90-400D-9F80-766F174CEDC9}.Release.ActiveCfg = Release|Win32 - {18C5E289-8D90-400D-9F80-766F174CEDC9}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal Deleted: trunk/re2c/re2c.vcproj =================================================================== --- trunk/re2c/re2c.vcproj 2006-06-07 20:00:29 UTC (rev 582) +++ trunk/re2c/re2c.vcproj 2006-06-11 10:24:47 UTC (rev 583) @@ -1,201 +0,0 @@ -<?xml version="1.0" encoding = "Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="7.00" - Name="re2c" - ProjectGUID="{831DB149-B845-4969-9782-E07F2B566CDE}" - Keyword="Win32Proj"> - <Platforms> - <Platform - Name="Win32"/> - </Platforms> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="Debug" - IntermediateDirectory="Debug" - ConfigurationType="1"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - FavorSizeOrSpeed="1" - OptimizeForProcessor="1" - DisableLanguageExtensions="FALSE" - BrowseInformation="1" - DebugInformationFormat="3"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLinkerTool" - IgnoreDefaultLibraryNames="winspool.lib comdlg32.lib advapi32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib" - GenerateDebugInformation="TRUE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="Release" - IntermediateDirectory="Release" - ConfigurationType="1"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="2" - EnableIntrinsicFunctions="TRUE" - FavorSizeOrSpeed="1" - OmitFramePointers="TRUE" - EnableFiberSafeOptimizations="TRUE" - OptimizeForProcessor="1" - AdditionalIncludeDirectories="" - SmallerTypeCheck="FALSE" - BufferSecurityCheck="FALSE" - DisableLanguageExtensions="FALSE" - RuntimeTypeInfo="FALSE" - DebugInformationFormat="3"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLinkerTool" - IgnoreDefaultLibraryNames="winspool.lib comdlg32.lib advapi32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib" - GenerateDebugInformation="FALSE"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - </Configuration> - </Configurations> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;cc"> - <File - RelativePath="actions.cc"> - </File> - <File - RelativePath="code.cc"> - </File> - <File - RelativePath="dfa.cc"> - </File> - <File - RelativePath="main.cc"> - </File> - <File - RelativePath="mbo_getopt.cc"> - </File> - <File - RelativePath="bootstrap\parser.cc"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories=".\."/> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories=".\."/> - </FileConfiguration> - </File> - <File - RelativePath="bootstrap\scanner.cc"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories=".\."/> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories=".\."/> - </FileConfiguration> - </File> - <File - RelativePath="substr.cc"> - </File> - <File - RelativePath="translate.cc"> - </File> - <File - RelativePath="bootstrap\y.tab.h"> - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl;inc"> - <File - RelativePath="basics.h"> - </File> - <File - RelativePath="code.h"> - </File> - <File - RelativePath="config_w32.h"> - </File> - <File - RelativePath="dfa.h"> - </File> - <File - RelativePath="globals.h"> - </File> - <File - RelativePath="ins.h"> - </File> - <File - RelativePath="mbo_getopt.h"> - </File> - <File - RelativePath="parser.h"> - </File> - <File - RelativePath="parser.tab.h"> - </File> - <File - RelativePath="re.h"> - </File> - <File - RelativePath="scanner.h"> - </File> - <File - RelativePath="stream_lc.h"> - </File> - <File - RelativePath="substr.h"> - </File> - <File - RelativePath="token.h"> - </File> - </Filter> - <Filter - Name="Resource Files" - Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2006-06-08 02:52:57
|
Revision: 580 Author: helly Date: 2006-06-07 12:58:03 -0700 (Wed, 07 Jun 2006) ViewCVS: http://svn.sourceforge.net/re2c/?rev=580&view=rev Log Message: ----------- - Update links Modified Paths: -------------- trunk/re2c/htdocs/index.html Modified: trunk/re2c/htdocs/index.html =================================================================== --- trunk/re2c/htdocs/index.html 2006-06-05 22:45:48 UTC (rev 579) +++ trunk/re2c/htdocs/index.html 2006-06-07 19:58:03 UTC (rev 580) @@ -66,8 +66,8 @@ <a href="http://gentoo.org">Gentoo</a>, <a href="http://mandriva.com">Mandriva</a> and <a href="http://packages.ubuntu.com">ubuntu</a> provide re2c packages.</li> -<li>FreeBSD page on the re2c ports package. <a href= -"http://www.freshports.org/devel/re2c/">http://www.freshports.org/devel/re2c/</a></li> +<li><a href="http://www.freebsd.org">FreeBSD</a> offers <a href="http://www.freshports.org/devel/re2c/">re2c</a>.</li> +<li><a href="http://www.openpkg.org">OpenPkg</a> offers <a href="http://cvs.openpkg.org/dir?d=openpkg-src/re2c">re2c</a>.</li> <li>Source packages and windows binary are available through <a href="http://sourceforge.net/projects/re2c">sourceforge</a> on the re2c <a href="http://sourceforge.net/project/showfiles.php?group_id=96864">files pages</a>.</li> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2006-06-08 02:52:56
|
Revision: 581 Author: helly Date: 2006-06-07 12:59:54 -0700 (Wed, 07 Jun 2006) ViewCVS: http://svn.sourceforge.net/re2c/?rev=581&view=rev Log Message: ----------- - MFH Update links Modified Paths: -------------- tags/RELEASE_0_10_5/htdocs/index.html Modified: tags/RELEASE_0_10_5/htdocs/index.html =================================================================== --- tags/RELEASE_0_10_5/htdocs/index.html 2006-06-07 19:58:03 UTC (rev 580) +++ tags/RELEASE_0_10_5/htdocs/index.html 2006-06-07 19:59:54 UTC (rev 581) @@ -66,8 +66,8 @@ <a href="http://gentoo.org">Gentoo</a>, <a href="http://mandriva.com">Mandriva</a> and <a href="http://packages.ubuntu.com">ubuntu</a> provide re2c packages.</li> -<li>FreeBSD page on the re2c ports package. <a href= -"http://www.freshports.org/devel/re2c/">http://www.freshports.org/devel/re2c/</a></li> +<li><a href="http://www.freebsd.org">FreeBSD</a> offers <a href="http://www.freshports.org/devel/re2c/">re2c</a>.</li> +<li><a href="http://www.openpkg.org">OpenPkg</a> offers <a href="http://cvs.openpkg.org/dir?d=openpkg-src/re2c">re2c</a>.</li> <li>Source packages and windows binary are available through <a href="http://sourceforge.net/projects/re2c">sourceforge</a> on the re2c <a href="http://sourceforge.net/project/showfiles.php?group_id=96864">files pages</a>.</li> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |