Changeset 152

Timestamp:

1999-02-08T14:26:11+13:00 (25 years ago)

Author:

rjmcnab

Message:

Improved the error reporting.

File:

• trunk/gsdl/lib/display.cpp (modified) (5 diffs)

trunk/gsdl/lib/display.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.7  1999/02/08 01:26:11  rjmcnab
+
+   Improved the error reporting.
+
    Revision 1.6  1999/01/19 08:30:23  rjmcnab
 
@@ -752 +756 @@
         }
 
-      if (!err && c == '_') 
-        {
-          c = my_get(fin, line); // skip the _
-
-          // skip all white space
-          while (!fin.eof() && my_isspace(c)) c = my_get(fin, line);
-        } 
-      else err = 1;
+      if (!err && c == '_') {
+        c = my_get(fin, line); // skip the _
+        
+        // skip all white space
+        while (!fin.eof() && my_isspace(c)) c = my_get(fin, line);
+      } else if (!err) err = 1;
 
       // get the macro parameters (optional)
@@ -779 +781 @@
           while (!fin.eof() && my_isspace(c)) c = my_get(fin, line);
         } 
-          else err = 2;
+          else if (!err) err = 2;
         }
 
@@ -833 +835 @@
       
           err = 0; // for the test below
-        } 
-          else err = 3;
-        } 
-      else err = 4;
+        }
+          else if (!err) err = 3;
+        }
+      else if (!err) err = 4;
 
       if (err) 
@@ -842 +844 @@
           // found an error, skip to the end of the line
           if (logout != NULL) {
-        (*logout) << text_t2ascii << "Err: Unexpected input on line ";
-        (*logout) << line;
-        (*logout) << text_t2ascii << " (";
-        (*logout) << err;
-        (*logout) << text_t2ascii << ")\n";
+        (*logout) << text_t2ascii << "Error: ";
+        if (err == 1) (*logout) << text_t2ascii << "'_'";
+        else if (err == 2) (*logout) << text_t2ascii << "']'";
+        else if (err == 3) (*logout) << text_t2ascii << "'}'";
+        else if (err == 4) (*logout) << text_t2ascii << "'{'";
+        (*logout) << text_t2ascii << " expected on line ";
+        (*logout) << line ;
+        (*logout) << text_t2ascii << " of " << thisfilename << "\n";
           }
           while (!fin.eof ())