mirror of
https://github.com/gnustep/libs-gsweb.git
synced 2025-05-31 01:01:19 +00:00
rename all *.framework top level directories to their basename.
* GSWDatabase/WODisplayGroup.m remove local NSAutoreleasePool adjust makefiles git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@30698 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Dave Wetzel
parent
93f2b82324
commit
bd96878757
409 changed files with 25 additions and 23 deletions
650
GSWeb/GSWHTMLRawParser.m
Normal file
650
GSWeb/GSWHTMLRawParser.m
Normal file
|
|
@ -0,0 +1,650 @@
|
|||
/** GSWHTMLRawParser.m - <title>GSWeb: Class GSWHTMLRawParser</title>
|
||||
|
||||
Copyright (C) 2004 Free Software Foundation, Inc.
|
||||
|
||||
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
|
||||
Date: Mar 2004
|
||||
|
||||
$Revision$
|
||||
$Date$
|
||||
$Id$
|
||||
|
||||
<abstract></abstract>
|
||||
|
||||
This file is part of the GNUstep Web Library.
|
||||
|
||||
<license>
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Library General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2 of the License, or (at your option) any later version.
|
||||
|
||||
This library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Library General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Library General Public
|
||||
License along with this library; if not, write to the Free
|
||||
Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
</license>
|
||||
**/
|
||||
|
||||
#include "config.h"
|
||||
|
||||
RCS_ID("$Id$")
|
||||
|
||||
#include "GSWeb.h"
|
||||
|
||||
#include "GSWHTMLRawParser.h"
|
||||
|
||||
//strlen("gsweb")
|
||||
#define GSWEB_TAG_LENGTH 5
|
||||
//strlen("webobject")
|
||||
#define WO_TAG_LENGTH 9
|
||||
//strlen("!--")
|
||||
#define COMMENT_TAG_LENGTH 3
|
||||
|
||||
static GSWHTMLRawParserTagType GetTagType(unichar* uniBuf,int length,int* indexPtr,BOOL* isClosingTagPtr)
|
||||
{
|
||||
GSWHTMLRawParserTagType tagType=GSWHTMLRawParserTagType_unknown;
|
||||
NSCAssert(*indexPtr<length,@"End of buffer");
|
||||
if (uniBuf[(*indexPtr)]=='/')
|
||||
{
|
||||
*isClosingTagPtr=YES;
|
||||
(*indexPtr)++;
|
||||
}
|
||||
else
|
||||
*isClosingTagPtr=NO;
|
||||
if (*indexPtr>=length)
|
||||
{
|
||||
[NSException raise:NSInvalidArgumentException
|
||||
format:@"End of buffer reached while geting tag type"];
|
||||
};
|
||||
switch(uniBuf[(*indexPtr)])
|
||||
{
|
||||
case 'g':
|
||||
case 'G':
|
||||
if ((*indexPtr)+GSWEB_TAG_LENGTH<length
|
||||
&& tolower(uniBuf[(*indexPtr)+1])=='s'
|
||||
&& tolower(uniBuf[(*indexPtr)+2])=='w'
|
||||
&& tolower(uniBuf[(*indexPtr)+3])=='e'
|
||||
&& tolower(uniBuf[(*indexPtr)+4])=='b')
|
||||
{
|
||||
(*indexPtr)+=GSWEB_TAG_LENGTH;
|
||||
tagType=GSWHTMLRawParserTagType_gsweb;
|
||||
}
|
||||
break;
|
||||
case 'w':
|
||||
case 'W':
|
||||
if ((*indexPtr)+WO_TAG_LENGTH<length
|
||||
&& tolower(uniBuf[(*indexPtr)+1])=='e'
|
||||
&& tolower(uniBuf[(*indexPtr)+2])=='b'
|
||||
&& tolower(uniBuf[(*indexPtr)+3])=='o'
|
||||
&& tolower(uniBuf[(*indexPtr)+4])=='b'
|
||||
&& tolower(uniBuf[(*indexPtr)+5])=='j'
|
||||
&& tolower(uniBuf[(*indexPtr)+6])=='e'
|
||||
&& tolower(uniBuf[(*indexPtr)+7])=='c'
|
||||
&& tolower(uniBuf[(*indexPtr)+8])=='t')
|
||||
{
|
||||
(*indexPtr)+=WO_TAG_LENGTH;
|
||||
tagType=GSWHTMLRawParserTagType_wo;
|
||||
};
|
||||
break;
|
||||
case '#':
|
||||
(*indexPtr)+=1;
|
||||
tagType=GSWHTMLRawParserTagType_oog;
|
||||
break;
|
||||
case '!':
|
||||
if ((*indexPtr)+COMMENT_TAG_LENGTH<length
|
||||
&& tolower(uniBuf[(*indexPtr)+1])=='-'
|
||||
&& tolower(uniBuf[(*indexPtr)+2])=='-')
|
||||
{
|
||||
(*indexPtr)+=COMMENT_TAG_LENGTH;
|
||||
tagType=GSWHTMLRawParserTagType_comment;
|
||||
};
|
||||
break;
|
||||
default:
|
||||
tagType=GSWHTMLRawParserTagType_unknown;
|
||||
break;
|
||||
};
|
||||
return tagType;
|
||||
};
|
||||
|
||||
|
||||
//====================================================================
|
||||
@implementation GSWHTMLRawParser
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
+(GSWHTMLRawParser*)parserWithDelegate:(id<GSWTemplateParserDelegate>)delegate
|
||||
htmlString:(NSString*)htmlString
|
||||
{
|
||||
return [[[self alloc]initWithDelegate:delegate
|
||||
htmlString:htmlString]autorelease];
|
||||
};
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
-(id)initWithDelegate:(id<GSWTemplateParserDelegate>)delegate
|
||||
htmlString:(NSString*)htmlString
|
||||
{
|
||||
if ((self=[self init]))
|
||||
{
|
||||
ASSIGN(_delegate,delegate);
|
||||
ASSIGNCOPY(_string,htmlString);
|
||||
};
|
||||
return self;
|
||||
}
|
||||
|
||||
-(void)dealloc
|
||||
{
|
||||
DESTROY(_delegate);
|
||||
DESTROY(_string);
|
||||
[super dealloc];
|
||||
}
|
||||
//--------------------------------------------------------------------
|
||||
/** Called when finding a new dynamic tag or a new comment or at the
|
||||
end of the string to record seen text parts
|
||||
Call delegate -parser:didParseText:
|
||||
**/
|
||||
-(void)didParseText
|
||||
{
|
||||
// Is there some text ?
|
||||
if(_textStopIndex>=_textStartIndex)
|
||||
{
|
||||
// Create text string
|
||||
NSString* content=[NSString stringWithCharacters:_uniBuf+_textStartIndex
|
||||
length:_textStopIndex-_textStartIndex+1];
|
||||
|
||||
// Call delegate -parser:didParseText:
|
||||
[_delegate parser:self
|
||||
didParseText:content];
|
||||
|
||||
// reset textStartIndex
|
||||
_textStartIndex=_index;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
/** Called when a new dynamic tag is opened
|
||||
tagType can be gsweb, wo or oog
|
||||
taProperties contains key+values of tag properties
|
||||
Call delegate -parser:didParseOpeningDynamicTagOfType:withProperties:
|
||||
**/
|
||||
-(void)startDynamicTagOfType:(GSWHTMLRawParserTagType)tagType
|
||||
withProperties:(NSDictionary*)tagProperties
|
||||
templateInfo:(NSString*)templateInfo
|
||||
{
|
||||
// Records previously parsed text
|
||||
[self didParseText];
|
||||
|
||||
// Calls delegate -parser:didParseOpeningDynamicTagOfType:withProperties:
|
||||
[_delegate parser:self
|
||||
didParseOpeningDynamicTagOfType:tagType
|
||||
withProperties:tagProperties
|
||||
templateInfo:templateInfo];
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
/** Called when a dynamic tag is closed
|
||||
tagType can be gsweb, wo or oog
|
||||
Call delegate -parser:didParseClosingDynamicTagOfType:
|
||||
**/
|
||||
-(void)stopDynamicTagOfType:(GSWHTMLRawParserTagType)tagType
|
||||
withTemplateInfo:(NSString*)templateInfo
|
||||
{
|
||||
// Records previously parsed text
|
||||
[self didParseText];
|
||||
|
||||
// Calls delegate -parser:didParseClosingDynamicTagOfType:
|
||||
[_delegate parser:self
|
||||
didParseClosingDynamicTagOfType:tagType
|
||||
withTemplateInfo:templateInfo];
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
/** Called when a is parsed
|
||||
Call delegate -parser:didParseComment:
|
||||
**/
|
||||
-(void)didParseCommentWithContentString:(NSString*)contentString
|
||||
{
|
||||
// Records previously parsed text
|
||||
[self didParseText];
|
||||
|
||||
// Is there comment text
|
||||
if ([contentString length]>0)
|
||||
{
|
||||
// Calls delegate -parser:didParseComment:
|
||||
[_delegate parser:self
|
||||
didParseComment:contentString];
|
||||
};
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
/** Skip a quoted string
|
||||
indexPtr should point on the first quote
|
||||
stopIndex should be the end of the string
|
||||
when returning indexPtr point on the last quote.
|
||||
Quoted substrings are handled
|
||||
An exception is raised if the end quote is not found,...
|
||||
**/
|
||||
-(void)_skipQuotedStringWithQuote:(unichar)quote
|
||||
index:(int*)indexPtr
|
||||
stopIndex:(int)stopIndex
|
||||
{
|
||||
int startIndex=0;
|
||||
|
||||
NSAssert2(_uniBuf[*indexPtr]==quote,@"First character is not a '%c' but a '%c'",
|
||||
(char)quote,(char)_uniBuf[*indexPtr]);
|
||||
|
||||
(*indexPtr)++; //skip quote
|
||||
|
||||
startIndex=*indexPtr;
|
||||
|
||||
while(*indexPtr<=stopIndex
|
||||
&& _uniBuf[*indexPtr]!=quote)
|
||||
{
|
||||
if (_uniBuf[*indexPtr]=='"' || _uniBuf[*indexPtr]=='\'')
|
||||
{
|
||||
[self _skipQuotedStringWithQuote:_uniBuf[*indexPtr]
|
||||
index:indexPtr
|
||||
stopIndex:stopIndex];
|
||||
(*indexPtr)++;// skip last quote
|
||||
}
|
||||
else
|
||||
(*indexPtr)++;
|
||||
}
|
||||
if (_uniBuf[*indexPtr]!=quote)
|
||||
{
|
||||
if (*indexPtr>stopIndex)
|
||||
[NSException raise:NSInvalidArgumentException
|
||||
format:@"Found end of string before end quote when "
|
||||
@"skipping quoted string starting at %@.",
|
||||
[self currentLineAndColumnIndexesString]];
|
||||
else
|
||||
[NSException raise:NSInvalidArgumentException
|
||||
format:@"Didn't found end quote when skipping quoted "
|
||||
@"string starting at %@. Found '%c' instead",
|
||||
[self currentLineAndColumnIndexesString],(char)_uniBuf[_index]];
|
||||
};
|
||||
|
||||
|
||||
NSAssert2(_uniBuf[*indexPtr]==quote,@"Last character is not a '%c' but a '%c'",
|
||||
(char)quote,(char)_uniBuf[*indexPtr]);
|
||||
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
/** parse and return the quoted string without quotes
|
||||
indexPtr should point on the first quote
|
||||
stopIndex should be the end of the string
|
||||
when returning indexPtr point on the last quote.
|
||||
Quoted substrings are handled
|
||||
An exception is raised if the end quote is not found,...
|
||||
**/
|
||||
-(NSString*)_parseQuotedStringWithQuote:(unichar)quote
|
||||
index:(int*)indexPtr
|
||||
stopIndex:(int)stopIndex
|
||||
{
|
||||
NSString* string=nil;
|
||||
int startIndex=0;
|
||||
|
||||
NSAssert2(_uniBuf[*indexPtr]==quote,@"First character is not a '%c' but a '%c'",
|
||||
(char)quote,(char)_uniBuf[*indexPtr]);
|
||||
|
||||
startIndex=(*indexPtr);
|
||||
|
||||
[self _skipQuotedStringWithQuote:quote
|
||||
index:indexPtr
|
||||
stopIndex:stopIndex];
|
||||
|
||||
NSAssert2(_uniBuf[*indexPtr]==quote,@"Last character is not a '%c' but a '%c'",
|
||||
(char)quote,(char)_uniBuf[*indexPtr]);
|
||||
|
||||
string=[NSString stringWithCharacters:_uniBuf+startIndex+1 // +1: skip begining quote
|
||||
length:*indexPtr-startIndex-1]; // -1 because -1 for begining quote, -1 for ending quote +1 for length
|
||||
|
||||
return string;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
/** parse and return a property string (either key or value), stoping when
|
||||
ending0 or ending1 charaters is found or when stop index is reached
|
||||
indexPtr should point on the begining of the string or on blanks before it.
|
||||
stopIndex should be the end of the string
|
||||
when returning indexPtr point on the ending char or on the character after
|
||||
stopIndex if end of string is found
|
||||
|
||||
Quoted substrings are handled
|
||||
An exception is raised if it find a problem (no end quote for quoted strings,...
|
||||
It skip starting blank spaces
|
||||
**/
|
||||
-(NSString*)_parsePropertiesStringEndingWith:(unichar)ending0
|
||||
or:(unichar)ending1
|
||||
index:(int*)indexPtr
|
||||
stopIndex:(int)stopIndex
|
||||
{
|
||||
NSString* string=nil;
|
||||
int startIndex=0;
|
||||
|
||||
|
||||
while(*indexPtr<=stopIndex
|
||||
&& _uniBuf[*indexPtr]==' ')
|
||||
(*indexPtr)++;
|
||||
|
||||
startIndex=*indexPtr;
|
||||
|
||||
if (*indexPtr<=stopIndex)
|
||||
{
|
||||
if (_uniBuf[*indexPtr]=='"'
|
||||
|| _uniBuf[*indexPtr]=='\'')
|
||||
{
|
||||
string=[self _parseQuotedStringWithQuote:_uniBuf[*indexPtr]
|
||||
index:indexPtr
|
||||
stopIndex:stopIndex];
|
||||
(*indexPtr)++; // skip last quote
|
||||
}
|
||||
else
|
||||
{
|
||||
while(*indexPtr<=stopIndex
|
||||
&& _uniBuf[*indexPtr]!=ending0
|
||||
&& _uniBuf[*indexPtr]!=ending1)
|
||||
{
|
||||
if (_uniBuf[*indexPtr]=='"' || _uniBuf[*indexPtr]=='\'')
|
||||
{
|
||||
[self _skipQuotedStringWithQuote:_uniBuf[*indexPtr]
|
||||
index:indexPtr
|
||||
stopIndex:stopIndex];
|
||||
(*indexPtr)++;// skip last quote
|
||||
}
|
||||
else
|
||||
(*indexPtr)++;
|
||||
};
|
||||
if (*indexPtr>startIndex)
|
||||
string=[NSString stringWithCharacters:_uniBuf+startIndex
|
||||
length:*indexPtr-startIndex];
|
||||
};
|
||||
};
|
||||
|
||||
return string;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
/** parse a tag properties
|
||||
startIndex should point on the begining of the string
|
||||
stopIndex should be the end of the string
|
||||
|
||||
Quoted strings are handled
|
||||
An exception is raised if it find a problem (no end quote for quoted strings,...)
|
||||
|
||||
gsweb/wo case: start index and stopIndex must define a string that:
|
||||
aa=bb c="ddd" name=element_name
|
||||
|
||||
OOG case: the string is like that:
|
||||
element_name aa=bb c="ddd"
|
||||
(for OOg, startIndex should point on the Element Name. No exception is raised
|
||||
if it is not the case but you'll have problems later...)
|
||||
**/
|
||||
-(NSDictionary*)tagPropertiesForType:(GSWHTMLRawParserTagType)tagType
|
||||
betweenIndex:(int)startIndex
|
||||
andIndex:(int)stopIndex
|
||||
{
|
||||
NSMutableDictionary* properties=nil;
|
||||
|
||||
if (stopIndex>=startIndex)
|
||||
{
|
||||
int index=startIndex;
|
||||
if (tagType==GSWHTMLRawParserTagType_oog)
|
||||
{
|
||||
NSString* tagName=nil;
|
||||
while(index<=stopIndex)
|
||||
{
|
||||
if (_uniBuf[index]==' ')
|
||||
{
|
||||
if ((index-1)>startIndex)
|
||||
{
|
||||
tagName=[NSString stringWithCharacters:_uniBuf+startIndex
|
||||
length:index-startIndex+1];
|
||||
};
|
||||
break;
|
||||
}
|
||||
else
|
||||
index++;
|
||||
};
|
||||
if (!tagName && index>stopIndex)
|
||||
{
|
||||
tagName=[NSString stringWithCharacters:_uniBuf+startIndex
|
||||
length:index-startIndex];
|
||||
};
|
||||
if (tagName)
|
||||
{
|
||||
if (!properties)
|
||||
properties=(NSMutableDictionary*)[NSMutableDictionary dictionary];
|
||||
[properties setObject:tagName
|
||||
forKey:@"name"];
|
||||
};
|
||||
};
|
||||
// Skip blank
|
||||
while(index<=stopIndex
|
||||
&& _uniBuf[index]==' ')
|
||||
index++;
|
||||
|
||||
while(index<=stopIndex)
|
||||
{
|
||||
NSString* key=nil;
|
||||
int previousIndex=index;
|
||||
|
||||
if (_uniBuf[index]=='=')
|
||||
[NSException raise:NSInvalidArgumentException
|
||||
format:@"Found '=' in tag without key at %@.",
|
||||
[self lineAndColumnIndexesStringFromIndex:index]];
|
||||
else
|
||||
{
|
||||
key=[self _parsePropertiesStringEndingWith:'='
|
||||
or:' '
|
||||
index:&index
|
||||
stopIndex:stopIndex];
|
||||
// Skip blank
|
||||
while(index<=stopIndex
|
||||
&& _uniBuf[index]==' ')
|
||||
index++;
|
||||
|
||||
if ([key length]>0)
|
||||
{
|
||||
key=[key lowercaseString];
|
||||
if (!properties)
|
||||
properties=(NSMutableDictionary*)[NSMutableDictionary dictionary];
|
||||
if (index>stopIndex) // key without value
|
||||
[properties setObject:@""
|
||||
forKey:key];
|
||||
else if (_uniBuf[index]=='=') // key=value
|
||||
{
|
||||
NSString *value;
|
||||
index++;
|
||||
value=[self _parsePropertiesStringEndingWith:'='
|
||||
or:' '
|
||||
index:&index
|
||||
stopIndex:stopIndex];
|
||||
NSAssert(value,@"No value");
|
||||
[properties setObject:value
|
||||
forKey:key];
|
||||
}
|
||||
else // key without value
|
||||
[properties setObject:@""
|
||||
forKey:key];
|
||||
};
|
||||
};
|
||||
if (index==previousIndex)
|
||||
{
|
||||
[NSException raise:NSInvalidArgumentException
|
||||
format:@"Parser blocked at %@.",
|
||||
[self lineAndColumnIndexesStringFromIndex:index]];
|
||||
};
|
||||
};
|
||||
};
|
||||
return properties;
|
||||
};
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
/** Parse the html _string and call delegate methods
|
||||
May raise exception.
|
||||
**/
|
||||
-(void)parseHTML
|
||||
{
|
||||
// Object obj = null;
|
||||
_length=[_string length];
|
||||
|
||||
// does not work on Snow Leopard. Any suggestions? -- dw
|
||||
//_uniBuf = (unichar*)objc_malloc(sizeof(unichar)*(_length+1));
|
||||
|
||||
_uniBuf = (unichar*)NSZoneMalloc(NSDefaultMallocZone(),sizeof(unichar)*(_length+1));
|
||||
|
||||
NS_DURING
|
||||
{
|
||||
[_string getCharacters:_uniBuf];
|
||||
|
||||
_index=0;
|
||||
|
||||
_textStartIndex=_index;
|
||||
while(_index<_length)
|
||||
{
|
||||
int previousIndex=_index;
|
||||
|
||||
switch(_uniBuf[_index])
|
||||
{
|
||||
case '<': // tagStart
|
||||
{
|
||||
int tagStartIndex=_index;
|
||||
|
||||
// skip '<'
|
||||
_index++;
|
||||
|
||||
if (_index>=_length)
|
||||
{
|
||||
[NSException raise:NSInvalidArgumentException
|
||||
format:@"Reached end of string when parsing tag opening at %@.",
|
||||
[self lineAndColumnIndexesStringFromIndex:tagStartIndex]];
|
||||
}
|
||||
else
|
||||
{
|
||||
BOOL isClosingTag=NO;
|
||||
GSWHTMLRawParserTagType tagType=GetTagType(_uniBuf,_length,&_index,&isClosingTag);
|
||||
int tagPropertiesStartIndex=_index;
|
||||
_textStopIndex=tagStartIndex-1;
|
||||
if (_parserIsDynamicTagType(tagType))
|
||||
{
|
||||
// Find tag End;
|
||||
while(_index<_length
|
||||
&& _uniBuf[_index]!='>')
|
||||
_index++;
|
||||
|
||||
|
||||
if (_uniBuf[_index]!='>')
|
||||
{
|
||||
[NSException raise:NSInvalidArgumentException
|
||||
format:@"Reached end of string searching for tag end. Tag started at %@.",
|
||||
[self lineAndColumnIndexesStringFromIndex:tagStartIndex]];
|
||||
}
|
||||
else
|
||||
{
|
||||
BOOL stopTag=NO;
|
||||
int tagPropertiesStopIndex=_index;
|
||||
|
||||
if (isClosingTag)
|
||||
{
|
||||
[self stopDynamicTagOfType:tagType
|
||||
withTemplateInfo:[self lineAndColumnIndexesStringFromIndex:tagStartIndex]];
|
||||
}
|
||||
else
|
||||
{
|
||||
NSString* tagPropertiesString=nil;
|
||||
NSDictionary* tagProperties;
|
||||
|
||||
if (_uniBuf[_index-1]=='/')
|
||||
{
|
||||
stopTag=YES;
|
||||
tagPropertiesStopIndex--;
|
||||
};
|
||||
tagPropertiesString=[NSString stringWithCharacters:_uniBuf+tagPropertiesStartIndex
|
||||
length:tagPropertiesStopIndex-tagPropertiesStartIndex];
|
||||
|
||||
tagProperties=[self tagPropertiesForType:tagType
|
||||
betweenIndex:tagPropertiesStartIndex
|
||||
andIndex:tagPropertiesStopIndex-1];
|
||||
|
||||
[self startDynamicTagOfType:tagType
|
||||
withProperties:tagProperties
|
||||
templateInfo:[self lineAndColumnIndexesStringFromIndex:tagStartIndex]];
|
||||
if (stopTag)
|
||||
[self stopDynamicTagOfType:tagType
|
||||
withTemplateInfo:[self lineAndColumnIndexesStringFromIndex:tagStartIndex]];
|
||||
}
|
||||
_index++;
|
||||
_textStartIndex=_index;
|
||||
};
|
||||
}
|
||||
else if (_parserIsCommentTagType(tagType))
|
||||
{
|
||||
BOOL foundCommentEnd=NO;
|
||||
// Find tag End;
|
||||
while(!foundCommentEnd && _index<_length)
|
||||
{
|
||||
if (_uniBuf[_index]=='>'
|
||||
&&_uniBuf[_index-1]=='-'
|
||||
&& _uniBuf[_index-2]=='-')
|
||||
{
|
||||
foundCommentEnd=YES;
|
||||
}
|
||||
else
|
||||
_index++;
|
||||
};
|
||||
if (!foundCommentEnd)
|
||||
{
|
||||
[NSException raise:NSInvalidArgumentException
|
||||
format:@"Reached end of string searching for comment end. Comment started at %@.",
|
||||
[self lineAndColumnIndexesStringFromIndex:tagStartIndex]];
|
||||
}
|
||||
else
|
||||
{
|
||||
NSString* commentString=[NSString stringWithCharacters:_uniBuf+tagPropertiesStartIndex
|
||||
length:_index-tagPropertiesStartIndex-2]; //-2 for last --
|
||||
[self didParseCommentWithContentString:commentString];
|
||||
_index++;
|
||||
_textStartIndex=_index;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
break;
|
||||
case '\\':// escape
|
||||
_index++;
|
||||
break;
|
||||
default:
|
||||
_index++;
|
||||
break;
|
||||
};
|
||||
if (_index==previousIndex)
|
||||
{
|
||||
[NSException raise:NSInvalidArgumentException
|
||||
format:@"Parser blocked at %@.",
|
||||
[self lineAndColumnIndexesStringFromIndex:_index]];
|
||||
};
|
||||
};
|
||||
_textStopIndex=_length-1;
|
||||
[self didParseText];
|
||||
}
|
||||
NS_HANDLER
|
||||
{
|
||||
if (_uniBuf)
|
||||
{
|
||||
NSZoneFree(NSDefaultMallocZone(),_uniBuf);
|
||||
_uniBuf=NULL;
|
||||
};
|
||||
[localException raise];
|
||||
};
|
||||
NS_ENDHANDLER;
|
||||
};
|
||||
|
||||
|
||||
@end
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue