cvs: /php4/ext/standard url_scanner.c url_scanner.re

sas Sat Sep 18 08:16:16 1999 EDT Modified files: /php4/ext/standard url_scanner.c url_scanner.re Log: Aline escape signs in macro definitions. Index: php4/ext/standard/url_scanner.c diff -u php4/ext/standard/url_scanner.c:1.4 php4/ext/standard/url_scanner.c:1.5 --- php4/ext/standard/url_scanner.c:1.4 Fri Sep 17 08:32:18 1999 +++ php4/ext/standard/url_scanner.c Sat Sep 18 08:16:15 1999 @@ -1,4 +1,4 @@ -/* Generated by re2c 0.5 on Fri Sep 17 14:31:47 1999 */ +/* Generated by re2c 0.5 on Fri Sep 17 20:08:27 1999 */ #line 1 "../../../php4/ext/standard/url_scanner.re" /* +----------------------------------------------------------------------+ @@ -17,7 +17,7 @@ | Author: Sascha Schumann <sascha@schumann.cx> | +----------------------------------------------------------------------+ */ -/* $Id: url_scanner.c,v 1.4 1999/09/17 12:32:18 thies Exp $ */ +/* $Id: url_scanner.c,v 1.5 1999/09/18 12:16:15 sas Exp $ */ #include <sys/types.h> #include <stdio.h> @@ -51,26 +51,27 @@ #define FINISH { catchup(state); goto finish; } -#define BEGIN(x) \ - switch(state->state) { \ - case INITIAL: \ - catchup(state); \ - break; \ - case REF: \ - screw_url(state); \ - break; \ - } \ - state->state = x; \ - state->start = state->crs; \ +#define BEGIN(x) \ + switch(state->state) { \ + case INITIAL: \ + catchup(state); \ + break; \ + case REF: \ + screw_url(state); \ + break; \ + } \ + state->state = x; \ + state->start = state->crs; \ goto nextiter -#define ATTACH(s, n) { \ - size_t _newlen = state->targetsize + n; \ - state->target = realloc(state->target, _newlen + 1); \ - memcpy(state->target + state->targetsize, s, n); \ - state->targetsize = _newlen; \ - state->target[_newlen] = '\0'; \ - } +#define ATTACH(s, n) \ +{ \ + size_t _newlen = state->targetsize + n; \ + state->target = realloc(state->target, _newlen + 1); \ + memcpy(state->target + state->targetsize, s, n); \ + state->targetsize = _newlen; \ + state->target[_newlen] = '\0'; \ +} #define URLLEN 512 @@ -121,7 +122,7 @@ ATTACH(state->start, (state->crs - state->start)); } -#line 134 +#line 135 static void url_scanner(lexdata *state) @@ -190,11 +191,11 @@ yych = *YYCURSOR; yy5: if(yybm[0+yych] & 64) goto yy4; yy6: -#line 145 +#line 146 { BEGIN(INITIAL); } yy7: yych = *++YYCURSOR; yy8: -#line 146 +#line 147 { FINISH; } yy9: yych = *++YYCURSOR; if(yych == 'H') goto yy3; @@ -253,7 +254,7 @@ if(yych == ' ') goto yy21; } yy23: -#line 143 +#line 144 { BEGIN(REF); } yy24: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); @@ -309,10 +310,10 @@ if(yych == ' ') goto yy31; } yy33: -#line 144 +#line 145 { BEGIN(REF); } } -#line 147 +#line 148 break; case REF: @@ -384,7 +385,7 @@ if(yych <= '=') goto yy42; } yy41: -#line 151 +#line 152 { BEGIN(INITIAL); } yy42: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); @@ -394,7 +395,7 @@ if(yych <= '!') goto yy45; if(yych <= '"') goto yy47; yy44: -#line 153 +#line 154 { /* don't modify absolute links */ state->state = INITIAL; BEGIN(INITIAL); @@ -435,10 +436,10 @@ goto yy41; yy51: yych = *++YYCURSOR; yy52: YYCURSOR -= 1; -#line 152 +#line 153 { BEGIN(INITIAL); } } -#line 157 +#line 158 break; } Index: php4/ext/standard/url_scanner.re diff -u php4/ext/standard/url_scanner.re:1.4 php4/ext/standard/url_scanner.re:1.5 --- php4/ext/standard/url_scanner.re:1.4 Fri Sep 17 08:32:18 1999 +++ php4/ext/standard/url_scanner.re Sat Sep 18 08:16:16 1999 @@ -15,7 +15,7 @@ | Author: Sascha Schumann <sascha@schumann.cx> | +----------------------------------------------------------------------+ */ -/* $Id: url_scanner.re,v 1.4 1999/09/17 12:32:18 thies Exp $ */ +/* $Id: url_scanner.re,v 1.5 1999/09/18 12:16:16 sas Exp $ */ #include <sys/types.h> #include <stdio.h> @@ -49,26 +49,27 @@ #define FINISH { catchup(state); goto finish; } -#define BEGIN(x) \ - switch(state->state) { \ - case INITIAL: \ - catchup(state); \ - break; \ - case REF: \ - screw_url(state); \ - break; \ - } \ - state->state = x; \ - state->start = state->crs; \ +#define BEGIN(x) \ + switch(state->state) { \ + case INITIAL: \ + catchup(state); \ + break; \ + case REF: \ + screw_url(state); \ + break; \ + } \ + state->state = x; \ + state->start = state->crs; \ goto nextiter -#define ATTACH(s, n) { \ - size_t _newlen = state->targetsize + n; \ - state->target = realloc(state->target, _newlen + 1); \ - memcpy(state->target + state->targetsize, s, n); \ - state->targetsize = _newlen; \ - state->target[_newlen] = '\0'; \ - } +#define ATTACH(s, n) \ +{ \ + size_t _newlen = state->targetsize + n; \ + state->target = realloc(state->target, _newlen + 1); \ + memcpy(state->target + state->targetsize, s, n); \ + state->targetsize = _newlen; \ + state->target[_newlen] = '\0'; \ +} #define URLLEN 512