[ros-diffs] [royce] 12816: handle comments while parsing, instead of returning them to the user

[royce at svn.reactos.com]

handle comments while parsing, instead of returning them to the user
Modified: branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp
Modified: branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp
  _____  

Modified: branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp
--- branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp
2005-01-05 02:57:58 UTC (rev 12815)
+++ branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp
2005-01-05 03:47:55 UTC (rev 12816)
@@ -445,9 +445,10 @@

 		return NULL;
 	bool end_tag;
 
-	while ( token[0] != '<' )
+	while ( token[0] != '<' || !strncmp ( token.c_str(), "<!--", 4 )
)
 	{
-		printf ( "syntax error: expecting xml tag, not '%s'\n",
token.c_str() );
+		if ( token[0] != '<' )
+			printf ( "syntax error: expecting xml tag, not
'%s'\n", token.c_str() );
 		if ( !f.get_token(token) )
 			return NULL;
 	}
  _____  

Modified: branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp
--- branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp
2005-01-05 02:57:58 UTC (rev 12815)
+++ branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp
2005-01-05 03:47:55 UTC (rev 12816)
@@ -34,9 +34,6 @@

 		if ( !head )
 			throw InvalidBuildFileException ( "Document
contains no 'project' tag." );
 
-		if ( head->name == "!--" )
-			continue; // ignore comments
-
 		if ( head->name != "project" )
 		{
 			throw InvalidBuildFileException ( "Expected
'project', got '%s'.",
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.reactos.org/pipermail/ros-diffs/attachments/20050105/684bfbe6/attachment.html