Method XmlObjMgt::GetReal() is improved to (a) recognize NAN and infinity written by old MSVC runtime (like 1.#QNAN and 1.#INF) and (b) detect situation when there are some trailing non-space symbols after the real value, returning False in such case.
Reading of real-valued attributes (single real, array, list) from OCAF XML format is improved to create valid attribute even if parsing of (some) members fails; warning is generated instead of error in such case.
Added test bugs caf bug29452
const Handle(TDF_Attribute)& theTarget,
XmlObjMgt_RRelocationTable& ) const
{
- Standard_Integer aFirstInd, aLastInd, ind;
- Standard_Real aValue;
+
+ Handle(TDataStd_RealArray) aRealArray = Handle(TDataStd_RealArray)::DownCast(theTarget);
const XmlObjMgt_Element& anElement = theSource;
+ // attribute id
+ Standard_GUID aGUID;
+ XmlObjMgt_DOMString aGUIDStr = anElement.getAttribute(::AttributeIDString());
+ if (aGUIDStr.Type() == XmlObjMgt_DOMString::LDOM_NULL)
+ aGUID = TDataStd_RealArray::GetID(); //default case
+ else
+ aGUID = Standard_GUID(Standard_CString(aGUIDStr.GetString())); // user defined case
+ aRealArray->SetID(aGUID);
+
+ Standard_Integer aFirstInd, aLastInd, ind;
+
// Read the FirstIndex; if the attribute is absent initialize to 1
XmlObjMgt_DOMString aFirstIndex= anElement.getAttribute(::FirstIndexString());
if (aFirstIndex == NULL)
return Standard_False;
}
- Handle(TDataStd_RealArray) aRealArray =
- Handle(TDataStd_RealArray)::DownCast(theTarget);
aRealArray->Init(aFirstInd, aLastInd);
// Check the type of LDOMString
return Standard_False;
}
} else {
+ Standard_Real aValue;
Standard_CString aValueStr = Standard_CString(aString.GetString());
for (ind = aFirstInd; ind <= aLastInd; ind++)
{
TCollection_ExtendedString("Cannot retrieve real member"
" for RealArray attribute as \"")
+ aValueStr + "\"";
- myMessageDriver->Send (aMessageString, Message_Fail);
- return Standard_False;
+ myMessageDriver->Send (aMessageString, Message_Warning);
+ // skip to the next space separator
+ while (*aValueStr != 0 && ! IsSpace (*aValueStr)) ++aValueStr;
}
aRealArray->SetValue(ind, aValue);
}
#endif
aRealArray->SetDelta(aDelta);
- // attribute id
- Standard_GUID aGUID;
- XmlObjMgt_DOMString aGUIDStr = anElement.getAttribute(::AttributeIDString());
- if (aGUIDStr.Type() == XmlObjMgt_DOMString::LDOM_NULL)
- aGUID = TDataStd_RealArray::GetID(); //default case
- else
- aGUID = Standard_GUID(Standard_CString(aGUIDStr.GetString())); // user defined case
-
- aRealArray->SetID(aGUID);
return Standard_True;
}
const Handle(TDF_Attribute)& theTarget,
XmlObjMgt_RRelocationTable& ) const
{
- Standard_Real aValue;
- XmlObjMgt_DOMString aRealStr= XmlObjMgt::GetStringValue (theSource);
-
- if (XmlObjMgt::GetReal(aRealStr, aValue) == Standard_False) {
- TCollection_ExtendedString aMessageString =
- TCollection_ExtendedString("Cannot retrieve Real attribute from \"")
- + aRealStr + "\"";
- myMessageDriver->Send (aMessageString, Message_Fail);
- return Standard_False;
- }
-
- Handle(TDataStd_Real) anAtt = Handle(TDataStd_Real)::DownCast(theTarget);
- anAtt->Set(aValue);
-
// attribute id
Standard_GUID aGUID;
const XmlObjMgt_Element& anElement = theSource;
Handle(TDataStd_Real)::DownCast(theTarget)->SetID(aGUID);
+ Standard_Real aValue(0.);
+ const XmlObjMgt_DOMString& aRealStr= XmlObjMgt::GetStringValue (theSource);
+ Standard_CString aValueStr = Standard_CString (aRealStr.GetString());
+ if(XmlObjMgt::GetReal(aRealStr, aValue) == Standard_False) {
+ TCollection_ExtendedString aMessageString =
+ TCollection_ExtendedString("Cannot retrieve Real attribute from \"")
+ + aValueStr + "\"";
+ myMessageDriver->Send (aMessageString, Message_Warning);
+ }
+ Handle(TDataStd_Real) anAtt = Handle(TDataStd_Real)::DownCast(theTarget);
+ anAtt->Set(aValue);
+
return Standard_True;
}
const Handle(TDF_Attribute)& theTarget,
XmlObjMgt_RRelocationTable& ) const
{
- Standard_Real aValue;
- Standard_Integer aFirstInd, aLastInd, ind;
+ const Handle(TDataStd_RealList) aRealList = Handle(TDataStd_RealList)::DownCast(theTarget);
const XmlObjMgt_Element& anElement = theSource;
+ // attribute id
+ Standard_GUID aGUID;
+ XmlObjMgt_DOMString aGUIDStr = anElement.getAttribute(::AttributeIDString());
+ if (aGUIDStr.Type() == XmlObjMgt_DOMString::LDOM_NULL)
+ aGUID = TDataStd_RealList::GetID(); //default case
+ else
+ aGUID = Standard_GUID(Standard_CString(aGUIDStr.GetString())); // user defined case
+ aRealList->SetID(aGUID);
+
// Read the FirstIndex; if the attribute is absent initialize to 1
+ Standard_Integer aFirstInd, aLastInd, ind;
XmlObjMgt_DOMString aFirstIndex= anElement.getAttribute(::FirstIndexString());
if (aFirstIndex == NULL)
aFirstInd = 1;
return Standard_False;
}
- const Handle(TDataStd_RealList) aRealList = Handle(TDataStd_RealList)::DownCast(theTarget);
// Check the type of LDOMString
const XmlObjMgt_DOMString& aString = XmlObjMgt::GetStringValue(anElement);
if(aLastInd == 0) aFirstInd = 0;
Standard_CString aValueStr = Standard_CString(aString.GetString());
for (ind = aFirstInd; ind <= aLastInd; ind++)
{
+ Standard_Real aValue;
if (!XmlObjMgt::GetReal(aValueStr, aValue)) {
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve real member"
" for RealList attribute as \"")
+ aValueStr + "\"";
- myMessageDriver->Send (aMessageString, Message_Fail);
- return Standard_False;
+ myMessageDriver->Send(aMessageString, Message_Warning);
+ // skip to the next space separator
+ while (*aValueStr != 0 && ! IsSpace (*aValueStr)) ++aValueStr;
}
aRealList->Append(aValue);
}
}
- // attribute id
- Standard_GUID aGUID;
- XmlObjMgt_DOMString aGUIDStr = anElement.getAttribute(::AttributeIDString());
- if (aGUIDStr.Type() == XmlObjMgt_DOMString::LDOM_NULL)
- aGUID = TDataStd_RealList::GetID(); //default case
- else
- aGUID = Standard_GUID(Standard_CString(aGUIDStr.GetString())); // user defined case
-
- aRealList->SetID(aGUID);
-
return Standard_True;
}
#include <errno.h>
#include <stdio.h>
+#include <limits>
+
static const char aRefPrefix [] = "/document/label";
static const char aRefElem1 [] = "/label[@tag=";
static const char aRefElem2 [] = "]";
{
char * ptr;
errno = 0;
- double aValue = Strtod (theString, &ptr);
+ theValue = Strtod (theString, &ptr);
if (ptr == theString || errno == ERANGE || errno == EINVAL)
return Standard_False;
- theValue = Standard_Real (aValue);
+
theString = ptr;
+
+ // detect NAN or infinite values written by old MSVC run-time as -1. with
+ // suffix "#QNAN" or "#SNAN" or "#INF"
+ if (*ptr == '#')
+ {
+ if (! strncmp (ptr, "#QNAN", 5) || ! strncmp (ptr, "#SNAN", 5))
+ {
+ theString = ptr + 5;
+ theValue = std::numeric_limits<double>::quiet_NaN();
+ return Standard_True;
+ }
+ else if (! strncmp (ptr, "#INF", 4))
+ {
+ theString = ptr + 4;
+ theValue = (theValue < 0 ? -std::numeric_limits<double>::infinity() : std::numeric_limits<double>::infinity());
+ return Standard_True;
+ }
+ else
+ return Standard_False;
+ }
+ else if (*ptr && ! IsSpace (*ptr))
+ {
+ // report failure if reading stopped not at the end of the string or space
+ return Standard_False;
+ }
+
return Standard_True;
}
}
default: // LDOM_Ascii*
{
- char * ptr;
const char * aString = theString.GetString();
- errno = 0;
- double aValue = Strtod (aString, &ptr);
- if (ptr == aString || errno == ERANGE || errno == EINVAL)
- return Standard_False;
- theValue = Standard_Real (aValue);
+ return GetReal (aString, theValue);
}
}
return Standard_True;
-puts "REQUIRED All: XmlDriver warning: failure reading attribute TDataStd_RealArray"
+puts "REQUIRED All: Cannot retrieve real member for RealArray attribute"
puts "================"
puts "OCC2269"
--- /dev/null
+puts "=========="
+puts "OCC29452"
+puts "=========="
+puts ""
+###################################################
+# XmlMDataStd_RealDriver: Failed to read an Ocaf XML document with 1.#QNAN value
+###################################################
+
+# Check for presence of warning message
+puts "REQUIRED ALL: Cannot retrieve real member for RealArray attribute"
+
+set BugNumber OCC29452
+set file [locate_data_file bug29452.xml]
+
+catch {Close D}
+set res [Open $file D]
+
+set real [GetReal D 0:1]
+set rlst [GetRealList D 0:1]
+set rarr [GetRealArray D 0:1]
+
+# Check for read values
+checkreal "Real value" [lindex $rlst 0] 1.1 0 1e-15
+checkreal "Real value" [lindex $rlst 2] 3.3 0 1e-15
+checkreal "Real value" [lindex $rarr 0] 0.111 0 1e-15
+checkreal "Real value" [lindex $rarr 3] 123. 0 1e-15
+checkreal "Real value" [lindex $rarr 4] 3.14e12 0 1e-15
+foreach inf [list $real [lindex $rlst 3]] {
+ if { [string compare "$inf" "inf"] &&
+ [string compare "$inf" "infinity"] &&
+ [string compare "$inf" "1.#INF"] } {
+ puts "Error: Real value is read as \"$inf\", expected infinity"
+ }
+}
+foreach nan [list [lindex $rlst 1] [lindex $rarr 1] [lindex $rarr 2]] {
+ if { [string compare "$nan" "nan"] &&
+ [string compare "$nan" "1.#QNAN"] } {
+ puts "Error: Real value is read as \"$nan\", expected NAN"
+ }
+}
projects / occt-copy.git / commitdiff