Mercurial > projects > dil

changeset 387:ad0cbd1c8881

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Undefined escape sequences are passed to error() now. Added '{1}' to localized compiler messages. Marked Finnish message with TODO.
author Aziz K?ksal <aziz.koeksal@gmail.com>
date Wed, 12 Sep 2007 12:04:21 +0200
parents 392a0068fc61
children ae154eceba65
files trunk/src/dil/Lexer.d trunk/src/lang_de.d trunk/src/lang_en.d trunk/src/lang_fi.d trunk/src/lang_tr.d
diffstat 5 files changed, 8 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/trunk/src/dil/Lexer.d	Tue Sep 11 23:09:27 2007 +0200
+++ b/trunk/src/dil/Lexer.d	Wed Sep 12 12:04:21 2007 +0200
@@ -1245,18 +1245,15 @@
       }
       else
       {
-        // TODO: add parameter to localized strings
         dchar d = *p;
         char[] str = `\`;
         if (d & 128)
-        {
-          d = decodeUTF8();
-          encodeUTF8(str, d);
-          ++p;
-        }
+          encodeUTF8(str, decodeUTF8());
         else
           str ~= d;
-        error(MID.UndefinedEscapeSequence/+, str+/);
+        ++p;
+        // TODO: check for unprintable character?
+        error(MID.UndefinedEscapeSequence, str);
       }
     }
 
--- a/trunk/src/lang_de.d	Tue Sep 11 23:09:27 2007 +0200
+++ b/trunk/src/lang_de.d	Wed Sep 12 12:04:21 2007 +0200
@@ -31,7 +31,7 @@
   "unterminierte rohe Zeichenkette.",
   "unterminierte Backquote-Zeichenkette.",
   // \x \u \U
-  "undefinierte Escapesequenz gefunden.",
+  "undefinierte Escapesequenz '{1}' gefunden.",
   "unzureichende Anzahl von Hexziffern in Escapesequenz.",
   // \&[a-zA-Z][a-zA-Z0-9]+;
   "undefinierte HTML-Entität '{1}'",
--- a/trunk/src/lang_en.d	Tue Sep 11 23:09:27 2007 +0200
+++ b/trunk/src/lang_en.d	Wed Sep 12 12:04:21 2007 +0200
@@ -31,7 +31,7 @@
   "unterminated raw string.",
   "unterminated back quote string.",
   // \x \u \U
-  "found undefined escape sequence.",
+  "found undefined escape sequence '{1}'.",
   "insufficient number of hex digits in escape sequence.",
   // \&[a-zA-Z][a-zA-Z0-9]+;
   "undefined HTML entity '{1}'",
--- a/trunk/src/lang_fi.d	Tue Sep 11 23:09:27 2007 +0200
+++ b/trunk/src/lang_fi.d	Wed Sep 12 12:04:21 2007 +0200
@@ -31,7 +31,7 @@
   "päättämätön raakamerkkijono.",
   "päättämätön gravisaksenttimerkkijono.",
   // \x \u \U
-  "löydettiin määrittelemätön escape-sekvenssi.",
+  "löydettiin määrittelemätön escape-sekvenssi.", // TODO: Insert '{1}'
   "riittämätön määrä heksanumeroita escape-sekvenssissä.",
   // \&[a-zA-Z][a-zA-Z0-9]+;
   "määrittelemätön HTML-entiteetti '{1}'",
--- a/trunk/src/lang_tr.d	Tue Sep 11 23:09:27 2007 +0200
+++ b/trunk/src/lang_tr.d	Wed Sep 12 12:04:21 2007 +0200
@@ -31,7 +31,7 @@
   "kapanmamış çiğ dizgisi.",
   "kapanmamış ters tırnak dizgisi.",
   // \x \u \U
-  "tanımlanmamış çıkış serisi bulundu.",
+  "tanımlanmamış çıkış serisi '{1}' bulundu.",
   "heksadesimal çıkış serisi sayıları yeterli değil.",
   // \&[a-zA-Z][a-zA-Z0-9]+;
   "tanımlanmamış HTML varlık '{1}'",