codetools: improved message when string expected at end of source

git-svn-id: trunk@29231 -
This commit is contained in:
mattias 2011-01-28 09:00:05 +00:00
parent 03b8af4c0f
commit fa0cc49336
21 changed files with 82 additions and 1 deletions

View File

@ -55,6 +55,7 @@ ResourceString
ctsIdentExpectedButAtomFound = 'identifier expected, but %s found';
ctsIdentExpectedButKeyWordFound = 'identifier expected, but keyword %s found';
ctsStrExpectedButAtomFound = '%s expected, but %s found';
ctsEndOfFile = 'end of file';
ctsPositionNotInSource = 'Position not in source';
ctsInvalidClassName = 'invalid class name=%s%s%s';
ctsSourceOfUnitNotFound = 'source of unit not found: %s';

View File

@ -261,6 +261,10 @@ msgstr "No s'ha trobat \"end\" per class/object"
msgid "end for record not found"
msgstr "no s'ha trobat el final del registre"
#: codetoolsstrconsts.ctsendoffile
msgid "end of file"
msgstr ""
#: codetoolsstrconsts.ctsendofsourceexpectedbutatomfound
msgid "expected end., but %s found"
msgstr "esperava end., però s'ha trobat %s"

View File

@ -262,6 +262,10 @@ msgstr "\"end\" pro třídu/objekt nenalezen"
msgid "end for record not found"
msgstr "end pro record nenalezen"
#: codetoolsstrconsts.ctsendoffile
msgid "end of file"
msgstr ""
#: codetoolsstrconsts.ctsendofsourceexpectedbutatomfound
msgid "expected end., but %s found"
msgstr "očekáván end., ale nalezeno %s"

View File

@ -264,6 +264,10 @@ msgstr "\"end\" für Klasse/Objekt nicht gefunden"
msgid "end for record not found"
msgstr "End-Anweisung des Records nicht gefunden"
#: codetoolsstrconsts.ctsendoffile
msgid "end of file"
msgstr ""
#: codetoolsstrconsts.ctsendofsourceexpectedbutatomfound
msgid "expected end., but %s found"
msgstr "\"End.\" erwartet aber %s gefunden"

View File

@ -261,6 +261,10 @@ msgstr "\"end\" parar clase/objeto no encontrado"
msgid "end for record not found"
msgstr "final para registro no encontrado"
#: codetoolsstrconsts.ctsendoffile
msgid "end of file"
msgstr ""
#: codetoolsstrconsts.ctsendofsourceexpectedbutatomfound
msgid "expected end., but %s found"
msgstr "se esperaba end., pero se encontró %s"

View File

@ -260,6 +260,10 @@ msgstr "\"end\" parar clase/objeto no encontrado"
msgid "end for record not found"
msgstr "final para registro no encontrado"
#: codetoolsstrconsts.ctsendoffile
msgid "end of file"
msgstr ""
#: codetoolsstrconsts.ctsendofsourceexpectedbutatomfound
msgid "expected end., but %s found"
msgstr "se esperaba end., pero se encontró %s"

View File

@ -256,6 +256,10 @@ msgstr ""
msgid "end for record not found"
msgstr ""
#: codetoolsstrconsts.ctsendoffile
msgid "end of file"
msgstr ""
#: codetoolsstrconsts.ctsendofsourceexpectedbutatomfound
msgid "expected end., but %s found"
msgstr ""

View File

@ -262,6 +262,10 @@ msgstr "\"end\" de la classe/objet non trouvé"
msgid "end for record not found"
msgstr "end pour le record non trouvé"
#: codetoolsstrconsts.ctsendoffile
msgid "end of file"
msgstr ""
#: codetoolsstrconsts.ctsendofsourceexpectedbutatomfound
msgid "expected end., but %s found"
msgstr "end. attendu , mais %s trouvé"

View File

@ -261,6 +261,10 @@ msgstr "לא נמצא end למחלקה/לאובייקט"
msgid "end for record not found"
msgstr "סוף הרשומה לא נמצא"
#: codetoolsstrconsts.ctsendoffile
msgid "end of file"
msgstr ""
#: codetoolsstrconsts.ctsendofsourceexpectedbutatomfound
msgid "expected end., but %s found"
msgstr "צפוי .end אבל s% נמצא"

View File

@ -262,6 +262,10 @@ msgstr "\"end\" untuk class/object tidak ditemukan"
msgid "end for record not found"
msgstr "akhir untuk record tidak ditemukan"
#: codetoolsstrconsts.ctsendoffile
msgid "end of file"
msgstr ""
#: codetoolsstrconsts.ctsendofsourceexpectedbutatomfound
msgid "expected end., but %s found"
msgstr "diharapkan end, tapi %s ditemukan"

View File

@ -260,6 +260,10 @@ msgstr "non è stato trovato il comando \"end\" per la classe/oggetto"
msgid "end for record not found"
msgstr "fine record non trovata"
#: codetoolsstrconsts.ctsendoffile
msgid "end of file"
msgstr ""
#: codetoolsstrconsts.ctsendofsourceexpectedbutatomfound
msgid "expected end., but %s found"
msgstr "era previsto end. invece è stato trovato %s"

View File

@ -263,6 +263,10 @@ msgstr "Nerastas klasės/objekto „end“"
msgid "end for record not found"
msgstr "nerasta įrašo pabaiga"
#: codetoolsstrconsts.ctsendoffile
msgid "end of file"
msgstr ""
#: codetoolsstrconsts.ctsendofsourceexpectedbutatomfound
msgid "expected end., but %s found"
msgstr "tikėtasi „end.“, tačiau aptikta %s"

View File

@ -261,6 +261,10 @@ msgstr ""
msgid "end for record not found"
msgstr ""
#: codetoolsstrconsts.ctsendoffile
msgid "end of file"
msgstr ""
#: codetoolsstrconsts.ctsendofsourceexpectedbutatomfound
msgid "expected end., but %s found"
msgstr ""

View File

@ -261,6 +261,10 @@ msgstr "\"end\" para classe/objeto não encontrado"
msgid "end for record not found"
msgstr "final do registro não encontrado"
#: codetoolsstrconsts.ctsendoffile
msgid "end of file"
msgstr ""
#: codetoolsstrconsts.ctsendofsourceexpectedbutatomfound
msgid "expected end., but %s found"
msgstr "esperado \"end.\", mas %s encontrado"

View File

@ -265,6 +265,10 @@ msgstr "brakuje \"end\" dla klasy/obiektu"
msgid "end for record not found"
msgstr "nie znaleziono końca (end) rekordu"
#: codetoolsstrconsts.ctsendoffile
msgid "end of file"
msgstr ""
#: codetoolsstrconsts.ctsendofsourceexpectedbutatomfound
msgid "expected end., but %s found"
msgstr "zamiast końca programu \"end.\" znaleziono %s"

View File

@ -256,6 +256,10 @@ msgstr ""
msgid "end for record not found"
msgstr ""
#: codetoolsstrconsts.ctsendoffile
msgid "end of file"
msgstr ""
#: codetoolsstrconsts.ctsendofsourceexpectedbutatomfound
msgid "expected end., but %s found"
msgstr ""

View File

@ -261,6 +261,10 @@ msgstr "не найдено \"end\" для класса/объекта"
msgid "end for record not found"
msgstr "конец записи не найден"
#: codetoolsstrconsts.ctsendoffile
msgid "end of file"
msgstr ""
#: codetoolsstrconsts.ctsendofsourceexpectedbutatomfound
msgid "expected end., but %s found"
msgstr "ожидается end., но найдено %s"

View File

@ -262,6 +262,10 @@ msgstr ""
msgid "end for record not found"
msgstr ""
#: codetoolsstrconsts.ctsendoffile
msgid "end of file"
msgstr ""
#: codetoolsstrconsts.ctsendofsourceexpectedbutatomfound
msgid "expected end., but %s found"
msgstr ""

View File

@ -256,6 +256,10 @@ msgstr "не знайдений \"end\" для класу/об'єкту"
msgid "end for record not found"
msgstr "не знайдений кінець запису"
#: codetoolsstrconsts.ctsendoffile
msgid "end of file"
msgstr ""
#: codetoolsstrconsts.ctsendofsourceexpectedbutatomfound
msgid "expected end., but %s found"
msgstr "очікується end., а знайдено %s"

View File

@ -264,6 +264,10 @@ msgstr "未找到类/对象的 \"end\" "
msgid "end for record not found"
msgstr "未找到记录结尾"
#: codetoolsstrconsts.ctsendoffile
msgid "end of file"
msgstr ""
#: codetoolsstrconsts.ctsendofsourceexpectedbutatomfound
msgid "expected end., but %s found"
msgstr "本应该出现 end., 但是找到 %s "

View File

@ -4498,8 +4498,12 @@ begin
end;
procedure TPascalParserTool.RaiseStringExpectedButAtomFound(const s: string);
var
a: String;
begin
SaveRaiseExceptionFmt(ctsStrExpectedButAtomFound,[s,GetAtom]);
a:=GetAtom;
if a='' then a:=ctsEndOfFile;
SaveRaiseExceptionFmt(ctsStrExpectedButAtomFound,[s,a]);
end;
procedure TPascalParserTool.RaiseUnexpectedKeyWord;