diff options
author | Erich Eckner <git@eckner.net> | 2018-03-23 12:31:27 +0100 |
---|---|---|
committer | Erich Eckner <git@eckner.net> | 2018-03-23 12:31:27 +0100 |
commit | a36f632ed5e56196b64e8db410a9d396acf90970 (patch) | |
tree | 80ff984cb5c4059942f00c24d0e27797e6f24ec2 | |
parent | 271a0fc7a5bad2cfd7ca00cf3ae4be5722d7a2f8 (diff) | |
download | Make-a36f632ed5e56196b64e8db410a9d396acf90970.tar.xz |
dateibeziehungen.pas: bugfix wenn nichts passt
-rw-r--r-- | Make.lps | 80 | ||||
-rw-r--r-- | dateibeziehungen.pas | 7 |
2 files changed, 45 insertions, 42 deletions
@@ -7,7 +7,7 @@ <Unit0> <Filename Value="Make.lpr"/> <IsPartOfProject Value="True"/> - <TopLine Value="48"/> + <TopLine Value="51"/> <CursorPos Y="3"/> <UsageCount Value="128"/> <Loaded Value="True"/> @@ -42,9 +42,9 @@ <UnitName Value="dateiBeziehungen"/> <IsVisibleTab Value="True"/> <EditorIndex Value="1"/> - <TopLine Value="1111"/> - <CursorPos X="27" Y="1130"/> - <FoldState Value=" T3kL03C pkIl80B4]95kQ0l312a"/> + <TopLine Value="369"/> + <CursorPos X="63" Y="561"/> + <FoldState Value=" T3kL03C pkIl80B4]95kQ0l222n"/> <UsageCount Value="96"/> <Loaded Value="True"/> </Unit4> @@ -148,123 +148,123 @@ </Units> <JumpHistory Count="30" HistoryIndex="29"> <Position1> - <Filename Value="../units/lowlevelunit.pas"/> - <Caret Line="47" Column="5" TopLine="13"/> + <Filename Value="dateibeziehungen.pas"/> + <Caret Line="298" Column="35" TopLine="279"/> </Position1> <Position2> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="281" Column="79" TopLine="263"/> + <Caret Line="1238" TopLine="1203"/> </Position2> <Position3> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="136" TopLine="119"/> + <Caret Line="1241" Column="34" TopLine="1203"/> </Position3> <Position4> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="243" Column="39" TopLine="203"/> + <Caret Line="137" Column="23" TopLine="118"/> </Position4> <Position5> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="298" Column="35" TopLine="279"/> + <Caret Line="1249" Column="14" TopLine="1231"/> </Position5> <Position6> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="1238" TopLine="1203"/> + <Caret Line="1251" Column="15" TopLine="1233"/> </Position6> <Position7> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="1241" Column="34" TopLine="1203"/> + <Caret Line="129" Column="18" TopLine="120"/> </Position7> <Position8> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="137" Column="23" TopLine="118"/> + <Caret Line="137" Column="34" TopLine="120"/> </Position8> <Position9> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="1249" Column="14" TopLine="1231"/> + <Caret Line="238" Column="11" TopLine="169"/> </Position9> <Position10> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="1251" Column="15" TopLine="1233"/> + <Caret Line="137" Column="129" TopLine="109"/> </Position10> <Position11> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="129" Column="18" TopLine="120"/> + <Caret Line="272" Column="104" TopLine="255"/> </Position11> <Position12> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="137" Column="34" TopLine="120"/> + <Caret Line="1237" Column="9" TopLine="1205"/> </Position12> <Position13> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="238" Column="11" TopLine="169"/> + <Caret Line="1253" Column="19" TopLine="1235"/> </Position13> <Position14> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="137" Column="129" TopLine="109"/> + <Caret Line="1251" Column="6" TopLine="1236"/> </Position14> <Position15> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="272" Column="104" TopLine="255"/> + <Caret Line="1254" Column="20" TopLine="1236"/> </Position15> <Position16> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="1237" Column="9" TopLine="1205"/> + <Caret Line="1251" Column="11" TopLine="1237"/> </Position16> <Position17> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="1253" Column="19" TopLine="1235"/> + <Caret Line="1255" Column="58" TopLine="1237"/> </Position17> <Position18> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="1251" Column="6" TopLine="1236"/> + <Caret Line="1258" Column="20" TopLine="1238"/> </Position18> <Position19> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="1254" Column="20" TopLine="1236"/> + <Caret Line="269" Column="81" TopLine="269"/> </Position19> <Position20> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="1251" Column="11" TopLine="1237"/> </Position20> <Position21> - <Filename Value="dateibeziehungen.pas"/> - <Caret Line="1255" Column="58" TopLine="1237"/> + <Filename Value="tools.pas"/> + <Caret Line="240" TopLine="219"/> </Position21> <Position22> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="1258" Column="20" TopLine="1238"/> + <Caret Line="239" TopLine="206"/> </Position22> <Position23> - <Filename Value="dateibeziehungen.pas"/> - <Caret Line="269" Column="81" TopLine="269"/> + <Filename Value="tools.pas"/> + <Caret Line="681" Column="49" TopLine="673"/> </Position23> <Position24> - <Filename Value="dateibeziehungen.pas"/> + <Filename Value="tools.pas"/> + <Caret Line="727" Column="78" TopLine="710"/> </Position24> <Position25> - <Filename Value="tools.pas"/> - <Caret Line="240" TopLine="219"/> + <Filename Value="dateibeziehungen.pas"/> + <Caret Line="674" Column="68" TopLine="665"/> </Position25> <Position26> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="239" TopLine="206"/> + <Caret Line="1242" Column="158" TopLine="1217"/> </Position26> <Position27> - <Filename Value="tools.pas"/> - <Caret Line="681" Column="49" TopLine="673"/> + <Filename Value="Make.lpr"/> + <Caret Line="3" TopLine="51"/> </Position27> <Position28> - <Filename Value="tools.pas"/> - <Caret Line="727" Column="78" TopLine="710"/> + <Filename Value="dateibeziehungen.pas"/> + <Caret Line="108" Column="28" TopLine="90"/> </Position28> <Position29> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="674" Column="68" TopLine="665"/> + <Caret Line="1042" TopLine="1017"/> </Position29> <Position30> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="1242" Column="158" TopLine="1217"/> + <Caret Line="77" Column="26" TopLine="60"/> </Position30> </JumpHistory> </ProjectSession> diff --git a/dateibeziehungen.pas b/dateibeziehungen.pas index 4eea14d..ebcc892 100644 --- a/dateibeziehungen.pas +++ b/dateibeziehungen.pas @@ -566,7 +566,7 @@ begin s:=quellenREs[ii]; if (leftStr(s,1)='^') and (rightStr(s,1)='$') then begin // es handelt sich um einen regex if not quellErsetzung(s,rtFpc,tmpQs,ii) then // regex-Substitution nicht erfolgreich - - tmpQs.delete(tmpQs.count-1) // wird behandelt wie nie passender regex + setLength(idxs[ii],0) // wird behandelt wie nie passender regex else dats.matchAll(s,idxs[ii],true); end @@ -574,12 +574,15 @@ begin delete(s,1,1); delete(s,length(s),1); if not quellErsetzung(s,rtKein,tmpQs,ii) then // Substitution nicht erfolgreich - - tmpQs.delete(tmpQs.count-1) // wird behandelt wie nicht existente Datei + setLength(idxs[ii],0) // wird behandelt wie nicht existente Datei else dats.matchAll(s,idxs[ii],false); end else fehler('Unbekannte Quell-Syntax: '''+s+''' - weder ''"/pfad/zur/Quelle"'' noch ''^/regex/der/auf/Quelle\.passt$''!'); + if length(idxs[ii])=0 then + while tmpQs.count>=max(1,ii) do + tmpQs.delete(tmpQs.count-1); end; begin |