codetools: fixed reparsing on changed module name

git-svn-id: branches/fixes_1_8@56013 -
This commit is contained in:
mattias 2017-10-10 09:18:37 +00:00
parent d0280a2c8f
commit d3cb939a9c
21 changed files with 85 additions and 84 deletions

View File

@ -99,7 +99,7 @@ ResourceString
ctsConstant = 'constant';
ctsSemicolonAfterPropSpecMissing =
'; expected after "%s" property specifier, but %s found';
ctsUnknownSectionKeyword = 'unknown section keyword %s found';
ctsUnexpectedSectionKeyword = 'unexpected section keyword %s found';
ctsIllegalQualifier = 'illegal qualifier %s found';
ctsMethodSignatureSNotFoundInClass = 'Method signature %s not found in class';
ctsUnexpectedEndOfSource = 'unexpected end of source';

View File

@ -865,6 +865,10 @@ msgstr "paraula clau \"%S\" no esperada a begin..end"
msgid "unexpected keyword \"%s\" found while reading blocks backwards"
msgstr "s'ha trobat la paraula clau \"%S\" mentre es llegia blocs enrera"
#: codetoolsstrconsts.ctsunexpectedsectionkeyword
msgid "unexpected section keyword %s found"
msgstr ""
#: codetoolsstrconsts.ctsunexpectedsubrangeoperatorfound
msgid "unexpected subrange operator '..' found"
msgstr "s'ha trobat operador de sotabast '..' no esperat"
@ -885,10 +889,6 @@ msgstr "Funció desconeguda %s"
msgid "(unknown mainfilename)"
msgstr "(Nom del fitxer principal desconegut)"
#: codetoolsstrconsts.ctsunknownsectionkeyword
msgid "unknown section keyword %s found"
msgstr "s'ha trobat paraula clau de secció %s desconeguda"
#: codetoolsstrconsts.ctsunknownsubdescriptor
msgid "(unknown subdescriptor %s)"
msgstr "(subdescriptor desconegut %s)"

View File

@ -865,6 +865,10 @@ msgstr "nalezeno neočekávané klíčové slovo \"%s\" v begin..end"
msgid "unexpected keyword \"%s\" found while reading blocks backwards"
msgstr "nalezeno neočekávané klíčové slovo \"%s\" při zpětném čtení bloků"
#: codetoolsstrconsts.ctsunexpectedsectionkeyword
msgid "unexpected section keyword %s found"
msgstr ""
#: codetoolsstrconsts.ctsunexpectedsubrangeoperatorfound
msgid "unexpected subrange operator '..' found"
msgstr "nalezen neočekávaný podrozsahový oprátor '...'"
@ -885,10 +889,6 @@ msgstr "Neznámá funkce %s"
msgid "(unknown mainfilename)"
msgstr "(neznámé jméno hlavního souboru)"
#: codetoolsstrconsts.ctsunknownsectionkeyword
msgid "unknown section keyword %s found"
msgstr "nalezeno neznámé klíčové slovo sekce %s"
#: codetoolsstrconsts.ctsunknownsubdescriptor
msgid "(unknown subdescriptor %s)"
msgstr "(neznámý podpopisovač %s)"

View File

@ -852,6 +852,10 @@ msgstr "unerwartetes Schlüsselwort \"%s\" in Begin..End gefunden"
msgid "unexpected keyword \"%s\" found while reading blocks backwards"
msgstr "unerwartetes Schlüsselwort \"%s\" beim Rückwärtslesen der Blocks gefunden"
#: codetoolsstrconsts.ctsunexpectedsectionkeyword
msgid "unexpected section keyword %s found"
msgstr ""
#: codetoolsstrconsts.ctsunexpectedsubrangeoperatorfound
msgid "unexpected subrange operator '..' found"
msgstr "ungültigen Unterbereichsoperator '..' gefunden"
@ -872,10 +876,6 @@ msgstr "Unbekannte Funktion %s"
msgid "(unknown mainfilename)"
msgstr "(unbekannter Hauptdateiname)"
#: codetoolsstrconsts.ctsunknownsectionkeyword
msgid "unknown section keyword %s found"
msgstr "ungültiges Bereichsschlüsselwort %s gefunden"
#: codetoolsstrconsts.ctsunknownsubdescriptor
msgid "(unknown subdescriptor %s)"
msgstr "(unbekannter Subdescriptor %s)"

View File

@ -849,6 +849,10 @@ msgstr "se encontró palabra reservada inesperada \"%s\" en begin..end"
msgid "unexpected keyword \"%s\" found while reading blocks backwards"
msgstr "se encontró palabra clave inesperada \"%s\" mientras se leían bloques hacia atrás"
#: codetoolsstrconsts.ctsunexpectedsectionkeyword
msgid "unexpected section keyword %s found"
msgstr ""
#: codetoolsstrconsts.ctsunexpectedsubrangeoperatorfound
msgid "unexpected subrange operator '..' found"
msgstr "se encontró operador de subrango '..' inesperado"
@ -869,10 +873,6 @@ msgstr "Función desconocida %s"
msgid "(unknown mainfilename)"
msgstr "(nombre de archivo principal desconocido)"
#: codetoolsstrconsts.ctsunknownsectionkeyword
msgid "unknown section keyword %s found"
msgstr "palabra clave de sección desconocida %s encontrada"
#: codetoolsstrconsts.ctsunknownsubdescriptor
msgid "(unknown subdescriptor %s)"
msgstr "(subdescriptor desconocido %s)"

View File

@ -844,6 +844,10 @@ msgstr "odottamaton avainsana \"%s\" löydettiin begin..end sisällä"
msgid "unexpected keyword \"%s\" found while reading blocks backwards"
msgstr "odottamaton avainsana \"%s\" löydettiin kun lohkoja luettiin taaksepäin"
#: codetoolsstrconsts.ctsunexpectedsectionkeyword
msgid "unexpected section keyword %s found"
msgstr ""
#: codetoolsstrconsts.ctsunexpectedsubrangeoperatorfound
msgid "unexpected subrange operator '..' found"
msgstr "odottamaton osaväli operaattori '..' löytyi"
@ -864,10 +868,6 @@ msgstr "Tuntematon funktio %s"
msgid "(unknown mainfilename)"
msgstr "(tuntematon päätiedosto)"
#: codetoolsstrconsts.ctsunknownsectionkeyword
msgid "unknown section keyword %s found"
msgstr "tuntematon lohkon avainsana %s löytyi"
#: codetoolsstrconsts.ctsunknownsubdescriptor
msgid "(unknown subdescriptor %s)"
msgstr "(tuntematon alikuvaus %s)"

View File

@ -852,6 +852,10 @@ msgstr "mot-clé \"%s\" inattendu dans un bloc \"begin..end\""
msgid "unexpected keyword \"%s\" found while reading blocks backwards"
msgstr "mot-clé \"%s\" inattendu rencontré lors de la lecture des blocs vers le haut"
#: codetoolsstrconsts.ctsunexpectedsectionkeyword
msgid "unexpected section keyword %s found"
msgstr ""
#: codetoolsstrconsts.ctsunexpectedsubrangeoperatorfound
msgid "unexpected subrange operator '..' found"
msgstr "opérateur de plage \"..\" inattendu trouvé"
@ -872,10 +876,6 @@ msgstr "Fonction %s inconnue"
msgid "(unknown mainfilename)"
msgstr "(Nom de fichier principal inconnu)"
#: codetoolsstrconsts.ctsunknownsectionkeyword
msgid "unknown section keyword %s found"
msgstr "section inconnue, mot-clé %s trouvé"
#: codetoolsstrconsts.ctsunknownsubdescriptor
msgid "(unknown subdescriptor %s)"
msgstr "(sous-descripteur %s inconnu)"

View File

@ -902,6 +902,10 @@ msgstr "מלת מפתח לא צפויה \"%s\" נמצאה בתוך בלוק \"ה
msgid "unexpected keyword \"%s\" found while reading blocks backwards"
msgstr "מלת מפתח לא צפויה \"%s\" נמצאה בזמן קריאת בלוקים מהסוף להתחלה"
#: codetoolsstrconsts.ctsunexpectedsectionkeyword
msgid "unexpected section keyword %s found"
msgstr ""
#: codetoolsstrconsts.ctsunexpectedsubrangeoperatorfound
msgid "unexpected subrange operator '..' found"
msgstr "אופרטור בלתי צפוי של תת תחום '..' נמצא"
@ -924,11 +928,6 @@ msgstr "פונקציה לא ידועה s%"
msgid "(unknown mainfilename)"
msgstr "(שם קובץ ראשי לא ידוע)"
#: codetoolsstrconsts.ctsunknownsectionkeyword
#, fuzzy,badformat
msgid "unknown section keyword %s found"
msgstr "מלת מפתח s% לא ידוע באזור נמצאה"
#: codetoolsstrconsts.ctsunknownsubdescriptor
#, fuzzy,badformat
msgid "(unknown subdescriptor %s)"

View File

@ -851,6 +851,10 @@ msgstr "váratlan kulcsszó található a begin..end részben: %s"
msgid "unexpected keyword \"%s\" found while reading blocks backwards"
msgstr "váratlan kulcsszó: \"%s\" a blokkok visszafelé olvasása közben"
#: codetoolsstrconsts.ctsunexpectedsectionkeyword
msgid "unexpected section keyword %s found"
msgstr ""
#: codetoolsstrconsts.ctsunexpectedsubrangeoperatorfound
msgid "unexpected subrange operator '..' found"
msgstr "váratlan résztartomány '..' jel"
@ -871,10 +875,6 @@ msgstr "Ismeretlen eljárás: %s"
msgid "(unknown mainfilename)"
msgstr "(ismeretlen főfájlnév)"
#: codetoolsstrconsts.ctsunknownsectionkeyword
msgid "unknown section keyword %s found"
msgstr "ismeretlen szakasz kulcsszó: %s"
#: codetoolsstrconsts.ctsunknownsubdescriptor
msgid "(unknown subdescriptor %s)"
msgstr "(ismeretlen al-leíró: %s)"

View File

@ -867,6 +867,10 @@ msgstr "keyword \"%s\" yang tidak diharapkan dalam begin..end ditemukan"
msgid "unexpected keyword \"%s\" found while reading blocks backwards"
msgstr "keyword \"%s\" yang tidak diharapkan ditemukan saat pembacaan blok mundur"
#: codetoolsstrconsts.ctsunexpectedsectionkeyword
msgid "unexpected section keyword %s found"
msgstr ""
#: codetoolsstrconsts.ctsunexpectedsubrangeoperatorfound
msgid "unexpected subrange operator '..' found"
msgstr "operator sub jangkauan '..' yang tidak diharapkan ditemukan"
@ -887,10 +891,6 @@ msgstr "Fungsi tidak dikenal %s"
msgid "(unknown mainfilename)"
msgstr "(nama file utama tidak dikenal)"
#: codetoolsstrconsts.ctsunknownsectionkeyword
msgid "unknown section keyword %s found"
msgstr "bagian keyword %s yang ditemukan tidak dikenal"
#: codetoolsstrconsts.ctsunknownsubdescriptor
msgid "(unknown subdescriptor %s)"
msgstr "(subdeskriptor tidak dikenal %s)"

View File

@ -849,6 +849,10 @@ msgstr "trovata parolachiave imprevista \"%s\" in un blocco begin..end"
msgid "unexpected keyword \"%s\" found while reading blocks backwards"
msgstr "trovata parolachiave imprevista \"%s\" durante la lettura dei blocchi in senso inverso"
#: codetoolsstrconsts.ctsunexpectedsectionkeyword
msgid "unexpected section keyword %s found"
msgstr ""
#: codetoolsstrconsts.ctsunexpectedsubrangeoperatorfound
msgid "unexpected subrange operator '..' found"
msgstr "trovato operatore di subrange '..' inaspettato"
@ -869,10 +873,6 @@ msgstr "Funzione sconosciuta %s"
msgid "(unknown mainfilename)"
msgstr "(nome file principale sconosciuto)"
#: codetoolsstrconsts.ctsunknownsectionkeyword
msgid "unknown section keyword %s found"
msgstr "trovata parolachiave di sezione %s sconosciuta"
#: codetoolsstrconsts.ctsunknownsubdescriptor
msgid "(unknown subdescriptor %s)"
msgstr "(sottodescrittore sconosciuto %s)"

View File

@ -852,6 +852,10 @@ msgstr "tarp „begin“ ir „end“ aptiktas netikėtas raktažodis „%s“"
msgid "unexpected keyword \"%s\" found while reading blocks backwards"
msgstr "skaitant blokus atygaline tvarka aptiktas netikėtas raktažodis „%s“"
#: codetoolsstrconsts.ctsunexpectedsectionkeyword
msgid "unexpected section keyword %s found"
msgstr ""
#: codetoolsstrconsts.ctsunexpectedsubrangeoperatorfound
msgid "unexpected subrange operator '..' found"
msgstr "aptiktas netikėtas poaibio operatorius „..“"
@ -872,10 +876,6 @@ msgstr "Nežinoma funkcija %s"
msgid "(unknown mainfilename)"
msgstr "(nežinomas pagrindinio failo pavadinimas)"
#: codetoolsstrconsts.ctsunknownsectionkeyword
msgid "unknown section keyword %s found"
msgstr "aptiktas nežinomas sekcijos raktažodis %s"
#: codetoolsstrconsts.ctsunknownsubdescriptor
msgid "(unknown subdescriptor %s)"
msgstr "(nežinomas vidinis deskriptorius %s)"

View File

@ -865,6 +865,10 @@ msgstr ""
msgid "unexpected keyword \"%s\" found while reading blocks backwards"
msgstr ""
#: codetoolsstrconsts.ctsunexpectedsectionkeyword
msgid "unexpected section keyword %s found"
msgstr ""
#: codetoolsstrconsts.ctsunexpectedsubrangeoperatorfound
msgid "unexpected subrange operator '..' found"
msgstr ""
@ -885,10 +889,6 @@ msgstr "Onbekende functie %s"
msgid "(unknown mainfilename)"
msgstr "(onbekende hoofd bestandsnaam)"
#: codetoolsstrconsts.ctsunknownsectionkeyword
msgid "unknown section keyword %s found"
msgstr ""
#: codetoolsstrconsts.ctsunknownsubdescriptor
msgid "(unknown subdescriptor %s)"
msgstr ""

View File

@ -869,6 +869,10 @@ msgstr "znaleziono niespodziewane słowo kluczowe \"%s\" w begin...end"
msgid "unexpected keyword \"%s\" found while reading blocks backwards"
msgstr "znaleziono niespodziewane słowo kluczowe \"%s\" analizując bloki od końca"
#: codetoolsstrconsts.ctsunexpectedsectionkeyword
msgid "unexpected section keyword %s found"
msgstr ""
#: codetoolsstrconsts.ctsunexpectedsubrangeoperatorfound
msgid "unexpected subrange operator '..' found"
msgstr "znaleziono niespodziewany operator podzakresu '..'"
@ -889,10 +893,6 @@ msgstr "Nieznana funkcja %s"
msgid "(unknown mainfilename)"
msgstr "(nieznana główna nazwa pliku)"
#: codetoolsstrconsts.ctsunknownsectionkeyword
msgid "unknown section keyword %s found"
msgstr "znaleziono słowo kluczowe nieznanej sekcji: %s"
#: codetoolsstrconsts.ctsunknownsubdescriptor
msgid "(unknown subdescriptor %s)"
msgstr "(nieznany poddeskryptor %s)"

View File

@ -844,6 +844,10 @@ msgstr ""
msgid "unexpected keyword \"%s\" found while reading blocks backwards"
msgstr ""
#: codetoolsstrconsts.ctsunexpectedsectionkeyword
msgid "unexpected section keyword %s found"
msgstr ""
#: codetoolsstrconsts.ctsunexpectedsubrangeoperatorfound
msgid "unexpected subrange operator '..' found"
msgstr ""
@ -864,10 +868,6 @@ msgstr ""
msgid "(unknown mainfilename)"
msgstr ""
#: codetoolsstrconsts.ctsunknownsectionkeyword
msgid "unknown section keyword %s found"
msgstr ""
#: codetoolsstrconsts.ctsunknownsubdescriptor
msgid "(unknown subdescriptor %s)"
msgstr ""

View File

@ -862,6 +862,10 @@ msgstr "palavra-chave inesperada \"%s\" encontrada em \"begin..end\""
msgid "unexpected keyword \"%s\" found while reading blocks backwards"
msgstr "palavra-chave inesperada \"%s\" encontrada durante leitura reversa dos blocos"
#: codetoolsstrconsts.ctsunexpectedsectionkeyword
msgid "unexpected section keyword %s found"
msgstr ""
#: codetoolsstrconsts.ctsunexpectedsubrangeoperatorfound
msgid "unexpected subrange operator '..' found"
msgstr "operador subfaixa \"..\" encontrado inexperadamente"
@ -882,10 +886,6 @@ msgstr "Função desconhecida %s"
msgid "(unknown mainfilename)"
msgstr "(arquivo principal desconhecido)"
#: codetoolsstrconsts.ctsunknownsectionkeyword
msgid "unknown section keyword %s found"
msgstr "encontrada palavra-chave de seção desconhecida: %s "
#: codetoolsstrconsts.ctsunknownsubdescriptor
msgid "(unknown subdescriptor %s)"
msgstr "(sub-descritor desconhecido %s)"

View File

@ -851,6 +851,10 @@ msgstr "обнаружено неожиданное ключевое слово
msgid "unexpected keyword \"%s\" found while reading blocks backwards"
msgstr "обнаружено неожиданное ключевое слово \"%s\" при чтении блоков в обратном порядке"
#: codetoolsstrconsts.ctsunexpectedsectionkeyword
msgid "unexpected section keyword %s found"
msgstr ""
#: codetoolsstrconsts.ctsunexpectedsubrangeoperatorfound
msgid "unexpected subrange operator '..' found"
msgstr "обнаружен неожиданный оператор поддиапазона '..'"
@ -871,10 +875,6 @@ msgstr "Неизвестная функция %s"
msgid "(unknown mainfilename)"
msgstr "(неизвестное имя главного файла)"
#: codetoolsstrconsts.ctsunknownsectionkeyword
msgid "unknown section keyword %s found"
msgstr "обнаружено неизвестное ключевое слово секции %s"
#: codetoolsstrconsts.ctsunknownsubdescriptor
msgid "(unknown subdescriptor %s)"
msgstr "(неизвестный субдескриптор %s)"

View File

@ -860,6 +860,10 @@ msgstr ""
msgid "unexpected keyword \"%s\" found while reading blocks backwards"
msgstr ""
#: codetoolsstrconsts.ctsunexpectedsectionkeyword
msgid "unexpected section keyword %s found"
msgstr ""
#: codetoolsstrconsts.ctsunexpectedsubrangeoperatorfound
msgid "unexpected subrange operator '..' found"
msgstr ""
@ -880,10 +884,6 @@ msgstr ""
msgid "(unknown mainfilename)"
msgstr ""
#: codetoolsstrconsts.ctsunknownsectionkeyword
msgid "unknown section keyword %s found"
msgstr ""
#: codetoolsstrconsts.ctsunknownsubdescriptor
msgid "(unknown subdescriptor %s)"
msgstr ""

View File

@ -853,6 +853,10 @@ msgstr "знайдено неочікуване ключове слово \"%s\"
msgid "unexpected keyword \"%s\" found while reading blocks backwards"
msgstr "знайдено неочікуване ключове слово \"%s\" при читанні блоків у зворотному порядку"
#: codetoolsstrconsts.ctsunexpectedsectionkeyword
msgid "unexpected section keyword %s found"
msgstr ""
#: codetoolsstrconsts.ctsunexpectedsubrangeoperatorfound
msgid "unexpected subrange operator '..' found"
msgstr "знайдено неочікуваний оператор піддіапазону '..'"
@ -873,10 +877,6 @@ msgstr "Невідома функція %s"
msgid "(unknown mainfilename)"
msgstr "(невідома назва головного файлу)"
#: codetoolsstrconsts.ctsunknownsectionkeyword
msgid "unknown section keyword %s found"
msgstr "знайдене невідоме ключове слово секції %s"
#: codetoolsstrconsts.ctsunknownsubdescriptor
msgid "(unknown subdescriptor %s)"
msgstr "(невідомий субдескриптор %s)"

View File

@ -869,6 +869,10 @@ msgstr "关键字 \"%s\" 不应该出现在 begin..end块中间"
msgid "unexpected keyword \"%s\" found while reading blocks backwards"
msgstr "unexpected keyword \"%s\" found while reading blocks backwards"
#: codetoolsstrconsts.ctsunexpectedsectionkeyword
msgid "unexpected section keyword %s found"
msgstr ""
#: codetoolsstrconsts.ctsunexpectedsubrangeoperatorfound
msgid "unexpected subrange operator '..' found"
msgstr "没有子界符 '..' "
@ -890,10 +894,6 @@ msgstr "未知的函数: %s"
msgid "(unknown mainfilename)"
msgstr "(未知主文件名)"
#: codetoolsstrconsts.ctsunknownsectionkeyword
msgid "unknown section keyword %s found"
msgstr "未知的节关键字 %s 出现"
#: codetoolsstrconsts.ctsunknownsubdescriptor
msgid "(unknown subdescriptor %s)"
msgstr "(未知的子描述符: %s)"

View File

@ -638,7 +638,7 @@ begin
if (CurNode=nil)
or ((CurNode.Desc in AllSourceTypes)
and ((CurNode.FirstChild=nil)
or ((CurNode.FirstChild.Desc=ctnIdentifier)
or ((CurNode.FirstChild.Desc=ctnSrcName)
and (CurNode.FirstChild.NextBrother=nil))))
then begin
// parse source from the beginning
@ -674,10 +674,12 @@ begin
else begin
// the source type is missing
// this is allowed for program
if UpAtomIs('USES') or UpAtomIs('TYPE') or UpAtomIs('VAR')
or UpAtomIs('CONST') or UpAtomIs('RESOURCESTRING')
or UpAtomIs('BEGIN') or UpAtomIs('PROCEDURE') or UpAtomIs('FUNCTION')
or UpAtomIs('OPERATOR') then begin
if UpAtomIs('USES')
or UpAtomIs('TYPE') or UpAtomIs('VAR') or UpAtomIs('CONST')
or UpAtomIs('RESOURCESTRING') or UpAtomIs('LABEL')
or UpAtomIs('BEGIN') or UpAtomIs('ASM')
or UpAtomIs('PROCEDURE') or UpAtomIs('FUNCTION') or UpAtomIs('OPERATOR')
then begin
CurSection:=ctnProgram;
HasSourceType:=false;
CurPos.EndPos:=CurPos.StartPos;
@ -2558,7 +2560,7 @@ function TPascalParserTool.KeyWordFuncSection: boolean;
procedure RaiseUnexpectedSectionKeyWord;
begin
SaveRaiseExceptionFmt(20170421195027,ctsUnknownSectionKeyword,[GetAtom]);
SaveRaiseExceptionFmt(20170421195027,ctsUnexpectedSectionKeyword,[GetAtom]);
end;
begin