Merge pull request #238 from 9rnsr/improve_unformat

Improve error message
dlang · Sep 5, 2011 · 528a690 · 528a690
2 parents 1843f44 + 8e41c85
commit 528a690
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/std/conv.d b/std/conv.d
@@ -2765,26 +2765,34 @@ Target parse(Target, Source)(ref Source s, dchar lbracket = '[', dchar rbracket
     if (s.front == rbracket)
     {
         if (result.length != 0)
-            parseError("Need more input");
+            goto Lmanyerr;
         s.popFront();
         return result;
     }
     for (size_t i = 0; ; s.popFront(), skipWS(s))
     {
         if (i == result.length)
-            parseError("Too many input");
+            goto Lmanyerr;
         result[i++] = parseElement!(ElementType!Target)(s);
         skipWS(s);
         if (s.front != comma)
         {
             if (i != result.length)
-                parseError("Need more input");
+                goto Lfewerr;
             break;
         }
     }
     parseCheck!s(rbracket);
 
     return result;
+
+Lmanyerr:
+    parseError(text("Too many elements in input, ", result.length, " elements expected."));
+    assert(0);
+
+Lfewerr:
+    parseError(text("Too few elements in input, ", result.length, " elements expected."));
+    assert(0);
 }
 
 unittest