wishing for tins

A couple of days ago when verifying the report about being forced to
pay for a second tin when eating one from a stack on a shop's floor,
wishing for 'tins' (rather than 'tins of foo meat') was repeatedly
producing tin wands instead.  The name "tin" and the wand description
"tin" in objects[] were being given 50:50 chance for either one by
the 3.6.1 wishing code.  Wishing for "tins of spinach" also gave me
a tin wand on the first attempt.  Handle 'tin(s)' more explicitly.

This also does some reformatting.

doc/fixes36.1

@@ -454,6 +454,7 @@ attempting to name an item as an artifact and failing via hand slip violates
 	illiterate conduct
 crashes for 'A' above were downgraded to impossible "cursed without otmp"
 wizhelp: ^O is #overview in wizard mode too; #wizwhere shows dungeon layout
+wishing for tins sometimes yielded a tin wand
 
 
 Platform- and/or Interface-Specific Fixes

src/objnam.c

@@ -2010,10 +2010,14 @@ char *str;
     return 0;
 }
 
-/* Plural routine; chiefly used for user-defined fruits.  We have to try to
+/* Plural routine; once upon a time it may have been chiefly used for
- * account for everything reasonable the player has; something unreasonable
+ * user-defined fruits, but it is now used extensively throughout the
- * can still break the code.  However, it's still a lot more accurate than
+ * program.
- * "just add an s at the end", which Rogue uses...
+ *
+ * For fruit, we have to try to account for everything reasonable the
+ * player has; something unreasonable can still break the code.
+ * However, it's still a lot more accurate than "just add an 's' at the
+ * end", which Rogue uses...
  *
  * Also used for plural monster names ("Wiped out all homunculi." or the
  * vanquished monsters list) and body parts.  A lot of unique monsters have
@@ -2847,9 +2851,14 @@ struct obj *no_wish;
         if (!strstri(bp, "wand ") && !strstri(bp, "spellbook ")
             && !strstri(bp, "finger ")) {
             if ((p = strstri(bp, "tin of ")) != 0) {
-                tmp = tin_variety_txt(p + 7, &tinv);
+                if (!strcmpi(p + 7, "spinach")) {
-                tvariety = tinv;
+                    contents = SPINACH;
-                mntmp = name_to_mon(p + 7 + tmp);
+                    mntmp = NON_PM;
+                } else {
+                    tmp = tin_variety_txt(p + 7, &tinv);
+                    tvariety = tinv;
+                    mntmp = name_to_mon(p + 7 + tmp);
+                }
                 typ = TIN;
                 goto typfnd;
             } else if ((p = strstri(bp, " of ")) != 0
@@ -2858,35 +2867,32 @@ struct obj *no_wish;
         }
     }
     /* Find corpse type w/o "of" (red dragon scale mail, yeti corpse) */
-    if (strncmpi(bp, "samurai sword", 13))   /* not the "samurai" monster! */
+    if (strncmpi(bp, "samurai sword", 13)  /* not the "samurai" monster! */
-        if (strncmpi(bp, "wizard lock", 11)) /* not the "wizard" monster! */
+        && strncmpi(bp, "wizard lock", 11) /* not the "wizard" monster! */
-            if (strncmpi(bp, "ninja-to", 8)) /* not the "ninja" rank */
+        && strncmpi(bp, "ninja-to", 8)     /* not the "ninja" rank */
-                if (strncmpi(bp, "master key",
+        && strncmpi(bp, "master key", 10)  /* not the "master" rank */
-                             10)) /* not the "master" rank */
+        && strncmpi(bp, "magenta", 7)) {   /* not the "mage" rank */
-                    if (strncmpi(bp, "magenta", 7)) /* not the "mage" rank */
+        if (mntmp < LOW_PM && strlen(bp) > 2
-                        if (mntmp < LOW_PM && strlen(bp) > 2
+            && (mntmp = name_to_mon(bp)) >= LOW_PM) {
-                            && (mntmp = name_to_mon(bp)) >= LOW_PM) {
+            int mntmptoo, mntmplen; /* double check for rank title */
-                            int mntmptoo,
+            char *obp = bp;
-                                mntmplen; /* double check for rank title */
+
-                            char *obp = bp;
+            mntmptoo = title_to_mon(bp, (int *) 0, &mntmplen);
-                            mntmptoo = title_to_mon(bp, (int *) 0, &mntmplen);
+            bp += (mntmp != mntmptoo) ? (int) strlen(mons[mntmp].mname)
-                            bp += mntmp != mntmptoo
-                                      ? (int) strlen(mons[mntmp].mname)
                                       : mntmplen;
-                            if (*bp == ' ')
+            if (*bp == ' ') {
-                                bp++;
+                bp++;
-                            else if (!strncmpi(bp, "s ", 2))
+            } else if (!strncmpi(bp, "s ", 2)) {
-                                bp += 2;
+                bp += 2;
-                            else if (!strncmpi(bp, "es ", 3))
+            } else if (!strncmpi(bp, "es ", 3)) {
-                                bp += 3;
+                bp += 3;
-                            else if (!*bp && !actualn && !dn && !un
+            } else if (!*bp && !actualn && !dn && !un && !oclass) {
-                                     && !oclass) {
+                /* no referent; they don't really mean a monster type */
-                                /* no referent; they don't really mean a
+                bp = obp;
-                                 * monster type */
+                mntmp = NON_PM;
-                                bp = obp;
+            }
-                                mntmp = NON_PM;
+        }
-                            }
+    }
-                        }
 
     /* first change to singular if necessary */
     if (*bp) {
@@ -2952,7 +2958,8 @@ struct obj *no_wish;
      * gold/money concept.  Maybe we want to add other monetary units as
      * well in the future. (TH)
      */
-    if (!BSTRCMPI(bp, p - 10, "gold piece") || !BSTRCMPI(bp, p - 7, "zorkmid")
+    if (!BSTRCMPI(bp, p - 10, "gold piece")
+        || !BSTRCMPI(bp, p - 7, "zorkmid")
         || !strcmpi(bp, "gold") || !strcmpi(bp, "money")
         || !strcmpi(bp, "coin") || *bp == GOLD_SYM) {
         if (cnt > 5000 && !wizard)
@@ -2975,15 +2982,19 @@ struct obj *no_wish;
 
     /* Search for class names: XXXXX potion, scroll of XXXXX.  Avoid */
     /* false hits on, e.g., rings for "ring mail". */
-    if (strncmpi(bp, "enchant ", 8) && strncmpi(bp, "destroy ", 8)
+    if (strncmpi(bp, "enchant ", 8)
+        && strncmpi(bp, "destroy ", 8)
         && strncmpi(bp, "detect food", 11)
-        && strncmpi(bp, "food detection", 14) && strncmpi(bp, "ring mail", 9)
+        && strncmpi(bp, "food detection", 14)
+        && strncmpi(bp, "ring mail", 9)
         && strncmpi(bp, "studded leather armor", 21)
         && strncmpi(bp, "leather armor", 13)
-        && strncmpi(bp, "tooled horn", 11) && strncmpi(bp, "food ration", 11)
+        && strncmpi(bp, "tooled horn", 11)
+        && strncmpi(bp, "food ration", 11)
         && strncmpi(bp, "meat ring", 9))
         for (i = 0; i < (int) (sizeof wrpsym); i++) {
             register int j = strlen(wrp[i]);
+
             if (!strncmpi(bp, wrp[i], j)) {
                 oclass = wrpsym[i];
                 if (oclass != AMULET_CLASS) {
@@ -3099,11 +3110,17 @@ srch:
         for (i = bases[GEM_CLASS]; i <= LAST_GEM; i++) {
             register const char *zn;
 
-            if ((zn = OBJ_NAME(objects[i])) && !strcmpi(actualn, zn)) {
+            if ((zn = OBJ_NAME(objects[i])) != 0 && !strcmpi(actualn, zn)) {
                 typ = i;
                 goto typfnd;
             }
         }
+        /* "tin of foo" would be caught above, but plain "tin" has
+           a random chance of yielding "tin wand" unless we do this */
+        if (!strcmpi(actualn, "tin")) {
+            typ = TIN;
+            goto typfnd;
+        }
     }
 
     if (((typ = rnd_otyp_by_namedesc(actualn, oclass)) != STRANGE_OBJECT)