U compiler/aarch64/hlcgcpu.pas
A tests/webtbs/tw38766.pp
--- Recording mergeinfo for merge of r49236 into '.':
U .
git-svn-id: branches/fixes_3_2@49237 -
U compiler/aarch64/aasmcpu.pas
--- Recording mergeinfo for merge of r49206 into '.':
U .
--- Merging r49207 into '.':
U compiler/aarch64/rgcpu.pas
A tests/webtbs/tw38053.pp
--- Recording mergeinfo for merge of r49207 into '.':
G .
git-svn-id: branches/fixes_3_2@49208 -
U packages/fcl-base/src/bufstream.pp
A tests/webtbs/tw38351.pp
--- Recording mergeinfo for merge of r48282 into '.':
U .
# revisions: 48282
r48282 | florian | 2021-01-21 22:08:13 +0100 (Thu, 21 Jan 2021) | 1 line
Changed paths:
M /trunk/packages/fcl-base/src/bufstream.pp
A /trunk/tests/webtbs/tw38351.pp
* fix TBufferedFileStream.Seek(0,soBeginning) as proposed by Andrey Zubarev, resolves#38351
git-svn-id: branches/fixes_3_2@49111 -
U packages/rtl-objpas/src/inc/variants.pp
--- Recording mergeinfo for merge of r49040 into '.':
U .
--- Merging r49044 into '.':
U packages/rtl-objpas/src/inc/strutils.pp
--- Recording mergeinfo for merge of r49044 into '.':
G .
--- Merging r49047 into '.':
U packages/regexpr/src/regexpr.pas
--- Recording mergeinfo for merge of r49047 into '.':
G .
--- Merging r49101 into '.':
U rtl/win/wininc/struct.inc
--- Recording mergeinfo for merge of r49101 into '.':
G .
--- Merging r49104 into '.':
C compiler/aarch64/cgcpu.pas
A tests/webtbs/tw38695.pp
--- Recording mergeinfo for merge of r49104 into '.':
G .
Summary of conflicts:
Text conflicts: 1
# revisions: 49040,49044,49047,49101,49104
r49040 | florian | 2021-03-23 21:57:18 +0100 (Tue, 23 Mar 2021) | 1 line
Changed paths:
M /trunk/packages/rtl-objpas/src/inc/variants.pp
* patch by Arnaud Bouchez: initialize dummy_data properly, resolves#38653
r49044 | michael | 2021-03-24 11:40:03 +0100 (Wed, 24 Mar 2021) | 1 line
Changed paths:
M /trunk/packages/rtl-objpas/src/inc/strutils.pp
Fix casing, bug ID #38660
r49047 | michael | 2021-03-24 18:05:26 +0100 (Wed, 24 Mar 2021) | 1 line
Changed paths:
M /trunk/packages/regexpr/src/regexpr.pas
* Fix issue #38442
r49101 | marco | 2021-04-02 16:54:40 +0200 (Fri, 02 Apr 2021) | 1 line
Changed paths:
M /trunk/rtl/win/wininc/struct.inc
* split propsheetheader in -A and -W variants.
r49104 | florian | 2021-04-02 18:44:43 +0200 (Fri, 02 Apr 2021) | 2 lines
Changed paths:
M /trunk/compiler/aarch64/cgcpu.pas
A /trunk/tests/webtbs/tw38695.pp
* Aarch64: patch by J. Gareth Moreton: fix constant writing, resolves#38695
+ test
git-svn-id: branches/fixes_3_2@49110 -
* fix for Mantis #38145: allow overloading of assignment operators that return ShortStrings with a specific size
+ added tests
The following rules for using these operator overloads as *implicit* overloads apply (Delphi compatible):
- if a found assignment operator returns a default ShortString then that is used
- if only one assignment operator to a String[x] is found then that is used
- otherwise the assignment is not possible
The explicit assignment checks for an exact match (and falls back for an implicit assignment). This is not entirely Delphi compatible as Delphi seems to favor the first found symbol in that case, but sometimes also not... :/
........
* with the recent ShortString changes this test is no longer needed as it was added exactly to check the condition I removed, so disable it for 3.2.1 and newer (as I want to merge these changes back to fixes)
........
git-svn-id: branches/fixes_3_2@49055 -
U packages/rtl-objpas/src/inc/fmtbcd.pp
--- Recording mergeinfo for merge of r48876 into '.':
G .
--- Merging r49021 into '.':
U packages/fcl-process/src/win/process.inc
--- Recording mergeinfo for merge of r49021 into '.':
G .
# revisions: 48876,49021
r48876 | marco | 2021-03-04 11:37:50 +0100 (Thu, 04 Mar 2021) | 1 line
Changed paths:
M /trunk/packages/rtl-objpas/src/inc/fmtbcd.pp
* Patch from Lacak. Better fix for mantis 30853
r49021 | marco | 2021-03-20 22:45:19 +0100 (Sat, 20 Mar 2021) | 1 line
Changed paths:
M /trunk/packages/fcl-process/src/win/process.inc
* also assign threadid. mantis 38645
git-svn-id: branches/fixes_3_2@49039 -
* apply patch by Blaise.ru to allow record methods to be assigned to method variables as well (this is Delphi compatible)
+ added test
........
* apply patch by Blaise.ru to allow specializations for the result type of function and method variables
+ added tests
........
* fix for Mantis #38238: when creating a copy of a procdef for a procvar set the methodpointer flag also for methods of records
+ added test
........
git-svn-id: branches/fixes_3_2@48653 -
* fix for Mantis #38249: apply adjusted patch by avk to implemnt CastTo handling when the source variant is a custom variant, but the destination type is not
+ added test (includes test for #20849)
........
git-svn-id: branches/fixes_3_2@48494 -
------------------------------------------------------------------------
r47460 | florian | 2020-11-19 21:37:23 +0000 (Thu, 19 Nov 2020) | 1 line
* remove readln
------------------------------------------------------------------------
--- Merging r47460 into '.':
U tests/webtbs/tw38058.pp
--- Recording mergeinfo for merge of r47460 into '.':
U .
git-svn-id: branches/fixes_3_2@48135 -
U compiler/nbas.pas
--- Recording mergeinfo for merge of r44096 into '.':
U .
--- Merging r46274 into '.':
G compiler/nbas.pas
--- Recording mergeinfo for merge of r46274 into '.':
G .
--- Merging r48127 into '.':
A tests/webtbs/tw38337.pp
--- Recording mergeinfo for merge of r48127 into '.':
G .
git-svn-id: branches/fixes_3_2@48128 -
U tests/webtbs/tw37949.pp
--- Recording mergeinfo for merge of r47159 into '.':
U .
# revisions: 47159
r47159 | jonas | 2020-10-23 17:09:31 +0200 (Fri, 23 Oct 2020) | 1 line
Changed paths:
M /trunk/tests/webtbs/tw37949.pp
* don't run interactive test
git-svn-id: branches/fixes_3_2@47917 -
U compiler/nflw.pas
A tests/webtbs/tw37823.pp
-- Aufzeichnung der Informationen für Zusammenführung von r46974 in ».«:
U .
git-svn-id: branches/fixes_3_2@47909 -
U compiler/htypechk.pas
U compiler/ncal.pas
A tests/webtbs/tw37796.pp
-- Aufzeichnung der Informationen für Zusammenführung von r46973 in ».«:
U .
git-svn-id: branches/fixes_3_2@47908 -
-- Zusammenführen von r45995 in ».«:
U rtl/linux/i386/sighnd.inc
U rtl/linux/x86_64/sighnd.inc
A tests/webtbs/tw37468.pp
-- Aufzeichnung der Informationen für Zusammenführung von r45995 in ».«:
U .
-- Zusammenführen von r46207 in ».«:
U rtl/linux/i386/sighndh.inc
-- Aufzeichnung der Informationen für Zusammenführung von r46207 in ».«:
G .
-- Zusammenführen von r46208 in ».«:
G rtl/linux/i386/sighnd.inc
-- Aufzeichnung der Informationen für Zusammenführung von r46208 in ».«:
G .
-- Zusammenführen von r46210 in ».«:
U rtl/aix/sighnd.inc
U rtl/beos/i386/sighnd.inc
U rtl/go32v2/dpmiexcp.pp
U rtl/haiku/i386/sighnd.inc
U rtl/haiku/x86_64/sighnd.inc
U rtl/i8086/math.inc
U rtl/inc/genmath.inc
U rtl/linux/m68k/sighnd.inc
U rtl/linux/powerpc/sighnd.inc
U rtl/linux/powerpc64/sighnd.inc
U rtl/linux/sparc/sighnd.inc
U rtl/linux/sparc64/sighnd.inc
G rtl/linux/x86_64/sighnd.inc
U rtl/netbsd/arm/sighnd.inc
U rtl/netbsd/m68k/sighnd.inc
U rtl/netbsd/powerpc/sighnd.inc
U rtl/netbsd/x86_64/sighnd.inc
U rtl/openbsd/i386/sighnd.inc
U rtl/openbsd/x86_64/sighnd.inc
U rtl/os2/system.pas
U rtl/solaris/i386/sighnd.inc
U rtl/solaris/sparc/sighnd.inc
U rtl/solaris/x86_64/sighnd.inc
U rtl/win32/system.pp
U rtl/win64/system.pp
U tests/webtbs/tw37468.pp
U rtl/wince/system.pp
-- Aufzeichnung der Informationen für Zusammenführung von r46210 in ».«:
G .
-- Zusammenführen von r46992 in ».«:
G rtl/linux/x86_64/sighnd.inc
A tests/webtbs/tw37468b.pp
-- Aufzeichnung der Informationen für Zusammenführung von r46992 in ».«:
G .
-- Zusammenführen von r47114 in ».«:
G rtl/linux/x86_64/sighnd.inc
G rtl/linux/i386/sighnd.inc
A tests/webtbs/tw37926.pp
-- Aufzeichnung der Informationen für Zusammenführung von r47114 in ».«:
G .
-- Zusammenführen von r47117 in ».«:
G rtl/linux/i386/sighnd.inc
G rtl/linux/x86_64/sighnd.inc
G rtl/linux/m68k/sighnd.inc
-- Aufzeichnung der Informationen für Zusammenführung von r47117 in ».«:
G .
git-svn-id: branches/fixes_3_2@47906 -
* fix for Mantis #38151: when a Variant is passed by reference to a IDispatch property then invoke it using DISPATCH_PROPERTYPUTREF instead of DISPATCH_PROPERTYPUT
+ added test
........
git-svn-id: branches/fixes_3_2@47846 -
U compiler/defcmp.pas
--- Recording mergeinfo for merge of r45972 into '.':
U .
--- Merging r47101 into '.':
U compiler/pexpr.pas
A tests/webtbs/tw37844.pp
--- Recording mergeinfo for merge of r47101 into '.':
G .
--- Merging r47253 into '.':
G compiler/defcmp.pas
A tests/webtbs/tw38012.pp
--- Recording mergeinfo for merge of r47253 into '.':
G .
--- Merging r47424 into '.':
U compiler/pdecsub.pas
A tests/webtbs/tw38083.pp
--- Recording mergeinfo for merge of r47424 into '.':
G .
--- Merging r47425 into '.':
U compiler/nflw.pas
A tests/webtbs/tw38058.pp
--- Recording mergeinfo for merge of r47425 into '.':
G .
--- Merging r47686 into '.':
U compiler/ncal.pas
A tests/test/tgenfunc23.pp
--- Recording mergeinfo for merge of r47686 into '.':
G .
git-svn-id: branches/fixes_3_2@47803 -
r46953
* fix for Mantis #37806: allow undefineddefs for Include() and Exclude() + added tests
---------------------
r46218
* fix for Mantis #37187: inside generics the constant code in pexpr does not handle all cases and thus current_procinfo needs to be checked as well + added test
---------------------
r45645
* correctly set the generic related defoptions for an outlined procdef
---------------------
r45458
* make more use of is_typeparam
---------------------
r45457
* constrained type parameters are not undefined defs, resolves#37107
---------------------
r44188
* keep track of the fileposinfo for generic constraints
---------------------
r44172
* only resolve a dummy symbol if it is a type symbol (thus truly a dummy symbol) + added tests
---------------------
git-svn-id: branches/fixes_3_2@47802 -
* fix for Mantis #36706: only link a library against the dynamic loader if we're not linking against the C library anyway
Note: I did not yet find a case where we *do* need to link a library against the loader; this will have to be investigated further, but for 3.2.0 this is safest
........
* fix for Mantis #36738: when copying a record using its copy operator we assume that we've copied the whole record; this way managed records inside non-managed records are handled correctly
+ added (adjusted) test
........
* when checking for an existing operator overload for the assignment operator, check for the correct variant (explicit or not) matching the overload
+ added tests
........
* GetLoadErrorStr (currently) returns a ShortString, so avoid a useless conversion to AnsiString
........
git-svn-id: branches/fixes_3_2@47771 -
U rtl/aarch64/mathu.inc
--- Recording mergeinfo for merge of r46880 into '.':
U .
--- Merging r40512 into '.':
A tests/webtbs/tw33607.pp
--- Recording mergeinfo for merge of r40512 into '.':
G .
--- Merging r42961 into '.':
U compiler/aarch64/aasmcpu.pas
--- Recording mergeinfo for merge of r42961 into '.':
G .
--- Merging r44932 into '.':
G compiler/aarch64/aasmcpu.pas
--- Recording mergeinfo for merge of r44932 into '.':
G .
--- Merging r44933 into '.':
U compiler/aarch64/racpugas.pas
--- Recording mergeinfo for merge of r44933 into '.':
G .
--- Merging r44998 into '.':
U compiler/aarch64/racpu.pas
--- Recording mergeinfo for merge of r44998 into '.':
G .
--- Merging r45667 into '.':
G compiler/aarch64/racpugas.pas
U compiler/rautils.pas
A tests/webtbs/tw37218.pp
--- Recording mergeinfo for merge of r45667 into '.':
G .
--- Merging r45814 into '.':
U compiler/aarch64/rgcpu.pas
A tests/webtbs/tw37393.pp
--- Recording mergeinfo for merge of r45814 into '.':
G .
--- Merging r46690 into '.':
G compiler/aarch64/aasmcpu.pas
--- Recording mergeinfo for merge of r46690 into '.':
G .
--- Merging r46871 into '.':
U compiler/aarch64/cgcpu.pas
--- Recording mergeinfo for merge of r46871 into '.':
G .
git-svn-id: branches/fixes_3_2@47756 -
* x86_64: Fixed code generation for try..finally blocks, so that exit label from inner try..finally stays within scope of procedure's implicit try..finally block if one is present. Mantis #34772.
........
* patch by J. Gareth Moreton: propagate exit use in nested try...except statements,
resolves#35841
........
* fix#35841 also for break and continue
........
git-svn-id: branches/fixes_3_2@47589 -
* fix for Mantis #34332: allow 2 parameter form of Copy also for ShortString variables
+ added test
........
* have the fpc_*_copy compiler intrinsics reference the intrinsic symbol they belong to
........
* fix for Mantis #34333: improve error output for incorrect calls to Copy()
........
git-svn-id: branches/fixes_3_2@47586 -
U compiler/nbas.pas
A tests/webtbs/tw38069.pp
A tests/webtbs/uw38069.pp
-- Aufzeichnung der Informationen für Zusammenführung von r47415 in ».«:
U .
git-svn-id: branches/fixes_3_2@47422 -
U compiler/defcmp.pas
U compiler/node.pas
U compiler/pexpr.pas
A tests/webtbs/tw34037.pp
-- Aufzeichnung der Informationen für Zusammenführung von r39934 in ».«:
U .
git-svn-id: branches/fixes_3_2@47421 -
U compiler/hlcgobj.pas
A tests/webtbs/tw35590.pp
-- Aufzeichnung der Informationen für Zusammenführung von r44119 in ».«:
U .
git-svn-id: branches/fixes_3_2@47152 -
------------------------------------------------------------------------
r44478 | michael | 2020-04-01 09:06:01 +0200 (Wed, 01 Apr 2020) | 1 line
* Patch from Bart Broersma to fix bug ID #36809 - test program
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@46654 -
* fix for Mantis #37355: the method name and the named parameters need to be separated by a single #0
+ added test
........
git-svn-id: branches/fixes_3_2@46278 -
U compiler/ngtcon.pas
A tests/webtbs/tw36156.pp
--- Recording mergeinfo for merge of r43186 into '.':
U .
--- Merging r43594 into '.':
U compiler/ncnv.pas
A tests/test/units/cocoaall/tw36362.pp
--- Recording mergeinfo for merge of r43594 into '.':
G .
--- Merging r44788 into '.':
U packages/fpmkunit/src/fpmkunit.pp
--- Recording mergeinfo for merge of r44788 into '.':
G .
--- Merging r45380 into '.':
G packages/fpmkunit/src/fpmkunit.pp
--- Recording mergeinfo for merge of r45380 into '.':
G .
--- Merging r45673 into '.':
U compiler/pinline.pas
A tests/webtbs/tw37228.pp
--- Recording mergeinfo for merge of r45673 into '.':
G .
git-svn-id: branches/fixes_3_2@45770 -
U compiler/scandir.pas
A tests/webtbs/tw37095.pp
A tests/webtbs/tw37095d
A tests/webtbs/tw37095d/uw37095.pp
--- Recording mergeinfo for merge of r45410 into '.':
U .
# revisions: 45410
r45410 | jonas | 2020-05-17 23:27:00 +0200 (Sun, 17 May 2020) | 2 lines
Changed paths:
M /trunk/compiler/scandir.pas
A /trunk/tests/webtbs/tw37095.pp
A /trunk/tests/webtbs/tw37095d
A /trunk/tests/webtbs/tw37095d/uw37095.pp
* fixed unitdir directive for relative paths in case the current module's
path is not set, broken by r43312 (mantis #37095)
git-svn-id: branches/fixes_3_2@45412 -
U compiler/powerpc64/cpupara.pas
A tests/webtbs/tw36934.pp
--- Recording mergeinfo for merge of r45199 into '.':
U .
git-svn-id: branches/fixes_3_2@45235 -
as merge of 43188 seems to generate troubles with
testsuite database.
------------------------------------------------------------------------
r43189 | florian | 2019-10-13 11:42:33 +0000 (Sun, 13 Oct 2019) | 1 line
* sorted out tests
------------------------------------------------------------------------
--- Merging r43189 into '.':
U tests/webtbs/tw34848.pp
D tests/webtbs/tw40850.pp
--- Recording mergeinfo for merge of r43189 into '.':
U .
git-svn-id: branches/fixes_3_2@44306 -
U compiler/nadd.pas
U compiler/ncnv.pas
U compiler/ncon.pas
U compiler/node.pas
A tests/test/tcurrency1.pp
A tests/webtbs/tw33963.pp
A tests/webtbs/tw36179.pp
-- Aufzeichnung der Informationen für Zusammenführung von r43620 in ».«:
U .
git-svn-id: branches/fixes_3_2@43621 -
A tests/webtbf/tw4541.pp
A tests/webtbf/uw4541.pp
D tests/webtbs/tw4541.pp
D tests/webtbs/uw4541.pp
--- Recording mergeinfo for merge of r40658 into '.':
U .
git-svn-id: branches/fixes_3_2@43499 -
G .
-- Aufzeichnung der Informationen für Zusammenführung von r43006 in ».«:
G .
-- Aufzeichnung der Informationen für Zusammenführung von r43007 in ».«:
G .
-- Aufzeichnung der Informationen für Zusammenführung von r43008 in ».«:
G .
-- Zusammenführen von r43000 in ».«:
U compiler/pp.pas
-- Aufzeichnung der Informationen für Zusammenführung von r43000 in ».«:
G .
-- Zusammenführen von r43011 in ».«:
U rtl/inc/system.inc
-- Aufzeichnung der Informationen für Zusammenführung von r43011 in ».«:
G .
-- Zusammenführen von r43012 in ».«:
U rtl/i386/i386.inc
-- Aufzeichnung der Informationen für Zusammenführung von r43012 in ».«:
G .
-- Zusammenführen von r43013 in ».«:
U rtl/linux/i386/si_c21.inc
-- Aufzeichnung der Informationen für Zusammenführung von r43013 in ».«:
G .
-- Zusammenführen von r43014 in ».«:
U compiler/systems/i_linux.pas
-- Aufzeichnung der Informationen für Zusammenführung von r43014 in ».«:
G .
-- Zusammenführen von r43176 in ».«:
U compiler/i386/cpupi.pas
U compiler/i386/n386cal.pas
U compiler/ncgcal.pas
U compiler/ncgutil.pas
G compiler/systems/i_linux.pas
U compiler/systems.inc
C compiler/systems.pas
G tests/webtbs/tw7808.pp
-- Aufzeichnung der Informationen für Zusammenführung von r43176 in ».«:
G .
Konfliktübersicht:
Textkonflikte: 1
Konfliktübersicht:
Textkonflikte: 1
git-svn-id: branches/fixes_3_2@43434 -
U compiler/msg/errore.msg
--- Recording mergeinfo for merge of r40654 into '.':
U .
--- Merging r40656 into '.':
U compiler/pdecvar.pas
A tests/tbf/tb0266a.pp
A tests/tbf/tb0266b.pp
--- Recording mergeinfo for merge of r40656 into '.':
G .
--- Merging r41308 into '.':
U tests/webtbs/tw35027.pp
--- Recording mergeinfo for merge of r41308 into '.':
G .
--- Merging r41829 into '.':
U compiler/htypechk.pas
U compiler/ncal.pas
A tests/tbs/tb0656.pp
--- Recording mergeinfo for merge of r41829 into '.':
G .
--- Merging r42511 into '.':
U packages/rtl-objpas/src/inc/rtti.pp
U rtl/objpas/typinfo.pp
U tests/test/trtti19.pp
--- Recording mergeinfo for merge of r42511 into '.':
G .
# revisions: 40654,40656,41308,41829,42511
git-svn-id: branches/fixes_3_2@43410 -
