Mercurial > projects > dil

changeset 342:f13d551d7c4f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- Added error messages MID.InContract and MID.OutContract.
author aziz
date Thu, 23 Aug 2007 12:14:02 +0000
parents 3ac651ea83fb
children 95f1b6e43214
files trunk/src/dil/Messages.d trunk/src/dil/Parser.d trunk/src/lang_de.d trunk/src/lang_en.d trunk/src/lang_tr.d
diffstat 5 files changed, 14 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/trunk/src/dil/Messages.d	Wed Aug 22 20:13:00 2007 +0000
+++ b/trunk/src/dil/Messages.d	Thu Aug 23 12:14:02 2007 +0000
@@ -58,6 +58,8 @@
   ExpectedButFound,
   RedundantStorageClass,
   TemplateTupleParameter,
+  InContract,
+  OutContract,
 
   // Help messages:
   HelpMain,
--- a/trunk/src/dil/Parser.d	Wed Aug 22 20:13:00 2007 +0000
+++ b/trunk/src/dil/Parser.d	Thu Aug 23 12:14:02 2007 +0000
@@ -505,14 +505,14 @@
         nT();
         break;
       case T.In:
-        //if (func.inBody)
-          // TODO: issue error msg.
+        if (func.inBody)
+          error(MID.InContract);
         nT();
         func.inBody = parseStatements();
         continue;
       case T.Out:
-        //if (func.outBody)
-          // TODO: issue error msg.
+        if (func.outBody)
+          error(MID.OutContract);
         nT();
         if (token.type == T.LParen)
         {
@@ -528,7 +528,7 @@
       default:
         error(MID.ExpectedButFound, "FunctionBody", token.srcText);
       }
-      break; // exit while loop
+      break; // Exit loop.
     }
     set(func, begin);
     func.finishConstruction();
@@ -4015,7 +4015,7 @@
           nT(); // Skip Identifier.
           nT(); // Skip Ellipses.
           if (token.type == T.Comma)
-            error(MID.TemplateTupleParameter); // TODO: issue error msg for variadic param not being last.
+            error(MID.TemplateTupleParameter);
           tp = new TemplateTupleParameter(ident);
           break;
         case T.Comma, T.RParen, T.Colon, T.Assign:
--- a/trunk/src/lang_de.d	Wed Aug 22 20:13:00 2007 +0000
+++ b/trunk/src/lang_de.d	Thu Aug 23 12:14:02 2007 +0000
@@ -53,6 +53,8 @@
   "erwartete '{1}', fand aber '{2}'.",
   "'{1}' ist redundant.",
   "Template-Tupel-Parameter dürfen nur am Ende auftreten.",
+  "der 'in'-Vertrag der Funktion wurde bereits geparsed.",
+  "der 'out'-Vertrag der Funktion wurde bereits geparsed.",
 
   // Help messages:
   `dil v{1}
--- a/trunk/src/lang_en.d	Wed Aug 22 20:13:00 2007 +0000
+++ b/trunk/src/lang_en.d	Thu Aug 23 12:14:02 2007 +0000
@@ -53,6 +53,8 @@
   "expected '{1}', but found '{2}'.",
   "'{1}' is redundant.",
   "template tuple parameters can only be last.",
+  "the functions 'in' contract was already parsed.",
+  "the functions 'out' contract was already parsed.",
 
   // Help messages:
   `dil v{1}
--- a/trunk/src/lang_tr.d	Wed Aug 22 20:13:00 2007 +0000
+++ b/trunk/src/lang_tr.d	Thu Aug 23 12:14:02 2007 +0000
@@ -53,6 +53,8 @@
   "'{1}' beklendi, ama '{2}' bulundu.",
   "'{1}' lüzumsuz.",
   "şablon tuple parametre son sırada olmalı.",
+  "fonksiyonun 'in' kontratı daha önceden ayrıştırılmış.",
+  "fonksiyonun 'out' kontratı daha önceden ayrıştırılmış.",
 
   // Help messages:
   `dil v{1}