aggpas: debugging svg

git-svn-id: trunk@23029 -
This commit is contained in:
mattias 2009-12-08 14:39:09 +00:00
parent 2d5f135ee2
commit 764960184d
3 changed files with 34 additions and 6 deletions

View File

@ -67,6 +67,9 @@ begin
try
getmem(ptr ,sz );
{$IFDEF EXPAT_CLEARMEM}
FillByte(ptr^,sz,0);
{$ENDIF}
result:=true;

View File

@ -7,6 +7,7 @@
{$ENDIF }
{DEFINE EXPAT_DEBUG }
{$DEFINE EXPAT_CLEARMEM}
//----------------------------------------------------------------------------

View File

@ -2296,6 +2296,7 @@ label
_break ;
begin
writeln('doContent FFF1 ',Assigned(parser.m_startElementHandler));
{ save one level of indirection }
temp:=nil;
dtd:=parser.m_dtd;
@ -2316,6 +2317,7 @@ begin
eventPP^:=s;
repeat
writeln('doContent FFF2 ');
next:=s; { XmlContentTok doesn't always set the last arg }
tok:=XmlContentTok(enc ,pointer(s ) ,pointer(end_ ) ,@next );
@ -2451,6 +2453,7 @@ begin
XML_TOK_ENTITY_REF :
begin
writeln('doContent FFF3 ');
ch:=
XML_Char(XmlPredefinedEntityName(
enc ,
@ -2465,6 +2468,7 @@ begin
if @parser.m_defaultHandler <> NIL then
reportDefault(parser ,enc ,s ,next );
writeln('doContent FFF4 ');
goto _break;
end;
@ -2601,8 +2605,10 @@ begin
XML_TOK_START_TAG_NO_ATTS ,XML_TOK_START_TAG_WITH_ATTS :
begin
writeln('doContent FFF5 ');
if parser.m_freeTagList <> NIL then
begin
writeln('doContent FFF5.1 ');
tag:=parser.m_freeTagList;
parser.m_freeTagList:=parser.m_freeTagList.parent;
@ -2610,6 +2616,7 @@ begin
end
else
begin
writeln('doContent FFF5.2 ');
parser.m_mem.malloc_fcn(pointer(tag ) ,sizeof(expat.TAG ) );
if tag = NIL then
@ -2619,6 +2626,7 @@ begin
exit;
end;
FillByte(tag^,SizeOf(expat.tag),0); // MG
parser.m_mem.malloc_fcn(pointer(tag.buf ) ,INIT_TAG_BUF_SIZE );
@ -2638,6 +2646,7 @@ begin
end;
writeln('doContent FFF6 ');
tag.bindings :=NIL;
tag.parent :=parser.m_tagStack;
parser.m_tagStack :=tag;
@ -2653,6 +2662,7 @@ begin
toPtr :=XML_Char_ptr(tag.buf );
repeat
writeln('doContent FFF7 temp=',HexStr(Cardinal(temp),8));
XmlConvert(
enc ,
@fromPtr ,rawNameEnd ,
@ -2660,16 +2670,20 @@ begin
convLen:=(ptrcomp(toPtr ) - ptrcomp(tag.buf ) ) div sizeof(XML_Char );
writeln('doContent FFF8 temp=',HexStr(Cardinal(temp),8));
if fromPtr = rawNameEnd then
begin
tag.name.strLen:=convLen;
writeln('doContent FFF9 ');
break;
end;
writeln('doContent FFF10 temp=',HexStr(Cardinal(temp),8));
bufSize:=(ptrcomp(tag.bufEnd ) - ptrcomp(tag.buf ) ) shl 1;
writeln('doContent FFF11 temp=',HexStr(Cardinal(temp),8));
parser.m_mem.realloc_fcn(pointer(tag.buf ) ,tag.alloc ,bufSize );
if temp = NIL then
@ -2693,15 +2707,17 @@ begin
toPtr^ :=XML_T(#0 );
result_:=storeAtts(parser ,enc ,s ,@tag.name ,@tag.bindings );
writeln('doContent FFF12 ',tag.name.str^);
if result_ <> XML_Error(0 ) then
begin
writeln('doContent FFF13 ',tag.name.str^);
result:=result_;
exit;
end;
writeln('doContent FFF14 ');
if @parser.m_startElementHandler <> NIL then
parser.m_startElementHandler(
parser.m_handlerArg ,tag.name.str ,
@ -2710,6 +2726,7 @@ begin
if @parser.m_defaultHandler <> NIL then
reportDefault(parser ,enc ,s ,next );
writeln('doContent FFF15 ');
poolClear(@parser.m_tempPool );
end;
@ -3142,10 +3159,12 @@ var
result_ : XML_Error;
begin
writeln('contentProcessor EEE1 ',Assigned(parser.m_startElementHandler));
result_:=
doContent(
parser ,0 ,parser.m_encoding ,start ,end_ ,
endPtr ,XML_Bool(not parser.m_parsingStatus.finalBuffer ) );
writeln('contentProcessor EEE2');
if result_ = XML_ERROR_NONE then
if storeRawNames(parser ) = 0 then
@ -4251,9 +4270,9 @@ begin
{$ENDIF }
parser.m_processor:=@contentProcessor;
writeln('doProlog DDD1');
result:=contentProcessor(parser ,s ,end_ ,nextPtr );
writeln('doProlog DDD3');
exit;
end;
@ -5693,12 +5712,12 @@ var
begin
next:=s;
tok :=XmlPrologTok(parser.m_encoding ,pointer(s ) ,pointer(end_ ) ,@next );
writeln('prologProcessor CCC1');
result:=
doProlog(
parser ,parser.m_encoding ,s ,end_ ,tok ,next ,
nextPtr ,XML_Bool(not parser.m_parsingStatus.finalBuffer ) );
writeln('prologProcessor CCC2');
end;
{ prologInitProcessor }
@ -5707,7 +5726,10 @@ var
result_ : XML_Error;
begin
writeln('prologInitProcessor BBB1 ',HexStr(Cardinal(parser),8));
writeln('prologInitProcessor BBB1.2 ',Assigned(parser.m_processor));
result_:=initializeEncoding(parser );
writeln('prologInitProcessor BBB2 ',HexStr(Cardinal(parser),8));
if result_ <> XML_ERROR_NONE then
begin
@ -5716,9 +5738,11 @@ begin
exit;
end;
writeln('prologInitProcessor BBB3 ',HexStr(Cardinal(parser),8));
parser.m_processor:=@prologProcessor;
//writeln('prologInitProcessor BBB1');
writeln('prologInitProcessor BBB4 ',HexStr(Cardinal(parser),8));
result:=prologProcessor(parser ,s ,end_ ,nextPtr );
end;