paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-18 10:09:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fixed pchar->string conversion for delphi mode

Browse Source
This commit is contained in:
peter 2000-06-11 07:00:21 +00:00
parent 69109b8234
commit 42bdcb649b
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compiler/globals.pas
View File

@ -72,7 +72,7 @@ unit globals;
[m_objfpc,m_fpc,m_all,m_class,m_objpas,m_result,m_string_pchar,m_nested_comment, [m_objfpc,m_fpc,m_all,m_class,m_objpas,m_result,m_string_pchar,m_nested_comment,
m_repeat_forward,m_cvar_support,m_initfinal,m_add_pointer]; m_repeat_forward,m_cvar_support,m_initfinal,m_add_pointer];
tpmodeswitches : tmodeswitches= tpmodeswitches : tmodeswitches=
[m_tp,m_all,m_tp_procvar]; [m_tp7,m_tp,m_all,m_tp_procvar];
gpcmodeswitches : tmodeswitches= gpcmodeswitches : tmodeswitches=
[m_gpc,m_all]; [m_gpc,m_all];
@ -1568,7 +1568,10 @@ begin
end. end.
{ {
$Log$ $Log$
Revision 1.63 2000-05-12 08:58:51 pierre Revision 1.64 2000-06-11 07:00:21 peter
* fixed pchar->string conversion for delphi mode
Revision 1.63 2000/05/12 08:58:51 pierre
* adapted to Delphi 3 * adapted to Delphi 3
Revision 1.62 2000/05/12 05:55:04 pierre Revision 1.62 2000/05/12 05:55:04 pierre
@ -1693,4 +1696,4 @@ end.
* define FPC_DELPHI,FPC_OBJFPC,FPC_TP,FPC_GPC * define FPC_DELPHI,FPC_OBJFPC,FPC_TP,FPC_GPC
* initial support for ansistring default with modes * initial support for ansistring default with modes
} }

7
compiler/globtype.pas
View File

@ -113,7 +113,7 @@ interface
{ Switches which can be changed by a mode (fpc,tp7,delphi) } { Switches which can be changed by a mode (fpc,tp7,delphi) }
tmodeswitch = (m_none,m_all, { needed for keyword } tmodeswitch = (m_none,m_all, { needed for keyword }
{ generic } { generic }
m_fpc,m_objfpc,m_delphi,m_tp,m_gpc, m_fpc,m_objfpc,m_delphi,m_tp,m_tp7,m_gpc,
{ more specific } { more specific }
m_class, { delphi class model } m_class, { delphi class model }
m_objpas, { load objpas unit } m_objpas, { load objpas unit }
@ -199,7 +199,10 @@ begin
end. end.
{ {
$Log$ $Log$
Revision 1.31 2000-05-31 06:57:11 florian Revision 1.32 2000-06-11 07:00:21 peter
* fixed pchar->string conversion for delphi mode
Revision 1.31 2000/05/31 06:57:11 florian
* first implementation of -Oa switch * first implementation of -Oa switch
Revision 1.30 2000/05/16 20:19:05 pierre Revision 1.30 2000/05/16 20:19:05 pierre

12
compiler/htypechk.pas
View File

@ -238,8 +238,9 @@ implementation
end; end;
pointerdef : pointerdef :
begin begin
{ pchar can be assigned to short/ansistrings } { pchar can be assigned to short/ansistrings,
if is_pchar(def_from) and not(m_tp in aktmodeswitches) then but not in tp7 compatible mode }
if is_pchar(def_from) and not(m_tp7 in aktmodeswitches) then
begin begin
doconv:=tc_pchar_2_string; doconv:=tc_pchar_2_string;
b:=1; b:=1;
@ -1120,7 +1121,10 @@ implementation
end. end.
{ {
$Log$ $Log$
Revision 1.68 2000-06-06 20:25:43 pierre Revision 1.69 2000-06-11 07:00:21 peter
* fixed pchar->string conversion for delphi mode
Revision 1.68 2000/06/06 20:25:43 pierre
* unary minus operator overloading was broken * unary minus operator overloading was broken
+ accept pointer args in binary operator + accept pointer args in binary operator
@ -1232,4 +1236,4 @@ end.
* arrayconstructor -> arrayofconst fixed when arraycosntructor was not * arrayconstructor -> arrayofconst fixed when arraycosntructor was not
variant. variant.
} }