From 85403d8935bfb3b4bb48ac21c5c1f7390c5b7405 Mon Sep 17 00:00:00 2001
From: Lee Thomason <leethomason@gmail.com>
Date: Wed, 11 Jan 2012 15:55:05 -0800
Subject: [PATCH] hello,world working. Forgot how hard XML parsing can be.

---
 tinyxml2.cpp |  27 ++++++++++++++++++++++-----
 tinyxml2.h   |   5 +++--
 tinyxml2.suo | Bin 25600 -> 26624 bytes
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/tinyxml2.cpp b/tinyxml2.cpp
index 63b8707..cfe2969 100644
--- a/tinyxml2.cpp
+++ b/tinyxml2.cpp
@@ -73,6 +73,13 @@ XMLNode* XMLNode::InsertEndChild( XMLNode* addThis )
 
 
 void XMLNode::Print( FILE* fp, int depth )
+{
+	for( XMLNode* node = firstChild; node; node=node->next ) {
+		node->Print( fp, depth );
+	}
+}
+
+void XMLNode::PrintSpace( FILE* fp, int depth ) 
 {
 	for( int i=0; i<depth; ++i ) {
 		fprintf( fp, "    " );
@@ -138,6 +145,7 @@ char* XMLComment::ParseDeep( char* p )
 XMLDocument::XMLDocument() : 
 	charBuffer( 0 )
 {
+	root = new XMLNode( this );
 }
 
 
@@ -153,8 +161,11 @@ bool XMLDocument::Parse( const char* p )
 {
 	charBuffer = CharBuffer::Construct( p );
 	XMLNode* node = 0;
+	
 	char* q = Identify( charBuffer->mem, &node );
+	root->InsertEndChild( node );
 	node->ParseDeep( q );
+
 	return true;
 }
 
@@ -184,13 +195,19 @@ char* XMLDocument::Identify( char* p, XMLNode** node )
 	// - Everthing else is unknown to tinyxml.
 	//
 
-	const char* xmlHeader = { "<?xml" };
-	const char* commentHeader = { "<!--" };
-	const char* dtdHeader = { "<!" };
-	const char* cdataHeader = { "<![CDATA[" };
+	static const char* xmlHeader = { "<?xml" };
+	static const char* commentHeader = { "<!--" };
+	static const char* dtdHeader = { "<!" };
+	static const char* cdataHeader = { "<![CDATA[" };
 
-	if ( XMLNode::StringEqual( p, xmlHeader, 5 ) ) {
+	static const int xmlHeaderLen = 5;
+	static const int commentHeaderLen = 4;
+	static const int dtdHeaderLen = 2;
+	static const int cdataHeaderLen = 9;
+
+	if ( XMLNode::StringEqual( p, commentHeader, commentHeaderLen ) ) {
 		returnNode = new XMLComment( this );
+		p += commentHeaderLen;
 	}
 	else {
 		TIXMLASSERT( 0 );
diff --git a/tinyxml2.h b/tinyxml2.h
index 22d9d3e..2ff58c9 100644
--- a/tinyxml2.h
+++ b/tinyxml2.h
@@ -48,7 +48,7 @@ class XMLNode
 public:
 
 	XMLNode* InsertEndChild( XMLNode* addThis );
-	void Print( FILE* cfile, int depth );			// prints leading spaces.
+	virtual void Print( FILE* cfile, int depth );
 
 protected:
 	XMLNode( XMLDocument* );
@@ -90,6 +90,7 @@ protected:
 	XMLNode*		next;
 
 private:
+	void PrintSpace( FILE* cfile, int depth );			// prints leading spaces.
 
 };
 
@@ -100,7 +101,7 @@ public:
 	XMLComment( XMLDocument* doc );
 	virtual ~XMLComment();
 
-	void Print( FILE* cfile, int depth );
+	virtual void Print( FILE* cfile, int depth );
 
 protected:
 	char* ParseDeep( char* );
diff --git a/tinyxml2.suo b/tinyxml2.suo
index e447d8f394c6c3a2d25111583879f450f770d6b2..4fe777ea33304723a23a51ad6c297c7597c14a77 100644
GIT binary patch
delta 1070
zcmb`G%TE(g6o=1krw<ea1PVwMN-zPTIBf^Zn+$zKQ49p7<)IW?URuxqQ65#QI|D(>
z*%&bbZd{lMGA6{tn5qjQanZQe1ULQ#F2n_RZUqweo||vZZ_b%}XU@H6!s{#?V=GaW
z#sUCVY}PGDd^2-G@X*TU3-8<5XQrljG+UVvelVedGzPRy89gMncXoC}@_gcH;tXzR
zTe8}AGdz2i^f{uHKuK3n<00WCc(R>*2hl}bA}$j=?jzq#Tp|2KfZ*|7`nGGU`d@0*
zEK`0T6on*4nPh@{rr1-a1zkuBAi#ZGYPGLs{A8L=N-g4+VM=vRixZjKY*QJ}dZTKT
zC_V`?Siuc0u!BTb3z(rku5F|&G@KxklH)m<lt@D+98f`5cYHX&hRu2zqd8wwzK?D{
zbF9TuUmk(QjpUt=XcE#fsuv=npsXA78Qy9&tR5R<ETD|%PBHdQ*~-(Uv3Z3_k!&`L
zCi_%s7xcma1fd5?<K;hA9yET_;gUBE7h7l8G?nJXuve;j&YYDZjY-++cG)GD#awTf
zY-WqaDVk-MMK+6~EIKMgx7+Qo-40bZ4vhHS1Hqn=+7MnysMB@z(oLx!pLz<h#FNDM
zrty^%=qrnu7C(7>|MeYL+YE*R+V;PukDl69&b^W}7;QJ=vNs18j3#_!Oe_odZB}!+
zzdJxx1+3-@n`ot~%4|}Z$Qy6h;>S-~Aj+xHa{27yEYqRgJog5ohTzX~i_f9s$t-iz
z-5@pG01QDP<i-6c`ED47K01LC(tfy3*%9DzKlDR4)^)t6|6&YZ<(u)z#Q+Xh8Wm$_
zlX}$`R=bAb#Qp*|Nfps6s4w@8ky?u#t_*&NrM|9*#e#;TUwD$o_e{W4eKCg96B$F6
zo{2tviFz<-o%56+-^i-H=RhAlPg+Gd_fJsM9|}$S@ovi?KD4Kp{%xshD&_{Y*AUb~
p5**+Q;euqsCC_nMI$zUAfdnPec9NkeXz)%(AzE|1Y#y0Z_Xl8B2#x>%

delta 403
zcmYL@y-Nad7{`Cl-S51sBuu@_P|Crn!nDMOh725fBYLAQ6A?0dL26AGkG9ALeVm#i
z8XD_<Q%yHC6f^{_&HV)pS)l#Sh#vSnJnzrfcmd-PZY%+sw@Z^yqlIq6@%?)L@(dy&
z#86p@z5{KxS}n{u7F9d2iSTBWGsl_7C&!9!nnyF7S<c^7do3o1s;k$g@+k^o!oIp9
z6hl<Qhpk}@DgjJ*DXX~RR0fF<k(^>re%w?)K(dz!Hng%JOIYe{!aghd?gZT3(J`yU
z(el4xI;CKQDws@pnH3lWOy)GR{|I276$i=ygRBvhJ#fw-R_(*%u`pglJ6UGoQm&=z
zXsxSo!vE<wp^u_xt<nvI2wcBydkI^L-Rj_1hd{yuJ&Ttc8BFMuSEjVH-@&%O;@;0m
w{@**yY52YEls0(T#hm#OsHFlJcDuRyWlU^Zte!52JjrrmX4Vkl93fWz0T?8ScK`qY