sync with home

This commit is contained in:
jez 2008-09-03 00:39:39 +01:00
commit d173537cde
3 changed files with 37 additions and 4 deletions

View file

@ -102,10 +102,13 @@ class NodeImpl : virtual public DOM::Node_impl<stringT, string_adaptorT>
{
DOMNode_implT*next = child->getNextSibling();
if(child->getNodeType() == DOM::Node_base::TEXT_NODE)
if((child->getNodeType() == DOM::Node_base::TEXT_NODE) ||
(child->getNodeType() == DOM::Node_base::CDATA_SECTION_NODE))
{
DOMText_implT* textNode = dynamic_cast<DOMText_implT*>(child);
while((next != 0) && (next->getNodeType() == DOM::Node_base::TEXT_NODE))
while((next != 0) &&
((next->getNodeType() == DOM::Node_base::TEXT_NODE) ||
(next->getNodeType() == DOM::Node_base::CDATA_SECTION_NODE)))
{
textNode->appendData(next->getNodeValue());
removeChild(next);

View file

@ -655,8 +655,6 @@
<test-case id="Text_modified78308" compare="text"/>
<test-case id="Text_modified78309" compare="text"/>
<test-case id="Text_Modified78311" compare="text"/>
<test-case id="Value-of_ValueOf_ConcatTextNodesIntoSingle" skip="yes" reason="I think my interpretation is valid for mapping DOM to XSLT"/>
<test-case id="Value-of_ValueOf_KeyReferenceInSelect" compiles="no"/>
<test-case id="Variables__78097" compare="text"/>
<test-case id="Variables__78098" compare="text"/>

32
vs9/projfix.py Normal file
View file

@ -0,0 +1,32 @@
#!/usr/bin/python
import os
import re
print "Mangling project files for older Visual Studio versions"
versions = [ ['8.00', 'vs8'],
['7.10', 'vs7'] ]
for version in versions:
number = version[0]
subdir = version[1]
print " version %s in ..\%s" % (number, subdir)
projects = [p for p in os.listdir('.') if re.search('vcproj$', p)]
for project in projects:
newproject = "..\%s\%s" % (subdir, project)
print " %s -> %s " % (project, newproject)
p = open(project)
np = open(newproject, 'w')
for l in p.readlines():
if re.search("TargetFrameworkVersion", l):
continue
if re.search("Version=", l):
l = l.replace('9.00', number)
np.write(l)
np.close()
p.close()