Commit18391a8

committed

Tweak wording of syntax error messages about bad CONTINUE/EXIT statements.

Try to avoid any possible confusion about what these messages mean.

1 parentaad663a commit18391a8Copy full SHA for 18391a8

File tree

+10

-10

lines changed

+10

-10

lines changed

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1676,11 +1676,11 @@ stmt_exit: exit_type opt_label opt_exitcond`
`1676`	`1676`	`if (label ==NULL)`
`1677`	`1677`	`ereport(ERROR,`
`1678`	`1678`	`(errcode(ERRCODE_SYNTAX_ERROR),`
`1679`		`-errmsg("label\"%s\"does not exist",`
	`1679`	`+errmsg("there is nolabel\"%s\"surrounding this statement",`
`1680`	`1680`	`$2),`
`1681`	`1681`	`parser_errposition(@2)));`
`1682`	`1682`	`/* CONTINUE only allows loop labels*/`
`1683`		`-if (label->itemno != PLPGSQL_LABEL_LOOP && !$1)`
	`1683`	`+if (label->itemno != PLPGSQL_LABEL_LOOP && !new->is_exit)`
`1684`	`1684`	`ereport(ERROR,`
`1685`	`1685`	`(errcode(ERRCODE_SYNTAX_ERROR),`
`1686`	`1686`	`errmsg("block label\"%s\" cannot be used in CONTINUE",`
`@@ -1697,9 +1697,9 @@ stmt_exit: exit_type opt_label opt_exitcond`
`1697`	`1697`	`if (plpgsql_ns_find_nearest_loop(plpgsql_ns_top()) ==NULL)`
`1698`	`1698`	`ereport(ERROR,`
`1699`	`1699`	`(errcode(ERRCODE_SYNTAX_ERROR),`
`1700`		`-/* translator: %s is EXIT or CONTINUE*/`
`1701`		`-errmsg("%s cannot be used outside a loop",`
`1702`		`-plpgsql_stmt_typename((PLpgSQL_stmt *)new)),`
	`1700`	`+new->is_exit ?`
	`1701`	`+errmsg("EXIT cannot be used outside a loop, unless it has a label") :`
	`1702`	`+errmsg("CONTINUE cannot be used outside a loop"),`
`1703`	`1703`	`parser_errposition(@1)));`
`1704`	`1704`	`}`
`1705`	`1705`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -2843,15 +2843,15 @@ $$ language plpgsql;`
`2843`	`2843`	`ERROR: CONTINUE cannot be used outside a loop`
`2844`	`2844`	`LINE 4: continue;`
`2845`	`2845`	`^`
`2846`		`--- should fail: EXIT is only legal inside a loop`
	`2846`	`+-- should fail:unlabeledEXIT is only legal inside a loop`
`2847`	`2847`	`create function exit_error1() returns void as $$`
`2848`	`2848`	`begin`
`2849`	`2849`	`begin`
`2850`	`2850`	`exit;`
`2851`	`2851`	`end;`
`2852`	`2852`	`end;`
`2853`	`2853`	`$$ language plpgsql;`
`2854`		`-ERROR: EXIT cannot be used outside a loop`
	`2854`	`+ERROR: EXIT cannot be used outside a loop, unless it has a label`
`2855`	`2855`	`LINE 4: exit;`
`2856`	`2856`	`^`
`2857`	`2857`	`-- should fail: no such label`
`@@ -2864,7 +2864,7 @@ begin`
`2864`	`2864`	`end;`
`2865`	`2865`	`end;`
`2866`	`2866`	`$$ language plpgsql;`
`2867`		`-ERROR: label "no_such_label"does not exist`
	`2867`	`+ERROR:there is nolabel "no_such_label"surrounding this statement`
`2868`	`2868`	`LINE 5: continue no_such_label;`
`2869`	`2869`	`^`
`2870`	`2870`	`-- should fail: no such label`
`@@ -2877,7 +2877,7 @@ begin`
`2877`	`2877`	`end;`
`2878`	`2878`	`end;`
`2879`	`2879`	`$$ language plpgsql;`
`2880`		`-ERROR: label "no_such_label"does not exist`
	`2880`	`+ERROR:there is nolabel "no_such_label"surrounding this statement`
`2881`	`2881`	`LINE 5: exit no_such_label;`
`2882`	`2882`	`^`
`2883`	`2883`	`-- should fail: CONTINUE can't reference the label of a named block`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2373,7 +2373,7 @@ begin`
`2373`	`2373`	`end;`
`2374`	`2374`	`$$ language plpgsql;`
`2375`	`2375`
`2376`		`--- should fail: EXIT is only legal inside a loop`
	`2376`	`+-- should fail:unlabeledEXIT is only legal inside a loop`
`2377`	`2377`	`createfunctionexit_error1() returns voidas $$`
`2378`	`2378`	`begin`
`2379`	`2379`	`begin`

Comments

(0)