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 -
* partial fix for Mantis #37253: po_hascallingconvention needs to be set as well when setting tprocdef.proccalloption
........
- partial fix for Mantis #37253: use SOCKADDR_STORAGE provided by the WinSock2 unit (which also has the correct size)
........
- remove FPC 3.0 compatibility IFDEF
........
git-svn-id: branches/fixes_3_2@45699 -
* fix WinAPI directive: the purpose is to present the OS' default calling convention which for Windows means stdcall (at least on those platforms that support stdcall) on other platforms it is cdecl (for now)
........
git-svn-id: branches/fixes_3_2@45070 -
U packages/univint/fpmake.pp
...
--- Recording mergeinfo for merge of r42499 into '.':
U .
--- Merging r42500 into '.':
U packages/cocoaint/fpmake.pp
...
--- Recording mergeinfo for merge of r42500 into '.':
G .
--- Merging r42548 into '.':
G packages/univint/src/AUComponent.pas
G packages/univint/src/AudioUnitProperties.pas
--- Recording mergeinfo for merge of r42548 into '.':
G .
--- Merging r43684 into '.':
U compiler/msg/errore.msg
...
--- Recording mergeinfo for merge of r43684 into '.':
G .
--- Merging r43687 into '.':
G packages/univint/src/AudioComponents.pas
U packages/univint/src/AudioServices.pas
--- Recording mergeinfo for merge of r43687 into '.':
G .
git-svn-id: branches/fixes_3_2@44035 -
U compiler/blockutl.pas
U compiler/jvm/njvmutil.pas
U compiler/jvm/pjvm.pas
U compiler/ncal.pas
U compiler/ninl.pas
U compiler/pdecl.pas
U compiler/pdecsub.pas
U compiler/pdecvar.pas
U compiler/pexpr.pas
U compiler/pgenutil.pas
U compiler/pmodules.pas
U compiler/pparautl.pas
U compiler/pstatmnt.pas
U compiler/psub.pas
U compiler/psystem.pas
U compiler/ptype.pas
U compiler/symcreat.pas
U compiler/symdef.pas
U compiler/symsym.pas
U compiler/symutil.pas
--- Recording mergeinfo for merge of r42998 into '.':
U .
--- Merging r43116 into '.':
G compiler/symsym.pas
A tests/webtbf/tw36114.pp
--- Recording mergeinfo for merge of r43116 into '.':
G .
# revisions: 42998,43116
git-svn-id: branches/fixes_3_2@43442 -
U .
--- Merging r39693 into '.':
A tests/tbs/tb0650.pp
U compiler/symtable.pas
--- Recording mergeinfo for merge of r39693 into '.':
U .
--- Merging r39700 into '.':
U compiler/msg/errore.msg
--- Recording mergeinfo for merge of r39700 into '.':
G .
--- Merging r39701 into '.':
U compiler/msgtxt.inc
U compiler/msgidx.inc
--- Recording mergeinfo for merge of r39701 into '.':
G .
--- Merging r39702 into '.':
U compiler/pdecsub.pas
A tests/test/tgeneric105.pp
--- Recording mergeinfo for merge of r39702 into '.':
G .
--- Merging r39703 into '.':
A tests/test/tgenfunc18.pp
A tests/test/tgenfunc17.pp
G compiler/pdecsub.pas
--- Recording mergeinfo for merge of r39703 into '.':
G .
--- Merging r39715 into '.':
U packages/rtl-extra/src/inc/objects.pp
A tests/webtbs/tw34239.pp
--- Recording mergeinfo for merge of r39715 into '.':
G .
--- Merging r39727 into '.':
G packages/rtl-extra/src/inc/objects.pp
--- Recording mergeinfo for merge of r39727 into '.':
G .
# revisions: 39673,39693,39700,39701,39702,39703,39715,39727
git-svn-id: branches/fixes_3_2@39834 -
implementation and "virtual" (if it's a virtual method), as "virtual"
does not get repeated in the implementation and hence no conflicts get
checked by default (mantis #32605)
git-svn-id: trunk@37887 -
This fixes Mantis #31634 as far as I see it useful to; anything further would probably require extension of the message generation system by a context or such so that the compiler could write "Error in TFoo<Integer>: ..." instead of merely "Error: ..." or something like that.
No test added due to the nature of the bug.
git-svn-id: trunk@35748 -
ad hoc set constants containing varying number cdecl-like calling
conventions
o added pocall_sysv_abi_cdecl and pocall_ms_abi_cdecl to cstylearrayofconst
o also allow C-style blocks with mwpascal instead of cdecl (mwpascal = cdecl
with "const" = "constref" for record parameters)
o did not touch cases related to name mangling and import/export names,
because those are a real mess and easily break things left and right :/
git-svn-id: trunk@35479 -
sysv_abi_cdecl calling conventions on x86-64 to force using the SYSV/
Microsoft ABI on platforms that don't use it by default (mainly to ease
porting pure assembler routines)
git-svn-id: trunk@35425 -
* adjusted error message to reflect that we're not only dealing with generic classes
+ added test; note: it's added in webtbs, cause the test will loose its %FAIL attribute in the future
git-svn-id: trunk@35079 -
scanner.pas, tscannerfile:
+ new method is_recording_tokens to check whether token recording is already active
pdecsub.pas, parse_proc_directives:
* record tokens into the declaration token buffer of a generic routine if necessary
pgenutil.pas, generate_specialization_phase2:
* process the procedure directives that had been recorded with the generic routine
git-svn-id: trunk@33824 -
