Skip to content

Commit 350f477

Browse files
committed
Spelling adjustments
similar to 0fd2a79
1 parent b1d32d3 commit 350f477

File tree

7 files changed

+16
-16
lines changed

7 files changed

+16
-16
lines changed

Diff for: contrib/pg_trgm/trgm_regexp.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
* (two prefix colors plus a state number from the original NFA) an
7474
* "enter key".
7575
*
76-
* Each arc of the expanded graph is labelled with a trigram that must be
76+
* Each arc of the expanded graph is labeled with a trigram that must be
7777
* present in the string to match. We can construct this from an out-arc of
7878
* the underlying NFA state by combining the expanded state's prefix with the
7979
* color label of the underlying out-arc, if neither prefix position is
@@ -123,7 +123,7 @@
123123
* false positives that we would have to traverse a large fraction of the
124124
* index, the graph is simplified further in a lossy fashion by removing
125125
* color trigrams. When a color trigram is removed, the states connected by
126-
* any arcs labelled with that trigram are merged.
126+
* any arcs labeled with that trigram are merged.
127127
*
128128
* Trigrams do not all have equivalent value for searching: some of them are
129129
* more frequent and some of them are less frequent. Ideally, we would like

Diff for: src/backend/commands/explain.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -4238,7 +4238,7 @@ ExplainOpenGroup(const char *objtype, const char *labelname,
42384238
/*
42394239
* In YAML format, the grouping stack is an integer list. 0 means
42404240
* we've emitted nothing at this grouping level AND this grouping
4241-
* level is unlabelled and must be marked with "- ". See
4241+
* level is unlabeled and must be marked with "- ". See
42424242
* ExplainYAMLLineStarting().
42434243
*/
42444244
ExplainYAMLLineStarting(es);
@@ -4601,7 +4601,7 @@ ExplainJSONLineEnding(ExplainState *es)
46014601
*
46024602
* YAML lines are ordinarily indented by two spaces per indentation level.
46034603
* The text emitted for each property begins just prior to the preceding
4604-
* line-break, except for the first property in an unlabelled group, for which
4604+
* line-break, except for the first property in an unlabeled group, for which
46054605
* it begins immediately after the "- " that introduces the group. The first
46064606
* property of the group appears on the same line as the opening "- ".
46074607
*/

Diff for: src/backend/optimizer/plan/planner.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ standard_planner(Query *parse, const char *query_string, int cursorOptions,
367367
* parallel-restricted, and in either case it should be OK to impose
368368
* parallel-mode restrictions. If that ends up breaking something, then
369369
* either some function the user included in the query is incorrectly
370-
* labelled as parallel-safe or parallel-restricted when in reality it's
370+
* labeled as parallel-safe or parallel-restricted when in reality it's
371371
* parallel-unsafe, or else the query planner itself has a bug.
372372
*/
373373
glob->parallelModeNeeded = glob->parallelModeOK &&

Diff for: src/pl/plpgsql/src/expected/plpgsql_control.out

+2-2
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ begin
349349
end loop flbl1;
350350
end;
351351
$$ language plpgsql;
352-
ERROR: end label "flbl1" specified for unlabelled block
352+
ERROR: end label "flbl1" specified for unlabeled block
353353
LINE 5: end loop flbl1;
354354
^
355355
-- should fail: end label does not match start label
@@ -374,7 +374,7 @@ begin
374374
end loop outer_label;
375375
end;
376376
$$ language plpgsql;
377-
ERROR: end label "outer_label" specified for unlabelled block
377+
ERROR: end label "outer_label" specified for unlabeled block
378378
LINE 6: end loop outer_label;
379379
^
380380
-- unlabeled exit matches no blocks

Diff for: src/pl/plpgsql/src/pl_exec.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -212,41 +212,41 @@ static HTAB *shared_cast_hash = NULL;
212212
{ \
213213
if (estate->exitlabel == NULL) \
214214
{ \
215-
/* unlabelled EXIT terminates this loop */ \
215+
/* unlabeled EXIT terminates this loop */ \
216216
rc = PLPGSQL_RC_OK; \
217217
exit_action; \
218218
} \
219219
else if ((looplabel) != NULL && \
220220
strcmp(looplabel, estate->exitlabel) == 0) \
221221
{ \
222-
/* labelled EXIT matching this loop, so terminate loop */ \
222+
/* labeled EXIT matching this loop, so terminate loop */ \
223223
estate->exitlabel = NULL; \
224224
rc = PLPGSQL_RC_OK; \
225225
exit_action; \
226226
} \
227227
else \
228228
{ \
229-
/* non-matching labelled EXIT, propagate RC_EXIT out */ \
229+
/* non-matching labeled EXIT, propagate RC_EXIT out */ \
230230
exit_action; \
231231
} \
232232
} \
233233
else if (rc == PLPGSQL_RC_CONTINUE) \
234234
{ \
235235
if (estate->exitlabel == NULL) \
236236
{ \
237-
/* unlabelled CONTINUE matches this loop, so continue in loop */ \
237+
/* unlabeled CONTINUE matches this loop, so continue in loop */ \
238238
rc = PLPGSQL_RC_OK; \
239239
} \
240240
else if ((looplabel) != NULL && \
241241
strcmp(looplabel, estate->exitlabel) == 0) \
242242
{ \
243-
/* labelled CONTINUE matching this loop, so continue in loop */ \
243+
/* labeled CONTINUE matching this loop, so continue in loop */ \
244244
estate->exitlabel = NULL; \
245245
rc = PLPGSQL_RC_OK; \
246246
} \
247247
else \
248248
{ \
249-
/* non-matching labelled CONTINUE, propagate RC_CONTINUE out */ \
249+
/* non-matching labeled CONTINUE, propagate RC_CONTINUE out */ \
250250
exit_action; \
251251
} \
252252
} \

Diff for: src/pl/plpgsql/src/pl_gram.y

+2-2
Original file line numberDiff line numberDiff line change
@@ -1725,7 +1725,7 @@ stmt_exit : exit_type opt_label opt_exitcond
17251725
{
17261726
/*
17271727
* No label, so make sure there is some loop (an
1728-
* unlabelled EXIT does not match a block, so this
1728+
* unlabeled EXIT does not match a block, so this
17291729
* is the same test for both EXIT and CONTINUE)
17301730
*/
17311731
if (plpgsql_ns_find_nearest_loop(plpgsql_ns_top()) == NULL)
@@ -3749,7 +3749,7 @@ check_labels(const char *start_label, const char *end_label, int end_location)
37493749
if (!start_label)
37503750
ereport(ERROR,
37513751
(errcode(ERRCODE_SYNTAX_ERROR),
3752-
errmsg("end label \"%s\" specified for unlabelled block",
3752+
errmsg("end label \"%s\" specified for unlabeled block",
37533753
end_label),
37543754
parser_errposition(end_location)));
37553755

Diff for: src/pl/plpgsql/src/plpgsql.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -833,7 +833,7 @@ typedef struct PLpgSQL_stmt_exit
833833
int lineno;
834834
unsigned int stmtid;
835835
bool is_exit; /* Is this an exit or a continue? */
836-
char *label; /* NULL if it's an unlabelled EXIT/CONTINUE */
836+
char *label; /* NULL if it's an unlabeled EXIT/CONTINUE */
837837
PLpgSQL_expr *cond;
838838
} PLpgSQL_stmt_exit;
839839

0 commit comments

Comments
 (0)