Remove comments that are obsolete now that the code is goto-less.

diff --git a/TODO b/TODO
index 58197760316e0d4f749b41d3cb1b71959e6879f0..429052847b5b7b9b703d39e4cb1d8fc4330caf30 100644 (file)
--- a/TODO
+++ b/TODO
@@ -3,8 +3,6 @@
 The FORTRANish mess that once was is now mostly idiomatic C. Some issues
 remain to be cleaned up:
 
 The FORTRANish mess that once was is now mostly idiomatic C. Some issues
 remain to be cleaned up:
 

-* Remaining unstructured gotos in do_command().
-

 * The program is still pretty much typeless. Some attempt has been
   made to introduce semantic types, but the job is barely started.
 
 * The program is still pretty much typeless. Some attempt has been
   made to introduce semantic types, but the job is barely started.
 

diff --git a/main.c b/main.c
index f9fb116a1034bbd1f6a3f7d85c2d79e30d9bde60..dc879a137dfef7932f65977801de6989c8882065 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,17 +1,4 @@
 /*
 /*

- * There used to be a note that said this:
- *
- * The author - Don Woods - apologises for the style of the code; it
- * is a result of running the original Fortran IV source through a
- * home-brew Fortran-to-C converter.
- *
- * Now that the code has been restructured into something much closer
- * to idiomatic C, the following is more appropriate:
- *
- * ESR apologizes for the remaing gotos (now confined to one function
- * in this file - there used to be over 350 of them, *everywhere*).
- * Applying the Structured Program Theorem can be hard.
- *

  * Copyright (c) 1977, 2005 by Will Crowther and Don Woods
  * Copyright (c) 2017 by Eric S. Raymond
  * SPDX-License-Identifier: BSD-2-clause
  * Copyright (c) 1977, 2005 by Will Crowther and Don Woods
  * Copyright (c) 2017 by Eric S. Raymond
  * SPDX-License-Identifier: BSD-2-clause

diff --git a/notes.adoc b/notes.adoc
index 538de28a347624f318044db3112df091b311de7a..8838393054e37fdadbda049dee027b7b1cc62bb9 100644 (file)
--- a/notes.adoc
+++ b/notes.adoc
@@ -13,7 +13,7 @@ the game; Jason signed on early in the process to help. The assistance
 of Peje Nilsson in restructuring some particularly grotty gotos is
 gratefully acknowledged. Petr Voropaev contributed fuzz testing and
 code cleanups. Aaron Traas did a lot of painstaking work to improve
 of Peje Nilsson in restructuring some particularly grotty gotos is
 gratefully acknowledged. Petr Voropaev contributed fuzz testing and
 code cleanups. Aaron Traas did a lot of painstaking work to improve

-test coverage.
+test coverage, and factored out the last handful of gotos.

 
 == Nomenclature ==
 
 
 == Nomenclature ==
 


@@ -155,10 +155,6 @@ ways:
   and the choice to refrain will make forward translation into future
   languages easier.
 
   and the choice to refrain will make forward translation into future
   languages easier.
 

-* There are a few gotos left that resist restructuring; all are in the
-  principal command interpreter function implementing its state
-  machine.
-

 * Linked lists (for objects at a location) are implemented using an array
   of link indices. This is a surviving FORTRANism that is quite unlike
   normal practice in C or any more modern language.  We have not tried
 * Linked lists (for objects at a location) are implemented using an array
   of link indices. This is a surviving FORTRANism that is quite unlike
   normal practice in C or any more modern language.  We have not tried