1 files changed, 93 insertions, 15 deletions
diff --git a/gcc/m2/gm2-compiler/M2Error.mod b/gcc/m2/gm2-compiler/M2Error.mod
index 561f42c..095e732 100644
--- a/gcc/m2/gm2-compiler/M2Error.mod
+++ b/gcc/m2/gm2-compiler/M2Error.mod
@@ -369,8 +369,8 @@ PROCEDURE WriteFormat3 (a: ARRAY OF CHAR; w1, w2, w3: ARRAY OF BYTE) ;
 VAR
    e: Error ;
 BEGIN
-   e := NewError(GetTokenNo()) ;
-   e^.s := DoFormat3(a, w1, w2, w3)
+   e := NewError (GetTokenNo ()) ;
+   e^.s := DoFormat3 (a, w1, w2, w3)
 END WriteFormat3 ;
 
 
@@ -394,7 +394,7 @@ END MoveError ;
 
 PROCEDURE NewError (AtTokenNo: CARDINAL) : Error ;
 VAR
-   e, f: Error ;
+   e: Error ;
 BEGIN
    IF AtTokenNo = UnknownTokenNo
    THEN
@@ -414,18 +414,7 @@ BEGIN
    END ;
    (* Assert (scopeKind # noscope) ;  *)
    e^.scope := currentScope ;
-   IF (head=NIL) OR (head^.token>AtTokenNo)
-   THEN
-      e^.next := head ;
-      head    := e
-   ELSE
-      f := head ;
-      WHILE (f^.next#NIL) AND (f^.next^.token<AtTokenNo) DO
-         f := f^.next
-      END ;
-      e^.next := f^.next ;
-      f^.next := e
-   END ;
+   AddToList (e) ;
    RETURN( e )
 END NewError ;
 
@@ -463,6 +452,95 @@ END NewNote ;
 
 
 (*
+   AddToList - adds error e to the list of errors in token order.
+*)
+
+PROCEDURE AddToList (e: Error) ;
+VAR
+   f: Error ;
+BEGIN
+   IF (head=NIL) OR (head^.token > e^.token)
+   THEN
+      e^.next := head ;
+      head    := e
+   ELSE
+      f := head ;
+      WHILE (f^.next # NIL) AND (f^.next^.token < e^.token) DO
+         f := f^.next
+      END ;
+      e^.next := f^.next ;
+      f^.next := e
+   END ;
+END AddToList ;
+
+
+(*
+   SubFromList - remove e from the global list.
+*)
+
+PROCEDURE SubFromList (e: Error) ;
+VAR
+   f: Error ;
+BEGIN
+   IF head = e
+   THEN
+      head := head^.next
+   ELSE
+      f := head ;
+      WHILE (f # NIL) AND (f^.next # e) DO
+         f := f^.next
+      END ;
+      IF (f # NIL) AND (f^.next = e)
+      THEN
+         f^.next := e^.next
+      ELSE
+         InternalError ('expecting e to be on the global list')
+      END
+   END ;
+   DISPOSE (e)
+END SubFromList ;
+
+
+(*
+   WipeReferences - remove any reference to e from the global list.
+*)
+
+PROCEDURE WipeReferences (e: Error) ;
+VAR
+   f: Error ;
+BEGIN
+   f := head ;
+   WHILE f # NIL DO
+      IF f^.parent = e
+      THEN
+         f^.parent := NIL
+      END ;
+      IF f^.child = e
+      THEN
+         f^.child := NIL
+      END ;
+      f := f^.next
+   END
+END WipeReferences ;
+
+
+(*
+   KillError - remove error e from the error list and deallocate
+               memory associated with e.
+*)
+
+PROCEDURE KillError (VAR e: Error) ;
+BEGIN
+   IF head # NIL
+   THEN
+      SubFromList (e) ;
+      WipeReferences (e) ;
+      e := NIL
+   END
+END KillError ;
+
+
+(*
    ChainError - creates and returns a new error handle, this new error
                 is associated with, e, and is chained onto the end of, e.
                 If, e, is NIL then the result to NewError is returned.