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

* fix for constructor inside with statements

Browse Source
This commit is contained in:
pierre 1999-01-21 16:40:51 +00:00
parent 435e4de7fb
commit 0cfc4c8f6b
10 changed files with 258 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
compiler/cg386cal.pas
View File

@ -859,15 +859,44 @@ implementation
p^.methodpointer:=genzeronode(callparan); p^.methodpointer:=genzeronode(callparan);
p^.methodpointer^.location.loc:=LOC_REGISTER; p^.methodpointer^.location.loc:=LOC_REGISTER;
p^.methodpointer^.location.register:=R_ESI; p^.methodpointer^.location.register:=R_ESI;
{ ARGHHH this is wrong !!!
if we can init from base class for a child
class that the wrong VMT will be
transfered to constructor !! }
{$ifdef NODIRECTWITH}
p^.methodpointer^.resulttype:=p^.symtable^.defowner; p^.methodpointer^.resulttype:=p^.symtable^.defowner;
{$else NODIRECTWITH}
p^.methodpointer^.resulttype:=
ptree(pwithsymtable(p^.symtable)^.withnode)^.left^.resulttype;
{$endif def NODIRECTWITH}
{ change dispose type !! } { change dispose type !! }
p^.disposetyp:=dt_mbleft_and_method; p^.disposetyp:=dt_mbleft_and_method;
{ make a reference } { make a reference }
new(r); new(r);
reset_reference(r^); reset_reference(r^);
r^.offset:=p^.symtable^.datasize; {$ifndef NODIRECTWITH}
r^.base:=procinfo.framepointer; if assigned(ptree(pwithsymtable(p^.symtable)^.withnode)^.pref) then
exprasmlist^.concat(new(pai386,op_ref_reg(A_MOV,S_L,r,R_ESI))); begin
r^:=ptree(pwithsymtable(p^.symtable)^.withnode)^.pref^;
if assigned(r^.symbol) then
r^.symbol:=stringdup(r^.symbol^);
end
else
{$endif def NODIRECTWITH}
begin
r^.offset:=p^.symtable^.datasize;
r^.base:=procinfo.framepointer;
end;
{$ifndef NODIRECTWITH}
if (not pwithsymtable(p^.symtable)^.direct_with) or
pobjectdef(p^.methodpointer^.resulttype)^.isclass then
{$endif def NODIRECTWITH}
exprasmlist^.concat(new(pai386,op_ref_reg(A_MOV,S_L,r,R_ESI)))
{$ifndef NODIRECTWITH}
else
exprasmlist^.concat(new(pai386,op_ref_reg(A_LEA,S_L,r,R_ESI)))
{$endif def NODIRECTWITH}
;
end; end;
{ push self } { push self }
@ -1585,7 +1614,10 @@ implementation
end. end.
{ {
$Log$ $Log$
Revision 1.56 1998-12-30 13:41:05 peter Revision 1.57 1999-01-21 16:40:51 pierre
* fix for constructor inside with statements
Revision 1.56 1998/12/30 13:41:05 peter
* released valuepara * released valuepara
Revision 1.55 1998/12/22 13:10:58 florian Revision 1.55 1998/12/22 13:10:58 florian

39
compiler/cg386mem.pas
View File

@ -706,32 +706,45 @@ implementation
ref : treference; ref : treference;
symtable : psymtable; symtable : psymtable;
i : longint; i : longint;
load : boolean;
begin begin
if assigned(p^.left) then if assigned(p^.left) then
begin begin
secondpass(p^.left); secondpass(p^.left);
load:=true;
if p^.left^.location.reference.segment<>R_DEFAULT_SEG then if p^.left^.location.reference.segment<>R_DEFAULT_SEG then
message(parser_e_no_with_for_variable_in_other_segments); message(parser_e_no_with_for_variable_in_other_segments);
ref.symbol:=nil; ref.symbol:=nil;
gettempofsizereference(4,ref); gettempofsizereference(4,ref);
if (p^.left^.resulttype^.deftype=objectdef) and if (p^.left^.treetype=loadn) and
pobjectdef(p^.left^.resulttype)^.isclass then (p^.left^.symtable=aktprocsym^.definition^.localst) then
exprasmlist^.concat(new(pai386,op_ref_reg(A_MOV,S_L, begin
newreference(p^.left^.location.reference),R_EDI))) { for local class just use the local storage }
ungetiftemp(ref);
new(p^.pref);
p^.pref^:=p^.left^.location.reference;
{ don't discard symbol if in main procedure }
p^.left^.location.reference.symbol:=nil;
load:=false;
end
else if (p^.left^.resulttype^.deftype=objectdef) and
pobjectdef(p^.left^.resulttype)^.isclass then
begin
exprasmlist^.concat(new(pai386,op_ref_reg(A_MOV,S_L,
newreference(p^.left^.location.reference),R_EDI)))
end
else else
exprasmlist^.concat(new(pai386,op_ref_reg(A_LEA,S_L, exprasmlist^.concat(new(pai386,op_ref_reg(A_LEA,S_L,
newreference(p^.left^.location.reference),R_EDI))); newreference(p^.left^.location.reference),R_EDI)));
exprasmlist^.concat(new(pai386,op_reg_ref(A_MOV,S_L, if load then
exprasmlist^.concat(new(pai386,op_reg_ref(A_MOV,S_L,
R_EDI,newreference(ref)))); R_EDI,newreference(ref))));
del_reference(p^.left^.location.reference); del_reference(p^.left^.location.reference);
{ the offset relative to (%ebp) is only needed here! } { the offset relative to (%ebp) is only needed here! }
symtable:=p^.withsymtable; symtable:=p^.withsymtable;
for i:=1 to p^.tablecount do for i:=1 to p^.tablecount do
begin begin
{$ifdef WITHTEST}
{$else WITHTEST}
symtable^.datasize:=ref.offset; symtable^.datasize:=ref.offset;
{$endif WITHTEST}
symtable:=symtable^.next; symtable:=symtable^.next;
end; end;
@ -739,7 +752,10 @@ implementation
if p^.right<>nil then if p^.right<>nil then
secondpass(p^.right); secondpass(p^.right);
{ clear some stuff } { clear some stuff }
ungetiftemp(ref); if assigned(p^.pref) then
dispose(p^.pref);
if load then
ungetiftemp(ref);
end; end;
end; end;
@ -747,7 +763,10 @@ implementation
end. end.
{ {
$Log$ $Log$
Revision 1.24 1999-01-19 12:05:27 pierre Revision 1.25 1999-01-21 16:40:52 pierre
* fix for constructor inside with statements
Revision 1.24 1999/01/19 12:05:27 pierre
* bug with @procvar=procvar fiwed * bug with @procvar=procvar fiwed
Revision 1.23 1998/12/30 22:15:45 peter Revision 1.23 1998/12/30 22:15:45 peter

1
compiler/msgidx.inc
View File

@ -268,6 +268,7 @@ type tmsgconst=(
cg_e_no_code_for_inline_stored, cg_e_no_code_for_inline_stored,
cg_e_can_access_element_zero, cg_e_can_access_element_zero,
cg_e_include_not_implemented, cg_e_include_not_implemented,
cg_e_cannot_call_cons_dest_inside_with,
assem_f_ev_zero_divide, assem_f_ev_zero_divide,
assem_f_ev_stack_overflow, assem_f_ev_stack_overflow,
assem_f_ev_stack_underflow, assem_f_ev_stack_underflow,

226
compiler/msgtxt.inc
View File

@ -1,4 +1,4 @@
const msgtxt : array[0..00097,1..240] of char=( const msgtxt : array[0..00098,1..240] of char=(
'T_Compiler: $1'#000+ 'T_Compiler: $1'#000+
'D_Source OS: $1'#000+ 'D_Source OS: $1'#000+
'I_Target OS: $1'#000+ 'I_Target OS: $1'#000+
@ -281,278 +281,279 @@ const msgtxt : array[0..00097,1..240] of char=(
'E_Element zero of an ansi/wide- or longstring can'#039't be accessed, u'+ 'E_Element zero of an ansi/wide- or longstring can'#039't be accessed, u'+
'se (set',')length instead'#000+ 'se (set',')length instead'#000+
'E_Include or exclude not implemented in this case'#000+ 'E_Include or exclude not implemented in this case'#000+
'Constructors or destructors can not be called inside with here'#000+
'F_Divide by zero in asm evaluator'#000+ 'F_Divide by zero in asm evaluator'#000+
'F_Evaluator stack overflow'#000+ 'F_Evaluator stack overflow'#000+
'F_Evaluator stack underflow'#000+ 'F_Evaluator stack underflow'#000+
'F_Invalid numeric format in asm evaluator'#000+ 'F_Invalid numeric form','at in asm evaluator'#000+
'F_Invalid Operator in asm evaluator'#000+ 'F_Invalid Operator in asm evaluator'#000+
'F_Unkno','wn error in asm evaluator'#000+ 'F_Unknown error in asm evaluator'#000+
'W_Invalid numeric value'#000+ 'W_Invalid numeric value'#000+
'E_escape sequence ignored: $1'#000+ 'E_escape sequence ignored: $1'#000+
'E_Asm syntax error - Prefix not found'#000+ 'E_Asm syntax error - Prefix not found'#000+
'E_Asm syntax error - Trying to add more than one prefix'#000+ 'E_Asm syntax error - Trying to add more than one prefix'#000+
'E_Asm syntax error - Opcode not found'#000+ 'E_A','sm syntax error - Opcode not found'#000+
'E_Invalid symbol reference'#000+ 'E_Invalid symbol reference'#000+
'W','_Calling an overload function in an asm'#000+ 'W_Calling an overload function in an asm'#000+
'E_Constant value out of bounds'#000+ 'E_Constant value out of bounds'#000+
'E_Non-label pattern contains @'#000+ 'E_Non-label pattern contains @'#000+
'E_Invalid Operand: $1'#000+ 'E_Invalid Operand: $1'#000+
'W_Override operator not supported'#000+ 'W_Override operator not supported'#000+
'E_Error in binary constant: $1'#000+ 'E_Error in binary c','onstant: $1'#000+
'E_Error in octal constant: $1'#000+ 'E_Error in octal constant: $1'#000+
'E_Error in hexadecima','l constant: $1'#000+ 'E_Error in hexadecimal constant: $1'#000+
'E_Error in integer constant: $1'#000+ 'E_Error in integer constant: $1'#000+
'E_Invalid labeled opcode'#000+ 'E_Invalid labeled opcode'#000+
'F_Internal error in Findtype()'#000+ 'F_Internal error in Findtype()'#000+
'E_Invalid size for MOVSX/MOVZX'#000+ 'E_Invalid size for MOVSX/MOVZX'#000+
'E_16-bit base in 32-bit segment'#000+ 'E_16-bit base in 32-bit segment'#000+
'E_16-bit index in 32-bit segment'#000+ 'E_16-bit in','dex in 32-bit segment'#000+
'E_Invalid Opcode'#000+ 'E_Invalid Opcode'#000+
'E_Constant reference not',' allowed'#000+ 'E_Constant reference not allowed'#000+
'W_Fwait can cause emulation problems with emu387'#000+ 'W_Fwait can cause emulation problems with emu387'#000+
'E_Invalid combination of opcode and operands'#000+ 'E_Invalid combination of opcode and operands'#000+
'W_Opcode $1 not in table, operands not checked'#000+ 'W_Opcode $1 not in table, operands not checked'#000+
'F_Internal Error in ConcatOpcode()'#000+ 'F_Internal Error in ConcatO','pcode()'#000+
'E_Invalid size in reference'#000+ 'E_Invalid size in reference'#000+
'E_Invalid middle sized oper','and'#000+ 'E_Invalid middle sized operand'#000+
'E_Invalid three operand opcode'#000+ 'E_Invalid three operand opcode'#000+
'E_Assembler syntax error'#000+ 'E_Assembler syntax error'#000+
'E_Invalid operand type'#000+ 'E_Invalid operand type'#000+
'E_Segment overrides not supported'#000+ 'E_Segment overrides not supported'#000+
'E_Invalid constant symbol $1'#000+ 'E_Invalid constant symbol $1'#000+
'F_Internal Errror converting binary'#000+ 'F_Internal Errror converting bi','nary'#000+
'F_Internal Errror converting hexadecimal'#000+ 'F_Internal Errror converting hexadecimal'#000+
'F_Internal Errror',' converting octal'#000+ 'F_Internal Errror converting octal'#000+
'E_Invalid constant expression'#000+ 'E_Invalid constant expression'#000+
'E_Unknown identifier: $1'#000+ 'E_Unknown identifier: $1'#000+
'E_Trying to define an index register more than once'#000+ 'E_Trying to define an index register more than once'#000+
'E_Invalid field specifier'#000+ 'E_Invalid field specifier'#000+
'F_Internal Error in BuildScaling()'#000+ 'F_Internal Error in BuildS','caling()'#000+
'E_Invalid scaling factor'#000+ 'E_Invalid scaling factor'#000+
'E_Invalid scaling value'#000+ 'E_Invalid scaling value'#000+
'E_Sca','ling value only allowed with index'#000+ 'E_Scaling value only allowed with index'#000+
'E_Invalid assembler syntax. No ref with brackets)'#000+ 'E_Invalid assembler syntax. No ref with brackets)'#000+
'E_Expressions of the form [sreg:reg...] are currently not supported'#000+ 'E_Expressions of the form [sreg:reg...] are currently not supported'#000+
'E_Trying to define a segment register twice'#000+ 'E_Trying to define a seg','ment register twice'#000+
'E_Trying to define a base register twice'#000+ 'E_Trying to define a base register twice'#000+
'E_','Trying to use a negative index register'#000+ 'E_Trying to use a negative index register'#000+
'E_Asm syntax error - error in reference'#000+ 'E_Asm syntax error - error in reference'#000+
'E_Local symbols not allowed as references'#000+ 'E_Local symbols not allowed as references'#000+
'E_Invalid operand in bracket expression'#000+ 'E_Invalid operand in bracket expression'#000+
'E_Invalid symbol name: $1'#000+ 'E_Invalid symbo','l name: $1'#000+
'E_Invalid Reference syntax'#000+ 'E_Invalid Reference syntax'#000+
'E_Invalid string as opcod','e operand: $1'#000+ 'E_Invalid string as opcode operand: $1'#000+
'W_@CODE and @DATA not supported'#000+ 'W_@CODE and @DATA not supported'#000+
'E_Null label references are not allowed'#000+ 'E_Null label references are not allowed'#000+
'W_Calling of an overloaded function in direct assembler'#000+ 'W_Calling of an overloaded function in direct assembler'#000+
'E_Cannot use SELF outside a method'#000+ 'E_Cannot use SELF outside a method'#000,+
'E_Asm syntax error - Should start with bracket'#000+ 'E_Asm syntax error - Should start with bracket'#000+
'E_Asm syntax err','or - register: $1'#000+ 'E_Asm syntax error - register: $1'#000+
'E_SEG and OFFSET not supported'#000+ 'E_SEG and OFFSET not supported'#000+
'E_Asm syntax error - in opcode operand'#000+ 'E_Asm syntax error - in opcode operand'#000+
'E_Invalid String expression'#000+ 'E_Invalid String expression'#000+
'E_Constant expression out of bounds'#000+ 'E_Constant expression out of bounds'#000+
'F_Internal Error in BuildConstant()'#000+ 'F_Internal Error in Build','Constant()'#000+
'W_A repeat prefix and a segment override on <= i386 ','may result in er'+ 'W_A repeat prefix and a segment override on <= i386 may result in erro'+
'rors if an interrupt occurs'#000+ 'rs if an interrupt occurs'#000+
'E_Invalid or missing opcode'#000+ 'E_Invalid or missing opcode'#000+
'E_Invalid combination of prefix and opcode: $1'#000+ 'E_Invalid combination of prefix and opcode: $1'#000+
'E_Invalid combination of override and opcode: $1'#000+ 'E_Invalid combination of override and opcode: $1'#000+
'E_Too many operands on line'#000+ 'E_Too man','y operands on line'#000+
'E_Duplicate local symbol: $1'#000+ 'E_Duplicate local symbol: $1'#000+
'E_Unknown label',' identifer: $1'#000+ 'E_Unknown label identifer: $1'#000+
'E_Assemble node syntax error'#000+ 'E_Assemble node syntax error'#000+
'E_Undefined local symbol: $1'#000+ 'E_Undefined local symbol: $1'#000+
'D_Starting intel styled assembler parsing...'#000+ 'D_Starting intel styled assembler parsing...'#000+
'D_Finished intel styled assembler parsing...'#000+ 'D_Finished intel styled assembler parsing...'#000+
'E_Not a directive or local symbol: $1'#000+ 'E_Not a direct','ive or local symbol: $1'#000+
'E_/ at beginning of line not allowed'#000+ 'E_/ at beginning of line not allowed'#000+
'E_','NOR not supported'#000+ 'E_NOR not supported'#000+
'E_Invalid floating point register name'#000+ 'E_Invalid floating point register name'#000+
'W_Modulo not supported'#000+ 'W_Modulo not supported'#000+
'E_Invalid floating point constant: $1'#000+ 'E_Invalid floating point constant: $1'#000+
'E_Size suffix and destination register do not match'#000+ 'E_Size suffix and destination register do not match'#000+
'E_Internal error in ConcatLabeledInstr()'#000+ 'E_Inter','nal error in ConcatLabeledInstr()'#000+
'W_Floating point binary repre','sentation ignored'#000+ 'W_Floating point binary representation ignored'#000+
'W_Floating point hexadecimal representation ignored'#000+ 'W_Floating point hexadecimal representation ignored'#000+
'W_Floating point octal representation ignored'#000+ 'W_Floating point octal representation ignored'#000+
'E_Invalid real constant expression'#000+ 'E_Invalid real constant expression'#000+
'E_Parenthesis are not allowed'#000+ 'E_Parenthesis are not allo','wed'#000+
'E_Invalid Reference'#000+ 'E_Invalid Reference'#000+
'E_Cannot use __SELF outside a method'#000+ 'E_Cannot use __SELF outside a method'#000+
'E_','Cannot use __OLDEBP outside a nested procedure'#000+ 'E_Cannot use __OLDEBP outside a nested procedure'#000+
'W_Identifier $1 supposed external'#000+ 'W_Identifier $1 supposed external'#000+
'E_Invalid segment override expression'#000+ 'E_Invalid segment override expression'#000+
'E_Strings not allowed as constants'#000+ 'E_Strings not allowed as constants'#000+
'D_Starting AT&T styled assembler parsing...'#000+ 'D_Starting AT&T styled ','assembler parsing...'#000+
'D_Finished AT&T styled assembler parsing..','.'#000+ 'D_Finished AT&T styled assembler parsing...'#000+
'E_Switching sections is not allowed in an assembler block'#000+ 'E_Switching sections is not allowed in an assembler block'#000+
'E_Invalid global definition'#000+ 'E_Invalid global definition'#000+
'E_Line separator expected'#000+ 'E_Line separator expected'#000+
'W_globl not supported'#000+ 'W_globl not supported'#000+
'W_align not supported'#000+ 'W_align not supported'#000+
'W_lcomm not supported'#000+ 'W_lcomm not support','ed'#000+
'W_comm not supported'#000+ 'W_comm not supported'#000+
'E_Invalid local common definition'#000+ 'E_Invalid local common definition'#000+
'E_Inv','alid global common definition'#000+ 'E_Invalid global common definition'#000+
'E_local symbol: $1 not found inside asm statement'#000+ 'E_local symbol: $1 not found inside asm statement'#000+
'E_assembler code not returned to text'#000+ 'E_assembler code not returned to text'#000+
'F_internal error in BuildReference()'#000+ 'F_internal error in BuildReference()'#000+
'E_invalid opcode size'#000+ 'E_invalid opcode size'#000,+
'W_NEAR ignored'#000+ 'W_NEAR ignored'#000+
'W_FAR ignored'#000+ 'W_FAR ignored'#000+
'D_Creating inline asm lookup table','s'#000+ 'D_Creating inline asm lookup tables'#000+
'E_Using a defined name as a local label'#000+ 'E_Using a defined name as a local label'#000+
'F_internal error in HandleExtend()'#000+ 'F_internal error in HandleExtend()'#000+
'E_Invalid character: <'#000+ 'E_Invalid character: <'#000+
'E_Invalid character: >'#000+ 'E_Invalid character: >'#000+
'E_Unsupported opcode'#000+ 'E_Unsupported opcode'#000+
'E_Increment and Decrement mode not allowed together'#000+ 'E_Increment and Decrement mode no','t allowed together'#000+
'E_Invalid Register list in movem/fmovem'#000+ 'E_Invalid Register list in movem/fmovem'#000+
'E_In','valid Register list for opcode'#000+ 'E_Invalid Register list for opcode'#000+
'E_68020+ mode required to assemble'#000+ 'E_68020+ mode required to assemble'#000+
'D_Starting Motorola styled assembler parsing...'#000+ 'D_Starting Motorola styled assembler parsing...'#000+
'D_Finished Motorola styled assembler parsing...'#000+ 'D_Finished Motorola styled assembler parsing...'#000+
'W_XDEF not supported'#000+ 'W_XDEF not supp','orted'#000+
'W_Functions with void return value can'#039't return any value',' in asm'+ 'W_Functions with void return value can'#039't return any value in asm c'+
' code'#000+ 'ode'#000+
'E_Invalid suffix for intel assembler'#000+ 'E_Invalid suffix for intel assembler'#000+
'E_Extended not supported in this mode'#000+ 'E_Extended not supported in this mode'#000+
'E_Comp not supported in this mode'#000+ 'E_Comp not supported in this mode'#000+
'W_You need GNU as version >= 2.81 to compile this MMX code'#000+ 'W_You need GNU as version >= 2.81 to compile this MMX c','ode'#000+
'F_Too many assembler files'#000+ 'F_Too many assembler files'#000+
'F_Selected assembler output not ','supported'#000+ 'F_Selected assembler output not supported'#000+
'E_Unsupported symbol type for operand'#000+ 'E_Unsupported symbol type for operand'#000+
'E_Cannot index a local var or parameter with a register'#000+ 'E_Cannot index a local var or parameter with a register'#000+
'W_Source operating system redefined'#000+ 'W_Source operating system redefined'#000+
'I_Assembling (pipe) $1'#000+ 'I_Assembling (pipe) $1'#000+
'E_Can'#039't create assember file $1'#000+ 'E_Can'#039't create',' assember file $1'#000+
'W_Assembler $1 not found, switching to extern','al assembling'#000+ 'W_Assembler $1 not found, switching to external assembling'#000+
'T_Using assembler: $1'#000+ 'T_Using assembler: $1'#000+
'W_Error while assembling exitcode $1'#000+ 'W_Error while assembling exitcode $1'#000+
'W_Can'#039't call the assembler, error $1 switching to external assembl'+ 'W_Can'#039't call the assembler, error $1 switching to external assembl'+
'ing'#000+ 'ing'#000+
'I_Assembling $1'#000+ 'I_Assembling $1'#000+
'W_Linker $1 not found, switching to external linking'#000+ 'W_Linker $1 not fo','und, switching to external linking'#000+
'T_Using linker: $1'#000+ 'T_Using linker: $1'#000+
'W_Object ','$1 not found, Linking may fail !'#000+ 'W_Object $1 not found, Linking may fail !'#000+
'W_Library $1 not found, Linking may fail !'#000+ 'W_Library $1 not found, Linking may fail !'#000+
'W_Error while linking'#000+ 'W_Error while linking'#000+
'W_Can'#039't call the linker, switching to external linking'#000+ 'W_Can'#039't call the linker, switching to external linking'#000+
'I_Linking $1'#000+ 'I_Linking $1'#000+
'W_binder not found, switching to external binding'#000+ 'W_binder no','t found, switching to external binding'#000+
'W_ar not found, switchin','g to external ar'#000+ 'W_ar not found, switching to external ar'#000+
'E_Dynamic Libraries not supported'#000+ 'E_Dynamic Libraries not supported'#000+
'I_Closing script $1'#000+ 'I_Closing script $1'#000+
'W_resource compiler not found, switching to external mode'#000+ 'W_resource compiler not found, switching to external mode'#000+
'I_Compiling resource $1'#000+ 'I_Compiling resource $1'#000+
'F_Can'#039't post process executable $1'#000+ 'F_Can'#039't post process exe','cutable $1'#000+
'F_Can'#039't open executable $1'#000+ 'F_Can'#039't open executable $1'#000+
'X_Size of Code: $1 bytes'#000,+ 'X_Size of Code: $1 bytes'#000+
'X_Size of initialized data: $1 bytes'#000+ 'X_Size of initialized data: $1 bytes'#000+
'X_Size of uninitialized data: $1 bytes'#000+ 'X_Size of uninitialized data: $1 bytes'#000+
'X_Stack space reserved: $1 bytes'#000+ 'X_Stack space reserved: $1 bytes'#000+
'X_Stack space commited: $1 bytes'#000+ 'X_Stack space commited: $1 bytes'#000+
'T_Unitsearch: $1'#000+ 'T_Unitsearch: $1'#000+
'T_PPU Loading $1'#000+ 'T_PPU Loading $1'#000+
'U_PPU Name: $1'#000+ 'U','_PPU Name: $1'#000+
'U_PPU Flags: $1'#000+ 'U_PPU Flags: $1'#000+
'U_PPU Crc: $1'#000+ 'U_PPU Crc: $1'#000+
'U_PPU Time: $1'#000+ 'U_PPU Time: $1'#000+
'U_PP','U File too short'#000+ 'U_PPU File too short'#000+
'U_PPU Invalid Header (no PPU at the begin)'#000+ 'U_PPU Invalid Header (no PPU at the begin)'#000+
'U_PPU Invalid Version $1'#000+ 'U_PPU Invalid Version $1'#000+
'U_PPU is compiled for an other processor'#000+ 'U_PPU is compiled for an other processor'#000+
'U_PPU is compiled for an other target'#000+ 'U_PPU is compiled for an other target'#000+
'U_PPU Source: $1'#000+ 'U_PPU Source:',' $1'#000+
'U_Writing $1'#000+ 'U_Writing $1'#000+
'F_Can'#039't Write PPU-File'#000+ 'F_Can'#039't Write PPU-File'#000+
'F_reading PPU-File'#000+ 'F_reading PPU-File'#000+
'F_un','expected end of PPU-File'#000+ 'F_unexpected end of PPU-File'#000+
'F_Invalid PPU-File entry: $1'#000+ 'F_Invalid PPU-File entry: $1'#000+
'F_PPU Dbx count problem'#000+ 'F_PPU Dbx count problem'#000+
'E_Illegal unit name: $1'#000+ 'E_Illegal unit name: $1'#000+
'F_Too much units'#000+ 'F_Too much units'#000+
'F_Circular unit reference between $1 and $2'#000+ 'F_Circular unit reference between $1 and $2'#000+
'F_Can'#039't compile unit $1, no sources available'#000+ 'F_Can'#039't compil','e unit $1, no sources available'#000+
'W_Compiling the system unit req','uires the -Us switch'#000+ 'W_Compiling the system unit requires the -Us switch'#000+
'F_There were $1 errors compiling module, stopping'#000+ 'F_There were $1 errors compiling module, stopping'#000+
'U_Load from $1 ($2) unit $3'#000+ 'U_Load from $1 ($2) unit $3'#000+
'U_Recompiling $1, checksum changed for $2'#000+ 'U_Recompiling $1, checksum changed for $2'#000+
'U_Recompiling unit, static lib is older than ppufile'#000+ 'U_Recompiling unit, static lib is ol','der than ppufile'#000+
'U_Recompiling unit, shared lib is older than p','pufile'#000+ 'U_Recompiling unit, shared lib is older than ppufile'#000+
'U_Recompiling unit, obj and asm are older than ppufile'#000+ 'U_Recompiling unit, obj and asm are older than ppufile'#000+
'U_Recompiling unit, obj is older than asm'#000+ 'U_Recompiling unit, obj is older than asm'#000+
'U_Parsing interface of $1'#000+ 'U_Parsing interface of $1'#000+
'U_Parsing implementation of $1'#000+ 'U_Parsing implementation of $1'#000+
'U_Second load for unit $1'#000+ 'U_Second load fo','r unit $1'#000+
'U_PPU Check file $1 time $2'#000+ 'U_PPU Check file $1 time $2'#000+
'$1 [options] <inputfile> ','[options]'#000+ '$1 [options] <inputfile> [options]'#000+
'W_Only one source file supported'#000+ 'W_Only one source file supported'#000+
'W_DEF file can be created only for OS/2'#000+ 'W_DEF file can be created only for OS/2'#000+
'E_nested response files are not supported'#000+ 'E_nested response files are not supported'#000+
'F_No source file name in command line'#000+ 'F_No source file name in command line'#000+
'E_Illegal parameter: $1'#000+ 'E_Illegal para','meter: $1'#000+
'H_-? writes help pages'#000+ 'H_-? writes help pages'#000+
'F_Too many config files nested',#000+ 'F_Too many config files nested'#000+
'F_Unable to open file $1'#000+ 'F_Unable to open file $1'#000+
'N_Reading further options from $1'#000+ 'N_Reading further options from $1'#000+
'W_Target is already set to: $1'#000+ 'W_Target is already set to: $1'#000+
'W_Shared libs not supported on DOS platform, reverting to static'#000+ 'W_Shared libs not supported on DOS platform, reverting to static'#000+
'F_too many IF(N)DEFs'#000+ 'F_too many IF(N)DEFs'#000,+
'F_too many ENDIFs'#000+ 'F_too many ENDIFs'#000+
'F_open conditional at the end of the file'#000+ 'F_open conditional at the end of the file'#000+
'W_D','ebug information generation is not supported by this executable'#000+ 'W_Debug information generation is not supported by this executable'#000+
'H_Try recompiling with -dGDB'#000+ 'H_Try recompiling with -dGDB'#000+
'W_You are using the obsolete switch $1'#000+ 'W_You are using the obsolete switch $1'#000+
'Free Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET'#000+ 'Free Pascal Compiler version $FPCVER [$FPCDAT','E] for $FPCTARGET'#000+
'Copyright (c) 1993-98 by Florian Klaempfl'#000+ 'Copyright (c) 1993-98 by Florian Klaempfl'#000+
'Fre','e Pascal Compiler version $FPCVER'#000+ 'Free Pascal Compiler version $FPCVER'#000+
#000+ #000+
'Compiler Date : $FPCDATE'#000+ 'Compiler Date : $FPCDATE'#000+
'Compiler Target: $FPCTARGET'#000+ 'Compiler Target: $FPCTARGET'#000+
#000+ #000+
'This program comes under the GNU General Public Licence'#000+ 'This program comes under the GNU General Public Licence'#000+
'For more information read COPYING.FPC'#000+ 'For more information read COPYI','NG.FPC'#000+
#000+ #000+
'Report bugs,suggestions etc to:'#000+ 'Report bugs,suggestions etc to:'#000+
' fpc-de','vel@vekoll.saturnus.vein.hu'#000+ ' fpc-devel@vekoll.saturnus.vein.hu'#000+
'**0*_put + after a boolean switch option to enable it, - to disable it'+ '**0*_put + after a boolean switch option to enable it, - to disable it'+
#000+ #000+
'**1a_the compiler doesn'#039't delete the generated assembler file'#000+ '**1a_the compiler doesn'#039't delete the generated assembler file'#000+
'**2al_list sourcecode lines in assembler file'#000+ '**2al_list sourc','ecode lines in assembler file'#000+
'*t1b_use EMS'#000+ '*t1b_use EMS'#000+
'**1B_build all modul','es'#000+ '**1B_build all modules'#000+
'**1C_code generation options'#000+ '**1C_code generation options'#000+
'3*2CD_create dynamic library'#000+ '3*2CD_create dynamic library'#000+
'**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#000+ '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#000+
'**2Ci_IO-checking'#000+ '**2Ci_IO-checking'#000+
'**2Cn_omit linking stage'#000+ '**2Cn_omit linking stage'#000+
'**2Co_check overflow of integer operations'#000+ '**2Co_check overflow ','of integer operations'#000+
'**2Cr_range checking'#000+ '**2Cr_range checking'#000+
'**2Cs<n>_set stack s','ize to <n>'#000+ '**2Cs<n>_set stack size to <n>'#000+
'**2Ct_stack checking'#000+ '**2Ct_stack checking'#000+
'3*2CS_create static library'#000+ '3*2CS_create static library'#000+
'3*2Cx_use smartlinking'#000+ '3*2Cx_use smartlinking'#000+
'**1d<x>_defines the symbol <x>'#000+ '**1d<x>_defines the symbol <x>'#000+
'*O1D_generate a DEF file'#000+ '*O1D_generate a DEF file'#000+
'*O2Dd<x>_set description to <x>'#000+ '*O2Dd<x>_set description to <x>'#000+
'*O2Dw_PM application'#000+ '*O2Dw_','PM application'#000+
'**1e<x>_set path to executable'#000+ '**1e<x>_set path to executable'#000+
'**1E_same as -Cn'#000,+ '**1E_same as -Cn'#000+
'**1F_set file names and paths'#000+ '**1F_set file names and paths'#000+
'**2FD<x>_sets the directory where to search for compiler utilities'#000+ '**2FD<x>_sets the directory where to search for compiler utilities'#000+
'**2Fe<x>_redirect error output to <x>'#000+ '**2Fe<x>_redirect error output to <x>'#000+
'**2FE<x>_set exe/unit output path to <x>'#000+ '**2FE<x>_set exe/unit output path to <x>'#000+
'*L2Fg<x>_same as -Fl'#000+ '*','L2Fg<x>_same as -Fl'#000+
'**2Fi<x>_adds <x> to include path'#000+ '**2Fi<x>_adds <x> to include path'#000+
'**2Fl<x>_','adds <x> to library path'#000+ '**2Fl<x>_adds <x> to library path'#000+
'*L2FL<x>_uses <x> as dynamic linker'#000+ '*L2FL<x>_uses <x> as dynamic linker'#000+
'**2Fo<x>_adds <x> to object path'#000+ '**2Fo<x>_adds <x> to object path'#000+
'**2Fr<x>_load error message file <x>'#000+ '**2Fr<x>_load error message file <x>'#000+
'**2Fu<x>_adds <x> to unit path'#000+ '**2Fu<x>_adds <x> to unit path'#000+
'**2FU<x>_set unit output path to <x>, overrides -FE'#000+ '**2FU<x>_set un','it output path to <x>, overrides -FE'#000+
'*g1g_generate debugger inf','ormation'#000+ '*g1g_generate debugger information'#000+
'*g2gg_use gsym'#000+ '*g2gg_use gsym'#000+
'*g2gd_use dbx'#000+ '*g2gd_use dbx'#000+
'*g2gh_use heap trace unit'#000+ '*g2gh_use heap trace unit'#000+
@ -560,101 +561,100 @@ const msgtxt : array[0..00097,1..240] of char=(
'**2iD_return compiler date'#000+ '**2iD_return compiler date'#000+
'**2iV_return compiler version'#000+ '**2iV_return compiler version'#000+
'**2iSO_return source OS'#000+ '**2iSO_return source OS'#000+
'**2iSP_return source processor'#000+ '**2iSP_return s','ource processor'#000+
'**2iTO_return target OS'#000+ '**2iTO_return target OS'#000+
'**2iTP_return target pr','ocessor'#000+ '**2iTP_return target processor'#000+
'**1I<x>_adds <x> to include path'#000+ '**1I<x>_adds <x> to include path'#000+
'**1k<x>_Pass <x> to the linker'#000+ '**1k<x>_Pass <x> to the linker'#000+
'**1l_write logo'#000+ '**1l_write logo'#000+
'**1n_don'#039't read the default config file'#000+ '**1n_don'#039't read the default config file'#000+
'**1o<x>_change the name of the executable produced to <x>'#000+ '**1o<x>_change the name of the executable produce','d to <x>'#000+
'**1pg_generate profile code for gprof'#000+ '**1pg_generate profile code for gprof'#000+
'*L1P_use pipes i','nstead of creating temporary assembler files'#000+ '*L1P_use pipes instead of creating temporary assembler files'#000+
'**1S_syntax options'#000+ '**1S_syntax options'#000+
'**2S2_switch some Delphi 2 extensions on'#000+ '**2S2_switch some Delphi 2 extensions on'#000+
'**2Sc_supports operators like C (*=,+=,/= and -=)'#000+ '**2Sc_supports operators like C (*=,+=,/= and -=)'#000+
'**2Sd_tries to be Delphi compatible'#000+ '**2Sd_tries to be Del','phi compatible'#000+
'**2Se_compiler stops after the first error'#000+ '**2Se_compiler stops after the first error'#000+
'**2Sg','_allow LABEL and GOTO'#000+ '**2Sg_allow LABEL and GOTO'#000+
'**2Sh_Use ansistrings'#000+ '**2Sh_Use ansistrings'#000+
'**2Si_support C++ stlyed INLINE'#000+ '**2Si_support C++ stlyed INLINE'#000+
'**2Sm_support macros like C (global)'#000+ '**2Sm_support macros like C (global)'#000+
'**2So_tries to be TP/BP 7.0 compatible'#000+ '**2So_tries to be TP/BP 7.0 compatible'#000+
'**2Sp_tries to be gpc compatible'#000+ '**2Sp_tries to be gpc com','patible'#000+
'**2Ss_constructor name must be init (destructor must be',' done)'#000+ '**2Ss_constructor name must be init (destructor must be done)'#000+
'**2St_allow static keyword in objects'#000+ '**2St_allow static keyword in objects'#000+
'**1s_don'#039't call assembler and linker (only with -a)'#000+ '**1s_don'#039't call assembler and linker (only with -a)'#000+
'**1u<x>_undefines the symbol <x>'#000+ '**1u<x>_undefines the symbol <x>'#000+
'**1U_unit options'#000+ '**1U_unit options'#000+
'**2Un_don'#039't check the unit name'#000+ '**2Un_don'#039't check the unit na','me'#000+
'**2Up<x>_same as -Fu<x>'#000+ '**2Up<x>_same as -Fu<x>'#000+
'**2Us_compile a system unit'#000+ '**2Us_compile a system unit'#000+
'**1v<x>_','Be verbose. <x> is a combination of the following letters :'#000+ '**1v<x>_Be verbose. <x> is a combination of the following letters :'#000+
'**2*_e : Show errors (default) d : Show debug info'#000+ '**2*_e : Show errors (default) d : Show debug info'#000+
'**2*_w : Show warnings u : Show unit info'#000+ '**2*_w : Show warnings u : Show unit info'#000+
'**2*_n : Show notes t : Show tried/used files'#000+ '**2*','_n : Show notes t : Show tried/used files'#000+
'**2*','_h : Show hints m : Show defined macros'#000+ '**2*_h : Show hints m : Show defined macros'#000+
'**2*_i : Show general info p : Show compiled procedures'#000+ '**2*_i : Show general info p : Show compiled procedures'#000+
'**2*_l : Show linenumbers c : Show conditionals'#000+ '**2*_l : Show linenumbers c : Show conditio','nals'#000+
'**2*_a : Show everything 0 : Show nothing (exc','ept errors'+ '**2*_a : Show everything 0 : Show nothing (except errors)'#000+
')'#000+
'**2*_b : Show all procedure r : Rhide/GCC compatibility mode'#000+ '**2*_b : Show all procedure r : Rhide/GCC compatibility mode'#000+
'**2*_ declarations if an error x : Executable info (Win32 only)'#000+ '**2*_ declarations if an error x : Executable info (Win32 only)'#000+
'**2*_ occurs'#000+ '**2*_ occurs'#000+
'**1X_executable options'#000+ '**1X_exec','utable options'#000+
'*L2Xc_link with the c library'#000+ '*L2Xc_link with the c library'#000+
'**2XD_link with dy','namic libraries (defines FPC_LINK_DYNAMIC)'#000+ '**2XD_link with dynamic libraries (defines FPC_LINK_DYNAMIC)'#000+
'**2Xs_strip all symbols from executable'#000+ '**2Xs_strip all symbols from executable'#000+
'**2XS_link with static libraries (defines FPC_LINK_STATIC)'#000+ '**2XS_link with static libraries (defines FPC_LINK_STATIC)'#000+
'**0*_Processor specific options:'#000+ '**0*_Processor specific options:'#000+
'3*1A<x>_output format'#000+ '3*','1A<x>_output format'#000+
'3*2Ao_coff file using GNU AS'#000+ '3*2Ao_coff file using GNU AS'#000+
'3*2Anasmcoff_c','off file using Nasm'#000+ '3*2Anasmcoff_coff file using Nasm'#000+
'3*2Anasmelf_elf32 (linux) file using Nasm'#000+ '3*2Anasmelf_elf32 (linux) file using Nasm'#000+
'3*2Anasmobj_obj file using Nasm'#000+ '3*2Anasmobj_obj file using Nasm'#000+
'3*2Amasm_obj using Masm (Mircosoft)'#000+ '3*2Amasm_obj using Masm (Mircosoft)'#000+
'3*2Atasm_obj using Tasm (Borland)'#000+ '3*2Atasm_obj using Tasm (Borland)'#000+
'3*1R<x>_assembler reading style'#000+ '3*1R<x>_assem','bler reading style'#000+
'3*2Ratt_read AT&T style assembler'#000+ '3*2Ratt_read AT&T style assembler'#000+
'3*2Rintel_','read Intel style assembler'#000+ '3*2Rintel_read Intel style assembler'#000+
'3*2Rdirect_copy assembler text directly to assembler file'#000+ '3*2Rdirect_copy assembler text directly to assembler file'#000+
'3*1O<x>_optimizations'#000+ '3*1O<x>_optimizations'#000+
'3*2Og_generate smaller code'#000+ '3*2Og_generate smaller code'#000+
'3*2OG_generate faster code (default)'#000+ '3*2OG_generate faster code (default)'#000+
'3*2Or_keep certain variables in registers (still BUGGY!!!)'#000+ '3*2Or','_keep certain variables in registers (still BUGGY!!!)'#000+
'3*2Ou_ena','ble uncertain optimizations (see docs)'#000+ '3*2Ou_enable uncertain optimizations (see docs)'#000+
'3*2O1_level 1 optimizations (quick optimizations)'#000+ '3*2O1_level 1 optimizations (quick optimizations)'#000+
'3*2O2_level 2 optimizations (-O1 + slower optimizations)'#000+ '3*2O2_level 2 optimizations (-O1 + slower optimizations)'#000+
'3*2O3_level 3 optimizations (same as -O2u)'#000+ '3*2O3_level 3 optimizations (sa','me as -O2u)'#000+
'3*2Op_target processor'#000+ '3*2Op_target processor'#000+
'3*3Op1_set target processor ','to 386/486'#000+ '3*3Op1_set target processor to 386/486'#000+
'3*3Op2_set target processor to Pentium/PentiumMMX (tm)'#000+ '3*3Op2_set target processor to Pentium/PentiumMMX (tm)'#000+
'3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)'#000+ '3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)'#000+
'3*1T<x>_Target operating system'#000+ '3*1T<x>_Target operating system'#000+
'3*2TGO32V1_version 1 of DJ Delorie DOS extender'#000+ '3*2TGO32V1_version 1 of D','J Delorie DOS extender'#000+
'3*2TGO32V2_version 2 of DJ Delorie DOS e','xtender'#000+ '3*2TGO32V2_version 2 of DJ Delorie DOS extender'#000+
'3*2TLINUX_Linux'#000+ '3*2TLINUX_Linux'#000+
'3*2TOS2_OS/2 2.x'#000+ '3*2TOS2_OS/2 2.x'#000+
'3*2TWin32_Windows 32 Bit'#000+ '3*2TWin32_Windows 32 Bit'#000+
'6*1A<x>_output format'#000+ '6*1A<x>_output format'#000+
'6*2Ao_Unix o-file using GNU AS'#000+ '6*2Ao_Unix o-file using GNU AS'#000+
'6*2Agas_GNU Motorola assembler'#000+ '6*2Agas_GNU Motorola assembler'#000+
'6*2Amit_MIT Syntax (old GAS)'#000+ '6*2Amit_MIT Syntax (old GAS',')'#000+
'6*2Amot_Standard Motorola assembler'#000+ '6*2Amot_Standard Motorola assembler'#000+
'6*1O_optimizations'#000+ '6*1O_optimizations'#000+
'6*2Oa_','turn on the optimizer'#000+ '6*2Oa_turn on the optimizer'#000+
'6*2Og_generate smaller code'#000+ '6*2Og_generate smaller code'#000+
'6*2OG_generate faster code (default)'#000+ '6*2OG_generate faster code (default)'#000+
'6*2Ox_optimize maximum (still BUGGY!!!)'#000+ '6*2Ox_optimize maximum (still BUGGY!!!)'#000+
'6*2O2_set target processor to a MC68020+'#000+ '6*2O2_set target processor to a MC68020+'#000+
'6*1R<x>_assembler reading style'#000+ '6*1R<x>_a','ssembler reading style'#000+
'6*2RMOT_read motorola style assembler'#000+ '6*2RMOT_read motorola style assembler'#000+
'6*','1T<x>_Target operating system'#000+ '6*1T<x>_Target operating system'#000+
'6*2TAMIGA_Commodore Amiga'#000+ '6*2TAMIGA_Commodore Amiga'#000+
'6*2TATARI_Atari ST/STe/TT'#000+ '6*2TATARI_Atari ST/STe/TT'#000+
'6*2TMACOS_Macintosh m68k'#000+ '6*2TMACOS_Macintosh m68k'#000+
'6*2TLINUX_Linux-68k'#000+ '6*2TLINUX_Linux-68k'#000+
'**1*_'#000+ '**1*_'#000+
'**1?_shows this help'#000+ '**1?_shows this help'#000+
'**1h_shows this help without waiting'#000 '**1h_shows this help wi','thout waiting'#000
); );

11
compiler/pexpr.pas
View File

@ -695,7 +695,9 @@ unit pexpr;
Message(parser_e_only_class_methods_via_class_ref); Message(parser_e_only_class_methods_via_class_ref);
if (sym^.properties and sp_static)<>0 then if (sym^.properties and sp_static)<>0 then
begin begin
static_name:=lower(srsymtable^.name^)+'_'+sym^.name; { static_name:=lower(srsymtable^.name^)+'_'+sym^.name;
this is wrong for static field in with symtable (PM) }
static_name:=lower(srsym^.owner^.name^)+'_'+sym^.name;
getsym(static_name,true); getsym(static_name,true);
disposetree(p1); disposetree(p1);
p1:=genloadnode(pvarsym(srsym),srsymtable); p1:=genloadnode(pvarsym(srsym),srsymtable);
@ -863,7 +865,7 @@ unit pexpr;
Message(parser_e_only_class_methods); Message(parser_e_only_class_methods);
if (srsym^.properties and sp_static)<>0 then if (srsym^.properties and sp_static)<>0 then
begin begin
static_name:=lower(srsymtable^.name^)+'_'+srsym^.name; static_name:=lower(srsym^.owner^.name^)+'_'+srsym^.name;
getsym(static_name,true); getsym(static_name,true);
end; end;
p1:=genloadnode(pvarsym(srsym),srsymtable); p1:=genloadnode(pvarsym(srsym),srsymtable);
@ -1928,7 +1930,10 @@ unit pexpr;
end. end.
{ {
$Log$ $Log$
Revision 1.79 1998-12-30 22:15:48 peter Revision 1.80 1999-01-21 16:41:01 pierre
* fix for constructor inside with statements
Revision 1.79 1998/12/30 22:15:48 peter
+ farpointer type + farpointer type
* absolutesym now also stores if its far * absolutesym now also stores if its far

25
compiler/pstatmnt.pas
View File

@ -374,19 +374,7 @@ unit pstatmnt;
case p^.resulttype^.deftype of case p^.resulttype^.deftype of
objectdef : begin objectdef : begin
obj:=pobjectdef(p^.resulttype); obj:=pobjectdef(p^.resulttype);
{ this creates the stack in the wrong order !! withsymtable:=new(pwithsymtable,init);
levelcount:=0;
while assigned(obj) do
begin
symtab:=obj^.publicsyms;
withsymtable:=new(psymtable,init(symtable.withsymtable));
withsymtable^.root:=symtab^.root;
withsymtable^.next:=symtablestack;
symtablestack:=withsymtable;
obj:=obj^.childof;
inc(levelcount);
end; }
withsymtable:=new(psymtable,init(symtable.withsymtable));
withsymtable^.root:=obj^.publicsyms^.root; withsymtable^.root:=obj^.publicsyms^.root;
withsymtable^.defowner:=obj; withsymtable^.defowner:=obj;
symtab:=withsymtable; symtab:=withsymtable;
@ -394,7 +382,7 @@ unit pstatmnt;
obj:=obj^.childof; obj:=obj^.childof;
while assigned(obj) do while assigned(obj) do
begin begin
symtab^.next:=new(psymtable,init(symtable.withsymtable)); symtab^.next:=new(pwithsymtable,init);
symtab:=symtab^.next; symtab:=symtab^.next;
symtab^.root:=obj^.publicsyms^.root; symtab^.root:=obj^.publicsyms^.root;
symtab^.defowner:=obj; symtab^.defowner:=obj;
@ -407,7 +395,7 @@ unit pstatmnt;
recorddef : begin recorddef : begin
symtab:=precdef(p^.resulttype)^.symtable; symtab:=precdef(p^.resulttype)^.symtable;
levelcount:=1; levelcount:=1;
withsymtable:=new(psymtable,init(symtable.withsymtable)); withsymtable:=new(pwithsymtable,init);
withsymtable^.root:=symtab^.root; withsymtable^.root:=symtab^.root;
withsymtable^.next:=symtablestack; withsymtable^.next:=symtablestack;
withsymtable^.defowner:=obj; withsymtable^.defowner:=obj;
@ -433,7 +421,7 @@ unit pstatmnt;
end; end;
for i:=1 to levelcount do for i:=1 to levelcount do
symtablestack:=symtablestack^.next; symtablestack:=symtablestack^.next;
_with_statement:=genwithnode(withsymtable,p,right,levelcount); _with_statement:=genwithnode(pwithsymtable(withsymtable),p,right,levelcount);
end end
else else
begin begin
@ -1259,7 +1247,10 @@ unit pstatmnt;
end. end.
{ {
$Log$ $Log$
Revision 1.58 1999-01-05 08:20:07 florian Revision 1.59 1999-01-21 16:41:02 pierre
* fix for constructor inside with statements
Revision 1.58 1999/01/05 08:20:07 florian
* mainly problem with invalid case ranges fixed (reported by Jonas) * mainly problem with invalid case ranges fixed (reported by Jonas)
Revision 1.57 1998/12/29 18:48:15 jonas Revision 1.57 1998/12/29 18:48:15 jonas

16
compiler/tccal.pas
View File

@ -924,11 +924,16 @@ implementation
typen,hnewn : ; typen,hnewn : ;
else else
begin begin
{ if ((p^.procdefinition^.options and (poconstructor or podestructor)) <> 0) and {$ifndef NODIRECTWITH}
(assigned(p^.symtable) and (p^.symtable^.symtabletype=withsymtable) then if ((p^.procdefinition^.options and (poconstructor or podestructor)) <> 0) and
assigned(p^.symtable) and (p^.symtable^.symtabletype=withsymtable) and
not pwithsymtable(p^.symtable)^.direct_with then
begin begin
CGmessage(cg_e_cannot_call_cons_dest_inside_with); CGmessage(cg_e_cannot_call_cons_dest_inside_with);
end; Is accpeted by Delphi !! } end; { Is accepted by Delphi !! }
{ this is not a good reason to accept it in FPC if we produce
wrong code for it !!! (PM) }
{$endif ndef NODIRECTWITH}
{ R.Assign is not a constructor !!! } { R.Assign is not a constructor !!! }
{ but for R^.Assign, R must be valid !! } { but for R^.Assign, R must be valid !! }
@ -994,7 +999,10 @@ implementation
end. end.
{ {
$Log$ $Log$
Revision 1.19 1999-01-19 14:20:16 peter Revision 1.20 1999-01-21 16:41:06 pierre
* fix for constructor inside with statements
Revision 1.19 1999/01/19 14:20:16 peter
* fixed [char] crash * fixed [char] crash
Revision 1.18 1999/01/12 14:25:40 peter Revision 1.18 1999/01/12 14:25:40 peter

21
compiler/tcld.pas
View File

@ -54,7 +54,23 @@ implementation
*****************************************************************************} *****************************************************************************}
procedure firstload(var p : ptree); procedure firstload(var p : ptree);
var
p1 : ptree;
begin begin
{$ifndef NODIRECTWITH}
if (p^.symtable^.symtabletype=withsymtable) and
(pwithsymtable(p^.symtable)^.direct_with) then
begin
p1:=getcopy(ptree(pwithsymtable(p^.symtable)^.withnode)^.left);
p1:=gensubscriptnode(pvarsym(p^.symtableentry),p1);
putnode(p);
p:=p1;
firstpass(p1);
exit;
end;
{$endif ndef NODIRECTWITH}
p^.location.loc:=LOC_REFERENCE; p^.location.loc:=LOC_REFERENCE;
p^.registers32:=0; p^.registers32:=0;
p^.registersfpu:=0; p^.registersfpu:=0;
@ -421,7 +437,10 @@ implementation
end. end.
{ {
$Log$ $Log$
Revision 1.12 1998-12-30 13:41:19 peter Revision 1.13 1999-01-21 16:41:07 pierre
* fix for constructor inside with statements
Revision 1.12 1998/12/30 13:41:19 peter
* released valuepara * released valuepara
Revision 1.11 1998/11/18 17:45:28 peter Revision 1.11 1998/11/18 17:45:28 peter

22
compiler/tcmem.pas
View File

@ -510,13 +510,28 @@ implementation
*****************************************************************************} *****************************************************************************}
procedure firstwith(var p : ptree); procedure firstwith(var p : ptree);
var
symtable : pwithsymtable;
i : longint;
begin begin
if assigned(p^.left) and assigned(p^.right) then if assigned(p^.left) and assigned(p^.right) then
begin begin
firstpass(p^.left); firstpass(p^.left);
if codegenerror then if codegenerror then
exit; exit;
{$ifndef NODIRECTWITH}
if (p^.left^.treetype=loadn) and
(p^.left^.symtable=aktprocsym^.definition^.localst) then
begin
symtable:=p^.withsymtable;
for i:=1 to p^.tablecount do
begin
symtable^.direct_with:=true;
symtable^.withnode:=p;
symtable:=pwithsymtable(symtable^.next);
end;
end;
{$endif ndef NODIRECTWITH}
firstpass(p^.right); firstpass(p^.right);
if codegenerror then if codegenerror then
exit; exit;
@ -536,7 +551,10 @@ implementation
end. end.
{ {
$Log$ $Log$
Revision 1.7 1998-12-30 22:15:59 peter Revision 1.8 1999-01-21 16:41:08 pierre
* fix for constructor inside with statements
Revision 1.7 1998/12/30 22:15:59 peter
+ farpointer type + farpointer type
* absolutesym now also stores if its far * absolutesym now also stores if its far

17
compiler/tree.pas
View File

@ -260,7 +260,8 @@ unit tree;
asmn : (p_asm : paasmoutput;object_preserved : boolean); asmn : (p_asm : paasmoutput;object_preserved : boolean);
casen : (nodes : pcaserecord;elseblock : ptree); casen : (nodes : pcaserecord;elseblock : ptree);
labeln,goton : (labelnr : plabel); labeln,goton : (labelnr : plabel);
withn : (withsymtable : psymtable;tablecount : longint); withn : (withsymtable : pwithsymtable;tablecount : longint;
pref : preference);
onn : (exceptsymtable : psymtable;excepttype : pobjectdef); onn : (exceptsymtable : psymtable;excepttype : pobjectdef);
arrayconstructn : (cargs,cargswap: boolean); arrayconstructn : (cargs,cargswap: boolean);
end; end;
@ -297,7 +298,7 @@ unit tree;
function genloopnode(t : ttreetyp;l,r,n1: ptree;back : boolean) : ptree; function genloopnode(t : ttreetyp;l,r,n1: ptree;back : boolean) : ptree;
function genasmnode(p_asm : paasmoutput) : ptree; function genasmnode(p_asm : paasmoutput) : ptree;
function gencasenode(l,r : ptree;nodes : pcaserecord) : ptree; function gencasenode(l,r : ptree;nodes : pcaserecord) : ptree;
function genwithnode(symtable : psymtable;l,r : ptree;count : longint) : ptree; function genwithnode(symtable : pwithsymtable;l,r : ptree;count : longint) : ptree;
function getcopy(p : ptree) : ptree; function getcopy(p : ptree) : ptree;
@ -477,7 +478,7 @@ unit tree;
procedure disposetree(p : ptree); procedure disposetree(p : ptree);
var var
symt : psymtable; symt : pwithsymtable;
i : longint; i : longint;
begin begin
@ -549,7 +550,7 @@ unit tree;
begin begin
if assigned(symt) then if assigned(symt) then
begin begin
p^.withsymtable:=symt^.next; p^.withsymtable:=pwithsymtable(symt^.next);
dispose(symt,done); dispose(symt,done);
end; end;
symt:=p^.withsymtable; symt:=p^.withsymtable;
@ -572,7 +573,7 @@ unit tree;
p^.fileinfo:=filepos; p^.fileinfo:=filepos;
end; end;
function genwithnode(symtable : psymtable;l,r : ptree;count : longint) : ptree; function genwithnode(symtable : pwithsymtable;l,r : ptree;count : longint) : ptree;
var var
p : ptree; p : ptree;
@ -593,6 +594,7 @@ unit tree;
p^.resulttype:=nil; p^.resulttype:=nil;
p^.withsymtable:=symtable; p^.withsymtable:=symtable;
p^.tablecount:=count; p^.tablecount:=count;
p^.pref:=nil;
set_file_line(l,p); set_file_line(l,p);
genwithnode:=p; genwithnode:=p;
end; end;
@ -1661,7 +1663,10 @@ unit tree;
end. end.
{ {
$Log$ $Log$
Revision 1.60 1998-12-15 11:52:19 peter Revision 1.61 1999-01-21 16:41:09 pierre
* fix for constructor inside with statements
Revision 1.60 1998/12/15 11:52:19 peter
* fixed dup release of statement label in case * fixed dup release of statement label in case
Revision 1.59 1998/12/15 10:23:32 peter Revision 1.59 1998/12/15 10:23:32 peter