From 3f57d278e7b0cb8a6c34b6682ad3d8a2d1d3d3e8 Mon Sep 17 00:00:00 2001
From: Lee Thomason <leethomason@gmail.com>
Date: Wed, 11 Jan 2012 15:30:03 -0800
Subject: [PATCH] complete, not working, XMLComment parser.

---
 tinyxml2.cpp | 124 ++++++++++++++++++++++++++++++++++++++++++++++++---
 tinyxml2.h   |  47 +++++++++++++++++--
 tinyxml2.suo | Bin 25600 -> 25600 bytes
 3 files changed, 161 insertions(+), 10 deletions(-)

diff --git a/tinyxml2.cpp b/tinyxml2.cpp
index aa3788f..83bafb3 100644
--- a/tinyxml2.cpp
+++ b/tinyxml2.cpp
@@ -7,6 +7,7 @@
 
 using namespace tinyxml2;
 
+// --------- CharBuffer ----------- //
 /*static*/ CharBuffer* CharBuffer::Construct( const char* in )
 {
 	size_t len = strlen( in );
@@ -24,22 +25,132 @@ using namespace tinyxml2;
 }
 
 
-const char* XMLNode::SkipWhiteSpace( const char* p )
+// --------- XMLNode ----------- //
+
+XMLNode::XMLNode( XMLDocument* doc ) :
+	document( doc ),
+	parent( 0 ),
+	firstChild( 0 ), lastChild( 0 ),
+	prev( 0 ), next( 0 )
 {
-	while( isspace( *p ) ) {
-		++p;
+
+}
+
+
+XMLNode::~XMLNode()
+{
+	XMLNode* node=firstChild;
+	while( node ) {
+		XMLNode* temp = node->next;
+		delete node;
+		node = temp;
 	}
+}
+
+
+XMLNode* XMLNode::InsertEndChild( XMLNode* addThis )
+{
+	if ( lastChild ) {
+		TIXMLASSERT( firstChild );
+		TIXMLASSERT( lastChild->next == 0 );
+		lastChild->next = addThis;
+		addThis->prev = lastChild;
+		lastChild = addThis;
+
+		addThis->parent = this;
+		addThis->next = null;
+	}
+	else {
+		TIXMLASSERT( firstChild == 0 );
+		firstChild = lastChild = addThis;
+
+		addThis->parent = this;
+		addThis->prev = 0;
+		addThis->next = null;
+	}
+}
+
+
+const char* XMLNode::ParseText( char* p, const char* endTag, char** next )
+{
+	TIXMLASSERT( endTag && *endTag );
+
+	char* start = SkipWhiteSpace( p );
+	if ( !start )
+		return;
+
+	char endChar = *endTag;
+	p = start;
+	int length = strlen( endTag );
+
+	while ( *p ) {
+		if ( *p == endChar ) {
+			if ( strncmp( p, endTag, length ) == 0 ) {
+				*p = 0;
+				*next = p + length;
+				return start;
+			}
+		}
+		++p;
+	}	
+	return 0;
+}
+
+
+// --------- XMLComment ---------- //
+
+XMLComment::XMLComment( XMLDocument* doc ) : XMLNode( doc )
+{
+}
+
+
+virtual XMLComment::~XMLComment()
+{
+
+}
+
+
+virtual char* XMLComment::ParseDeep( char* p )
+{
+	// Comment parses as text.
+	value = ParseText( p, "-->", &p );
 	return p;
 }
 
 
+// --------- XMLDocument ----------- //
 XMLDocument::XMLDocument() : 
 	charBuffer( 0 )
 {
 }
 
 
-bool XMLDocument::Parse( const char* p ) 
+XMLDocument::~XMLDocument()
+{
+	delete root;
+	delete charBuffer;
+}
+
+
+
+bool XMLDocument::Parse( const char* p )
+{
+	charBuffer = CharBuffer.Construct( p );
+	XMLNode* node = 0;
+	Identify( charBuffer., node );
+	node->Parse( p );
+}
+
+
+XMLComment* XMLDocument::newComment( XMLNode* parent )
+{
+	
+}
+
+
+
+
+char* XMLDocument::Identify( char* p, XMLNode** node ) 
 {
 	XMLNode* returnNode = 0;
 
@@ -62,11 +173,12 @@ bool XMLDocument::Parse( const char* p )
 	const char* cdataHeader = { "<![CDATA[" };
 
 	if ( XMLNode::StringEqual( p, xmlHeader, 5 ) ) {
-
+		returnNode = new XMLComment();
 	}
 	else {
 		TIXMLASSERT( 0 );
 	}
 
-	return true;
+	*node = returnNode;
+	return p;
 }
diff --git a/tinyxml2.h b/tinyxml2.h
index a29739e..f831363 100644
--- a/tinyxml2.h
+++ b/tinyxml2.h
@@ -27,6 +27,7 @@
 
 namespace tinyxml2
 {
+class XMLDocument*;
 
 // internal - move to separate namespace
 struct CharBuffer
@@ -47,8 +48,12 @@ public:
 	static XMLNode* Identify( const char* p );
 
 protected:
-	static const char* SkipWhiteSpace( const char* p );
-	static char* SkipWhiteSpace( char* p ) { return (char*) SkipWhiteSpace( (const char*)p ); }
+	XMLNode( XMLDocument* );
+	virtual ~XMLNode();
+
+	// Utility
+	static const char* SkipWhiteSpace( const char* p )	{ while( isspace( *p ) ) { ++p; } return p; }
+	static char* SkipWhiteSpace( char* p )				{ while( isspace( *p ) ) { ++p; } return p; }
 
 	inline static bool StringEqual( const char* p, const char* q, int nChar=INT_MAX )  {
 		int n = 0;
@@ -61,6 +66,26 @@ protected:
 		return false;
 	}
 
+	/* Parses text. (Not a text node.)
+	   - [ ] EOL normalization.
+	   - [x] Trim leading whitespace
+	   - [ ] Trim trailing whitespace.
+	   - [ ] Leaves inner whitespace
+	   - [ ] Inserts one space between lines.
+	*/
+	const char* ParseText( char* in, const char* endTag, char** next );
+
+	virtual char* ParseDeep( char* )	{ TIXMLASSERT( 0 ); }
+
+	XMLDocument*	document;
+	XMLNode*		parent;
+
+	XMLNode*		firstChild;
+	XMLNode*		lastChild;
+
+	XMLNode*		prev;
+	XMLNode*		next;
+
 private:
 
 };
@@ -68,7 +93,12 @@ private:
 
 class XMLComment : public XMLNode
 {
+public:
+	XMLComment( XMLDocument* doc );
+	virtual ~XMLComment();
 
+private:
+	char* value;
 };
 
 
@@ -76,12 +106,21 @@ class XMLDocument
 {
 public:
 	XMLDocument();
+	~XMLDocument();
 
 	bool Parse( const char* );
 
-private:
-	XMLDocument( const XMLDocument& );	// not implemented
+	XMLNode* Root()				{ return root; }
+	XMLNode* RootElement();
 
+	XMLNode* InsertEndChild( XMLNode* addThis );
+
+private:
+	XMLDocument( const XMLDocument& );	// intentionally not implemented
+
+	virtual char* ParseDeep( char* );
+
+	XMLNode*	root;
 	CharBuffer* charBuffer;
 };
 
diff --git a/tinyxml2.suo b/tinyxml2.suo
index 2bca40e047f8849778a6fc81d9f2463a88261f23..fb3b44eaf4c181fb47b2eccaabc77e473d890ffc 100644
GIT binary patch
delta 2004
zcmY*aZA?>V6u!5VTI;2&rCvx^OX=EDw3dDWT??hqj;|G3%7-u!3OM}OCJb>SZW`yZ
zA6wjlJcej89cE@RW?69chatu=CC(VbU}5{=mY6O3WsJduKid!4xo?rNHgE3RbI&>N
z^FHS}rzh|6C-3poF*&~-h4KQ$a_q-nZY*F#{;P6z?Sn<R1+z+ddMx{aT##`bC(@E$
zvNxlu1m<#G=@peOn~$K-P>{B3UY6zXa`M`|!81Lojq^ENHkn@9XkN)p$OI`}&IT(+
z#RXvt8S?&T%u5KGHN!f9l{^9<ccn-3lUWQvE6>Ai%S}5CU-M*mx6}E(@eYqjo;$r#
zAjmMW-GNk{7EfN&;db1G1+x=v=4LE;$=<jl`v9F_!J@Zh!mGg(hn^XX_#y5_s#XI-
zy@;C@C58Ag)}%&?_Dfd(M2`~xykf$2mlIP~A9U6p%vlof*(M;^?2-%ahYV1cD)|z)
zTdHuYNDp(l6N5zt_B0e3_%N<H%Av8V;i+|Ex>AQ*b}d6TZ_Y=*T`w!+P`$^8;T;Ox
zE*`^N+>eXJ7A)8&DT$v#6*#n0pyQl$F&j*@_q9}D*rsLoIF2DlH34%X;V?5$nvej6
z!vI;-kMDNsWC1#$-=D>C=jh5oNU!s~0>j;aMQaexyR~>4RkL)Za5q-su|uEcovS=n
zOSbR@SS<`f-Jrm9DY4{AF^rnJe3s%UuDRY!kGMr1OP)?TR01O4wnvMzF^M4!?t0ab
zQB9_c4D1XA)#5lV6TGKB2j7oAR}jvi30Hk|H5<j3Io4R$Ls_P0g~=SRp);gBYIKwu
z$hQJl%8f)*W7ZTmfR9?=!IQEw^7moNuV(~w`gJVlY?B^pzm}>{fzJZ@gvSS0z(|Az
zFjcI_@~Z;HWpaP%Qf_i`l4=g)k3^726mkZ*Vfu31DOw>6wU^*AWxh<eH3iG?SHh2n
zly#yhfbn2HtNJe7sGxJmBODR8NZDSeHO_DzM|eO(6**73c2ikJ=qg1<>-~_0DaB=0
z;XP8<h?^u3auSy=rtvva(2~bbHPdZ=foYs&ks_W~nfYU+xLsH-_TZZ;6Z4h0b5!a1
zeK?aW!GY=kehv?^>O8C#Sw+088JfdR#??Z#gM14Ub(nFBtjH0jlczot^De?_#Eq4j
z!z_ooLCbt<&>LxDLJUVVI2}+i-y<X*H>=oiOGaTaT#D{zkpZ(7=b{2}6r*}1vyxl{
z&&rFWY;e|gGVGc<)0%eFpt|6Gt(tg}xHv&}Kgm+hay>8C;9k9&uVA--yPjC0hRL)y
zwS_bZY#LIF2z#S|Qw?o&(+~z5GHo*7NGfUU$DfU3m<{RIs-MfSPg!65ehX(}T`bp0
zvw%e0h|@78%$@*LF$Y64Mk+fSBL#Z|Sen`(p?cW#Axw$Ggu0tG^l7To&A5^j?x!3(
zaJ_k7249N-7n?;^{V6MrrDSF=&5Q>vT59?Z(%A`2l?n*?6qrwlY|7k98d&_YMT_C2
ziFL~x<*Idce8gsx*sABhz@q)*oPFFuZivh1n-mfAGF{EI>7Z>J<ZBpzZS8u-zM`Gx
zUwaJW)pAT$siEyQ>B8Iq7vQ?NBisn>y17;^%Hi7XZP?b)z@~FP-tQQp-J`A=ICgh1
zTLgD^UuC;4F-2{V`PgPhX``YQ{S=ov>es`Iai~k&TDj&XJqBngai*(@kE9=UP4ZhO
zKj_W2esy&5fGy9P^dDOm&^M5a^LzGV-cLlfi&W46)Ls>O_8J+f;avu3_NrL3CgO60
zqDstk3-EMDCDJB(L{ee^zXw#9-7EbCWI9gOOH*QP>U`THO`XgfpJ@};IsP2(-k;!-
z3lph3Is7KVYNYkwKUyjw7|2kt(Ky-{$DKUtqrOkJ8b|gF{dVw*^}>yU;lInC9a2h{
NNnhx9^E6^S{{mRar~d!|

delta 1962
zcmYjSUrbYH6u%b=mU^kB)KcrUlzJ&eYi$9cQs`P*5wL}V6(tra&^R=ke@HW#*$gmd
zVwNcOXACAv*s}PrxD72?Hll_EV$9|YEXIeuIA4}MEiU0<SxnryAGLCuoBQRQ^PO{k
zzw@V~kNMHZ{A@_Un^2}G&0qN9<7=B9V_5NAso*&74Lw*<NLWxR(j$3K6oM?#uh%41
z5uua>nsvhTs!ErK-)!czO|vzpkjo)m!FqjC+reW|<w~y>M{<M`QWdUKBdK4;QmGTk
zk_eXiomef22ph>@(>kMc($JMlF`S5qQXWs5C{}E)bVMBE`9YjL;<#s8<Pj)t{K}kz
z$#6Y<`?PsOWVaRHS~?N6#PF=z4yRp%sqL1`S&jKNky%OTmj?M36uBA^l{94UK)hLl
zf47@3Q67P{{1}#`0VE_hj$3VbR-VEm`UWc;xL+aCw+#aU2WG29xGMzShktx~F}p*-
zyl=ot^=^z>4EVuj#I=|cXS`a(ZCd<Mc^wm#F@6|#ExT~@kP{~>jaardWW1@Nv1)N@
zr;;K&Fk{nW%AzS4<j&BK<8tAzaADamP$Uf!_7D{IIOcXncsH?AhN+z*Wlcz8YC>&<
zZ<mrUC8QoarTBjb)hxR`7_0PPp~^sdfv;!0@{Tt=-t6AUPvJ_~lk(*w<Q!tYW?V)b
zp?A(1!$gR3a{Wb-9Z*-BAl1sT^mtOG!+3QUVQ>>mnvD+bZN@rc;#1tK8N$~=H>R7+
zEGIw8YL8;p;$91+gjlOYa?b$K>_E#NJIr;r8Pzi`71VWFk~iSTS`*VRgpClJRSZfe
zirgLKs0RPl8F8#WNX2ttAuM3puFBFjjt6@?St;*Vig@K$@?Jt&M|ZSYn+UGPTyO@B
zS;;WQ%3TCk1+T|I={vAoUyBsA+N8(8Pok{uG@OIxT#mbee!C04fWAO(zytL9Sb3k*
zJsHuAO=8(zCD>~opL)&EMw>A1)iF}zF?%-dcFM$qhm9gNicF`73yn%f^<+SUe4mj&
zpKYGo?@?>Z5hzP5o#i%8`W>tgzx(y@`jwfY$wk!SPC&_bW1H_oc5B&hXRJ&&+4uyF
z!hX!V^vou}5Un<yVpaGvAd<&!D!UuzUV&jLKwrQ^LuVpp66gwcG3K2?3(Hi~se{*|
zOEq7lzG%Sfz3+-~HcP_8W-~!_BEJ6u>-M$z(?e_(_yz`Xu0_Y72sD`^Eovg4b<9ja
zz_Lrh+p$vahoMcR5p!U!)yl>^Qme&$tq$i~h0HJrH1;;sw1pTN&4D)DIUvc-<YwLA
z;N+?mV=Q!n-Jg^MLaD&*4kJDZDOm!_kcqwyM5+XQ6po@@Qo~7ImI^P)cT!djE(ZmS
zMD#?*+O(@9mdyO9GVZL|mOj#<#Zr5WA7Z3Ww_C}1J*K66h+TR{q+IHsJAD`piWuz_
zvO7fT)H1O5BWqw^Njq3MPO{Aq?~)58ZzVMn2aWQC(fFt!9u)Y?cv<;bVS+oso#xgc
zCkV0&*Q0J~#cozMxsBQnnfWHh{_Cib_F7;4Ziq2GKay!W6Yd_~jLqGxYz-T5u6vkH
zFM66_Kith^0X#bV4LkMdZA9(c$Co(-FX7AXmhAOPob1sT+22~xcb|O5)t)dvn10c7
zoiF<C`_sR0w_3N9+$qTYz<23EKKciXapUOwm_JlS!z}O8<GpLl$r#MN24X3iDSr)X
zT(3uf`k0b&(omzq!(M?6fiG%?*e4MF2HbSM+qEZXZ&tItt){A;qMJ2+PvBGtsrX_c
zw}CPg>COIyuErz6HWK8m7bg2Vu&8ihwg2;?UneB#<reLg)K7-Qc(~{s!;ro;;NodL
GR{amM(v%JW