Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/xlint/lint2 lint: change spelling of initialisation ...



details:   https://anonhg.NetBSD.org/src/rev/4e6a80b1f4ba
branches:  trunk
changeset: 952968:4e6a80b1f4ba
user:      rillig <rillig%NetBSD.org@localhost>
date:      Mon Feb 22 15:09:50 2021 +0000

description:
lint: change spelling of initialisation to initialization

That's the wording from the ISO C99 standard.

diffstat:

 tests/usr.bin/xlint/lint1/d_c99_init.exp           |   2 +-
 tests/usr.bin/xlint/lint1/d_struct_init_nested.exp |   6 ++--
 tests/usr.bin/xlint/lint1/msg_175.c                |   4 +-
 tests/usr.bin/xlint/lint1/msg_175.exp              |   2 +-
 tests/usr.bin/xlint/lint1/msg_185.c                |   4 +-
 tests/usr.bin/xlint/lint1/msg_186.c                |   6 ++--
 tests/usr.bin/xlint/lint1/msg_186.exp              |   2 +-
 tests/usr.bin/xlint/lint1/msg_210.c                |   4 +-
 tests/usr.bin/xlint/lint1/msg_210.exp              |   4 +-
 tests/usr.bin/xlint/lint1/msg_221.c                |   4 +-
 tests/usr.bin/xlint/lint1/msg_221.exp              |   2 +-
 tests/usr.bin/xlint/lint1/msg_238.c                |   4 +-
 tests/usr.bin/xlint/lint1/msg_277.c                |   4 +-
 usr.bin/xlint/lint1/decl.c                         |   6 ++--
 usr.bin/xlint/lint1/err.c                          |  18 ++++++------
 usr.bin/xlint/lint1/func.c                         |  12 ++++----
 usr.bin/xlint/lint1/init.c                         |  32 +++++++++++-----------
 usr.bin/xlint/lint1/lex.c                          |   6 ++--
 usr.bin/xlint/lint1/lint1.h                        |   4 +-
 usr.bin/xlint/lint1/tree.c                         |  16 +++++-----
 usr.bin/xlint/lint2/chk.c                          |   6 ++--
 usr.bin/xlint/lint2/emit2.c                        |   6 ++--
 22 files changed, 77 insertions(+), 77 deletions(-)

diffs (truncated from 592 to 300 lines):

diff -r b9add5808587 -r 4e6a80b1f4ba tests/usr.bin/xlint/lint1/d_c99_init.exp
--- a/tests/usr.bin/xlint/lint1/d_c99_init.exp  Mon Feb 22 15:01:03 2021 +0000
+++ b/tests/usr.bin/xlint/lint1/d_c99_init.exp  Mon Feb 22 15:09:50 2021 +0000
@@ -1,3 +1,3 @@
 d_c99_init.c(22): invalid initializer type int [176]
 d_c99_init.c(23): too many initializers [174]
-d_c99_init.c(49): initialisation type mismatch (pointer to const void) and (struct any) [185]
+d_c99_init.c(49): initialization type mismatch (pointer to const void) and (struct any) [185]
diff -r b9add5808587 -r 4e6a80b1f4ba tests/usr.bin/xlint/lint1/d_struct_init_nested.exp
--- a/tests/usr.bin/xlint/lint1/d_struct_init_nested.exp        Mon Feb 22 15:01:03 2021 +0000
+++ b/tests/usr.bin/xlint/lint1/d_struct_init_nested.exp        Mon Feb 22 15:09:50 2021 +0000
@@ -1,4 +1,4 @@
-d_struct_init_nested.c(35): initialisation type mismatch (enum I1) and (struct Inner1) [185]
+d_struct_init_nested.c(35): initialization type mismatch (enum I1) and (struct Inner1) [185]
 d_struct_init_nested.c(37): too many struct/union initializers [172]
-d_struct_init_nested.c(62): initialisation type mismatch (enum I1) and (struct Inner2) [185]
-d_struct_init_nested.c(64): warning: enum type mismatch between 'enum I2' and 'enum O3' in initialisation [210]
+d_struct_init_nested.c(62): initialization type mismatch (enum I1) and (struct Inner2) [185]
+d_struct_init_nested.c(64): warning: enum type mismatch between 'enum I2' and 'enum O3' in initialization [210]
diff -r b9add5808587 -r 4e6a80b1f4ba tests/usr.bin/xlint/lint1/msg_175.c
--- a/tests/usr.bin/xlint/lint1/msg_175.c       Mon Feb 22 15:01:03 2021 +0000
+++ b/tests/usr.bin/xlint/lint1/msg_175.c       Mon Feb 22 15:09:50 2021 +0000
@@ -1,7 +1,7 @@
-/*     $NetBSD: msg_175.c,v 1.2 2021/01/24 16:12:45 rillig Exp $       */
+/*     $NetBSD: msg_175.c,v 1.3 2021/02/22 15:09:50 rillig Exp $       */
 # 3 "msg_175.c"
 
-// Test for message: initialisation of an incomplete type [175]
+// Test for message: initialization of an incomplete type [175]
 
 struct incomplete;                     /* expect: 233 */
 
diff -r b9add5808587 -r 4e6a80b1f4ba tests/usr.bin/xlint/lint1/msg_175.exp
--- a/tests/usr.bin/xlint/lint1/msg_175.exp     Mon Feb 22 15:01:03 2021 +0000
+++ b/tests/usr.bin/xlint/lint1/msg_175.exp     Mon Feb 22 15:09:50 2021 +0000
@@ -1,3 +1,3 @@
-msg_175.c(8): initialisation of an incomplete type [175]
+msg_175.c(8): initialization of an incomplete type [175]
 msg_175.c(10): incomplete structure or union incomplete: incomplete [31]
 msg_175.c(6): warning: struct incomplete never defined [233]
diff -r b9add5808587 -r 4e6a80b1f4ba tests/usr.bin/xlint/lint1/msg_185.c
--- a/tests/usr.bin/xlint/lint1/msg_185.c       Mon Feb 22 15:01:03 2021 +0000
+++ b/tests/usr.bin/xlint/lint1/msg_185.c       Mon Feb 22 15:09:50 2021 +0000
@@ -1,7 +1,7 @@
-/*     $NetBSD: msg_185.c,v 1.2 2021/02/21 09:07:58 rillig Exp $       */
+/*     $NetBSD: msg_185.c,v 1.3 2021/02/22 15:09:50 rillig Exp $       */
 # 3 "msg_185.c"
 
-// Test for message: initialisation type mismatch (%s) and (%s) [185]
+// Test for message: initialization type mismatch (%s) and (%s) [185]
 
 TODO: "Add example code that triggers the above message." /* expect: 249 */
 TODO: "Add example code that almost triggers the above message."
diff -r b9add5808587 -r 4e6a80b1f4ba tests/usr.bin/xlint/lint1/msg_186.c
--- a/tests/usr.bin/xlint/lint1/msg_186.c       Mon Feb 22 15:01:03 2021 +0000
+++ b/tests/usr.bin/xlint/lint1/msg_186.c       Mon Feb 22 15:09:50 2021 +0000
@@ -1,7 +1,7 @@
-/*     $NetBSD: msg_186.c,v 1.3 2021/02/21 14:49:23 rillig Exp $       */
+/*     $NetBSD: msg_186.c,v 1.4 2021/02/22 15:09:50 rillig Exp $       */
 # 3 "msg_186.c"
 
-/* Test for message: bit-field initialisation is illegal in traditional C [186] */
+/* Test for message: bit-field initialization is illegal in traditional C [186] */
 
 /* lint1-flags: -tw */
 
@@ -16,4 +16,4 @@
        3.0,                    /* expect: 186 */
        2
 };
-/* XXX: The message is misleading.  Initialisation using integers is ok. */
+/* XXX: The message is misleading.  Initialization using integers is ok. */
diff -r b9add5808587 -r 4e6a80b1f4ba tests/usr.bin/xlint/lint1/msg_186.exp
--- a/tests/usr.bin/xlint/lint1/msg_186.exp     Mon Feb 22 15:01:03 2021 +0000
+++ b/tests/usr.bin/xlint/lint1/msg_186.exp     Mon Feb 22 15:09:50 2021 +0000
@@ -5,4 +5,4 @@
 (3): warning: 'long double' is illegal in traditional C [266]
 (3): warning: 'long double' is illegal in traditional C [266]
 (3): warning: function prototypes are illegal in traditional C [270]
-msg_186.c(16): warning: bit-field initialisation is illegal in traditional C [186]
+msg_186.c(16): warning: bit-field initialization is illegal in traditional C [186]
diff -r b9add5808587 -r 4e6a80b1f4ba tests/usr.bin/xlint/lint1/msg_210.c
--- a/tests/usr.bin/xlint/lint1/msg_210.c       Mon Feb 22 15:01:03 2021 +0000
+++ b/tests/usr.bin/xlint/lint1/msg_210.c       Mon Feb 22 15:09:50 2021 +0000
@@ -1,7 +1,7 @@
-/*     $NetBSD: msg_210.c,v 1.3 2021/02/21 10:12:29 rillig Exp $       */
+/*     $NetBSD: msg_210.c,v 1.4 2021/02/22 15:09:50 rillig Exp $       */
 # 3 "msg_210.c"
 
-// Test for message: enum type mismatch in initialisation [210]
+// Test for message: enum type mismatch in initialization [210]
 
 enum A {
        A1
diff -r b9add5808587 -r 4e6a80b1f4ba tests/usr.bin/xlint/lint1/msg_210.exp
--- a/tests/usr.bin/xlint/lint1/msg_210.exp     Mon Feb 22 15:01:03 2021 +0000
+++ b/tests/usr.bin/xlint/lint1/msg_210.exp     Mon Feb 22 15:09:50 2021 +0000
@@ -1,2 +1,2 @@
-msg_210.c(23): warning: enum type mismatch between 'enum A' and 'enum B' in initialisation [210]
-msg_210.c(25): warning: enum type mismatch between 'C' and 'D' in initialisation [210]
+msg_210.c(23): warning: enum type mismatch between 'enum A' and 'enum B' in initialization [210]
+msg_210.c(25): warning: enum type mismatch between 'C' and 'D' in initialization [210]
diff -r b9add5808587 -r 4e6a80b1f4ba tests/usr.bin/xlint/lint1/msg_221.c
--- a/tests/usr.bin/xlint/lint1/msg_221.c       Mon Feb 22 15:01:03 2021 +0000
+++ b/tests/usr.bin/xlint/lint1/msg_221.c       Mon Feb 22 15:09:50 2021 +0000
@@ -1,7 +1,7 @@
-/*     $NetBSD: msg_221.c,v 1.3 2021/01/31 11:12:07 rillig Exp $       */
+/*     $NetBSD: msg_221.c,v 1.4 2021/02/22 15:09:50 rillig Exp $       */
 # 3 "msg_221.c"
 
-// Test for message: initialisation of unsigned with negative constant [221]
+// Test for message: initialization of unsigned with negative constant [221]
 
 struct example {
        unsigned int a: 5;
diff -r b9add5808587 -r 4e6a80b1f4ba tests/usr.bin/xlint/lint1/msg_221.exp
--- a/tests/usr.bin/xlint/lint1/msg_221.exp     Mon Feb 22 15:01:03 2021 +0000
+++ b/tests/usr.bin/xlint/lint1/msg_221.exp     Mon Feb 22 15:09:50 2021 +0000
@@ -1,1 +1,1 @@
-msg_221.c(10): warning: initialisation of unsigned with negative constant [221]
+msg_221.c(10): warning: initialization of unsigned with negative constant [221]
diff -r b9add5808587 -r 4e6a80b1f4ba tests/usr.bin/xlint/lint1/msg_238.c
--- a/tests/usr.bin/xlint/lint1/msg_238.c       Mon Feb 22 15:01:03 2021 +0000
+++ b/tests/usr.bin/xlint/lint1/msg_238.c       Mon Feb 22 15:09:50 2021 +0000
@@ -1,7 +1,7 @@
-/*     $NetBSD: msg_238.c,v 1.2 2021/02/21 09:07:58 rillig Exp $       */
+/*     $NetBSD: msg_238.c,v 1.3 2021/02/22 15:09:50 rillig Exp $       */
 # 3 "msg_238.c"
 
-// Test for message: initialisation of union is illegal in traditional C [238]
+// Test for message: initialization of union is illegal in traditional C [238]
 
 TODO: "Add example code that triggers the above message." /* expect: 249 */
 TODO: "Add example code that almost triggers the above message."
diff -r b9add5808587 -r 4e6a80b1f4ba tests/usr.bin/xlint/lint1/msg_277.c
--- a/tests/usr.bin/xlint/lint1/msg_277.c       Mon Feb 22 15:01:03 2021 +0000
+++ b/tests/usr.bin/xlint/lint1/msg_277.c       Mon Feb 22 15:09:50 2021 +0000
@@ -1,7 +1,7 @@
-/*     $NetBSD: msg_277.c,v 1.2 2021/02/21 09:07:58 rillig Exp $       */
+/*     $NetBSD: msg_277.c,v 1.3 2021/02/22 15:09:50 rillig Exp $       */
 # 3 "msg_277.c"
 
-// Test for message: initialisation of '%s' with '%s' [277]
+// Test for message: initialization of '%s' with '%s' [277]
 
 TODO: "Add example code that triggers the above message." /* expect: 249 */
 TODO: "Add example code that almost triggers the above message."
diff -r b9add5808587 -r 4e6a80b1f4ba usr.bin/xlint/lint1/decl.c
--- a/usr.bin/xlint/lint1/decl.c        Mon Feb 22 15:01:03 2021 +0000
+++ b/usr.bin/xlint/lint1/decl.c        Mon Feb 22 15:09:50 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: decl.c,v 1.137 2021/02/19 22:35:42 rillig Exp $ */
+/* $NetBSD: decl.c,v 1.138 2021/02/22 15:09:50 rillig Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: decl.c,v 1.137 2021/02/19 22:35:42 rillig Exp $");
+__RCSID("$NetBSD: decl.c,v 1.138 2021/02/22 15:09:50 rillig Exp $");
 #endif
 
 #include <sys/param.h>
@@ -2851,7 +2851,7 @@
 }
 
 /*
- * Checks size after declarations of variables and their initialisation.
+ * Checks size after declarations of variables and their initialization.
  */
 void
 check_size(sym_t *dsym)
diff -r b9add5808587 -r 4e6a80b1f4ba usr.bin/xlint/lint1/err.c
--- a/usr.bin/xlint/lint1/err.c Mon Feb 22 15:01:03 2021 +0000
+++ b/usr.bin/xlint/lint1/err.c Mon Feb 22 15:09:50 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: err.c,v 1.80 2021/02/21 10:28:33 rillig Exp $  */
+/*     $NetBSD: err.c,v 1.81 2021/02/22 15:09:50 rillig Exp $  */
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: err.c,v 1.80 2021/02/21 10:28:33 rillig Exp $");
+__RCSID("$NetBSD: err.c,v 1.81 2021/02/22 15:09:50 rillig Exp $");
 #endif
 
 #include <sys/types.h>
@@ -234,7 +234,7 @@
        "too many struct/union initializers",                         /* 172 */
        "too many array initializers, expected %d",                   /* 173 */
        "too many initializers",                                      /* 174 */
-       "initialisation of an incomplete type",                       /* 175 */
+       "initialization of an incomplete type",                       /* 175 */
        "invalid initializer type %s",                                /* 176 */
        "non-constant initializer",                                   /* 177 */
        "initializer does not fit",                                   /* 178 */
@@ -244,8 +244,8 @@
        "incompatible pointer types (%s != %s)",                      /* 182 */
        "illegal combination of %s (%s) and %s (%s)",                 /* 183 */
        "illegal pointer combination",                                /* 184 */
-       "initialisation type mismatch (%s) and (%s)",                 /* 185 */
-       "bit-field initialisation is illegal in traditional C",       /* 186 */
+       "initialization type mismatch (%s) and (%s)",                 /* 185 */
+       "bit-field initialization is illegal in traditional C",       /* 186 */
        "non-null byte ignored in string initializer",                /* 187 */
        "no automatic aggregate initialization in traditional C",     /* 188 */
        "",                     /* no longer used */                  /* 189 */
@@ -269,7 +269,7 @@
        "loop not entered at top",                                    /* 207 */
        "break outside loop or switch",                               /* 208 */
        "continue outside loop",                                      /* 209 */
-       "enum type mismatch between '%s' and '%s' in initialisation", /* 210 */
+       "enum type mismatch between '%s' and '%s' in initialization", /* 210 */
        "return value type mismatch (%s) and (%s)",                   /* 211 */
        "cannot return incomplete type",                              /* 212 */
        "void function %s cannot return value",                       /* 213 */
@@ -280,7 +280,7 @@
        "ANSI C treats constant as unsigned, op %s",                  /* 218 */
        "concatenated strings are illegal in traditional C",          /* 219 */
        "fallthrough on case statement",                              /* 220 */
-       "initialisation of unsigned with negative constant",          /* 221 */
+       "initialization of unsigned with negative constant",          /* 221 */
        "conversion of negative constant to unsigned type",           /* 222 */
        "end-of-loop code not reached",                               /* 223 */
        "cannot recover from previous errors",                        /* 224 */
@@ -297,7 +297,7 @@
        "enum %s never defined",                                      /* 235 */
        "static function %s unused",                                  /* 236 */
        "redeclaration of formal parameter %s",                       /* 237 */
-       "initialisation of union is illegal in traditional C",        /* 238 */
+       "initialization of union is illegal in traditional C",        /* 238 */
        "constant argument to NOT",                                   /* 239 */
        "assignment of different structures (%s != %s)",              /* 240 */
        "dubious operation on enum, op %s",                           /* 241 */
@@ -336,7 +336,7 @@
        "ANSI C forbids comparison of %s with %s",                    /* 274 */
        "cast discards 'const' from type '%s'",                       /* 275 */
        "__%s__ is illegal for type %s",                              /* 276 */
-       "initialisation of '%s' with '%s'",                           /* 277 */
+       "initialization of '%s' with '%s'",                           /* 277 */
        "combination of '%s' and '%s', arg #%d",                      /* 278 */
        "combination of '%s' and '%s' in return",                     /* 279 */
        "must be outside function: /* %s */",                         /* 280 */
diff -r b9add5808587 -r 4e6a80b1f4ba usr.bin/xlint/lint1/func.c
--- a/usr.bin/xlint/lint1/func.c        Mon Feb 22 15:01:03 2021 +0000
+++ b/usr.bin/xlint/lint1/func.c        Mon Feb 22 15:09:50 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: func.c,v 1.72 2021/02/21 09:17:55 rillig Exp $ */
+/*     $NetBSD: func.c,v 1.73 2021/02/22 15:09:50 rillig Exp $ */
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: func.c,v 1.72 2021/02/21 09:17:55 rillig Exp $");
+__RCSID("$NetBSD: func.c,v 1.73 2021/02/22 15:09:50 rillig Exp $");
 #endif
 
 #include <stdlib.h>
@@ -827,7 +827,7 @@
 {
 
        /*
-        * If there is no initialisation expression it is possible that
+        * If there is no initialization expression it is possible that
         * it is intended not to enter the loop at top.
         */
        if (tn1 != NULL && !reached) {
@@ -840,7 +840,7 @@
        cstmt->c_loop = true;
 
        /*
-        * Store the tree memory for the reinitialisation expression.
+        * Store the tree memory for the reinitialization expression.
         * Also remember this expression itself. We must check it at
         * the end of the loop to get "used but not set" warnings correct.
         */
@@ -860,7 +860,7 @@
        cstmt->c_infinite =
            tn2 == NULL || (tn2->tn_op == CON && is_nonzero(tn2));
 
-       /* Checking the reinitialisation expression is done in for2() */
+       /* Checking the reinitialization expression is done in for2() */
 
        reached = true;
 }
@@ -881,7 +881,7 @@
        cpos = curr_pos;
        cspos = csrc_pos;
 
-       /* Restore the tree memory for the reinitialisation expression */
+       /* Restore the tree memory for the reinitialization expression */
        trestor(cstmt->c_fexprm);



Home | Main Index | Thread Index | Old Index