NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit74a09d9

committed

Fix bugs in the isolation tester flex rules.

Tom Lane pointed out that it was giving a warning: "-s option given butdefault rule can be matched". That was because there was no rule to handlenewline in a quoted string. I made that throw an error.Also, line number tracking was broken, giving incorrect line number onerror. Fixed that too.

1 parent2d8de0a commit74a09d9Copy full SHA for 74a09d9

File tree

1 file changed

+17

-9

lines changed

src/test/isolation
- specscanner.l

1 file changed

+17

-9

lines changed

`‎src/test/isolation/specscanner.l`

Lines changed: 17 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,10 +32,9 @@ static void addlitchar(const char c);`
`32`	`32`	`%xqstr`
`33`	`33`
`34`	`34`	`non_newline[^\n\r]`
`35`		`-space[\t\n\r\f]`
	`35`	`+space[\t\r\f]`
`36`	`36`
`37`	`37`	`comment("#"{non_newline}*)`
`38`		`-whitespace({space}+\|{comment})`
`39`	`38`
`40`	`39`	`%%`
`41`	`40`
`@@ -46,10 +45,10 @@ step{ return(STEP); }`
`46`	`45`	`teardown{return(TEARDOWN); }`
`47`	`46`
`48`	`47`	`[\n]{ yyline++; }`
`49`		`-{whitespace}{`
`50`		`-/* ignore */`
`51`		`-}`
	`48`	`+{comment}{/* ignore */ }`
	`49`	`+{space}{/* ignore */ }`
`52`	`50`
	`51`	`+/* Quoted strings: "foo" */`
`53`	`52`	`\"{`
`54`	`53`	`litbufpos =0;`
`55`	`54`	`BEGIN(qstr);`
`@@ -61,27 +60,36 @@ teardown{ return(TEARDOWN); }`
`61`	`60`	`return(string);`
`62`	`61`	`}`
`63`	`62`	`<qstr>.{addlitchar(yytext[0]); }`
	`63`	`+<qstr>\n{yyerror("unexpected newline in quoted string"); }`
	`64`	`+<qstr><<EOF>>{yyerror("unterminated quoted string"); }`
`64`	`65`
	`66`	`+/* SQL blocks: { UPDATE ... } */`
`65`	`67`	`"{"{`
`66`	`68`
`67`	`69`	`litbufpos =0;`
`68`	`70`	`BEGIN(sql);`
`69`	`71`	`}`
`70`		`-`
`71`	`72`	`<sql>"}"{`
`72`	`73`	`litbuf[litbufpos] ='\0';`
`73`	`74`	`yylval.str =strdup(litbuf);`
`74`	`75`	`BEGIN(INITIAL);`
`75`	`76`	`return(sqlblock);`
`76`	`77`	`}`
`77`		`-<sql>[^}]{addlitchar(yytext[0]);}`
`78`		`-`
	`78`	`+<sql>.{`
	`79`	`+addlitchar(yytext[0]);`
	`80`	`+}`
	`81`	`+<sql>\n{`
	`82`	`+yyline++;`
	`83`	`+addlitchar(yytext[0]);`
	`84`	`+}`
	`85`	`+<sql><<EOF>>{`
	`86`	`+yyerror("unterminated sql block");`
	`87`	`+}`
`79`	`88`
`80`	`89`	`.{`
`81`	`90`	`fprintf(stderr,"syntax error at line %d: unexpected character\"%s\"\n", yyline, yytext);`
`82`	`91`	`exit(1);`
`83`	`92`	`}`
`84`		`-`
`85`	`93`	`%%`
`86`	`94`
`87`	`95`	`staticvoid`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit74a09d9

File tree

1 file changed

1 file changed

`‎src/test/isolation/specscanner.l`

0 commit comments