diff --git a/TestSuite/CompilationSamples/FilesOperations.pas b/TestSuite/CompilationSamples/FilesOperations.pas index 11a116eb8..c44a431a7 100644 --- a/TestSuite/CompilationSamples/FilesOperations.pas +++ b/TestSuite/CompilationSamples/FilesOperations.pas @@ -19,7 +19,7 @@ begin while not eof(f) do begin readln(f,s); - sb.append(s); + sb.AppendLine(s); end; ReadFileToEnd:=sb.ToString(); CloseFile(f);{} diff --git a/TestSuite/formatter_tests/input/FilesOperations.pas b/TestSuite/formatter_tests/input/FilesOperations.pas index 3c056fa4e..b384c4c61 100644 --- a/TestSuite/formatter_tests/input/FilesOperations.pas +++ b/TestSuite/formatter_tests/input/FilesOperations.pas @@ -17,7 +17,7 @@ begin while not eof(f) do begin readln(f,s); - sb.append(s); + sb.AppendLine(s); end; ReadFileToEnd:=sb.ToString(); CloseFile(f);{} diff --git a/Utils/IncrementVresion/IncrementVresion.exe b/Utils/IncrementVresion/IncrementVresion.exe index 96090c345..4cb4b4378 100644 Binary files a/Utils/IncrementVresion/IncrementVresion.exe and b/Utils/IncrementVresion/IncrementVresion.exe differ diff --git a/Utils/IncrementVresion/IncrementVresion.pas b/Utils/IncrementVresion/IncrementVresion.pas index 7654911cb..ad2cfeb5a 100644 --- a/Utils/IncrementVresion/IncrementVresion.pas +++ b/Utils/IncrementVresion/IncrementVresion.pas @@ -21,11 +21,14 @@ begin while not eof(f) do begin readln(f,s); i := s.IndexOf('='); - name := s.Substring(0,i); - if name = IncrementDef then - defs.Add(name, System.Convert.ToInt32(s.Substring(i+1))+IncrementValue) - else - defs.Add(name, s.Substring(i+1)); + if i > 0 then + begin + name := s.Substring(0,i); + if name = IncrementDef then + defs.Add(name, System.Convert.ToInt32(s.Substring(i+1))+IncrementValue) + else + defs.Add(name, s.Substring(i+1)); + end; end; CloseFile(f); AssignFile(f, DefsFile); diff --git a/Utils/ReplaceInFiles/ReplaceInFiles.exe b/Utils/ReplaceInFiles/ReplaceInFiles.exe index 59c2a76e3..a1a0acacf 100644 Binary files a/Utils/ReplaceInFiles/ReplaceInFiles.exe and b/Utils/ReplaceInFiles/ReplaceInFiles.exe differ diff --git a/bin/Lib/FilesOperations.pas b/bin/Lib/FilesOperations.pas index 11a116eb8..c44a431a7 100644 --- a/bin/Lib/FilesOperations.pas +++ b/bin/Lib/FilesOperations.pas @@ -19,7 +19,7 @@ begin while not eof(f) do begin readln(f,s); - sb.append(s); + sb.AppendLine(s); end; ReadFileToEnd:=sb.ToString(); CloseFile(f);{}