lili/opennurbs
1
0
Fork 0
mirror of https://github.com/mcneel/opennurbs.git synced 2026-03-14 21:15:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Sync changes from upstream repository

Browse Source 
Co-authored-by: Andrew le Bihan <andy@mcneel.com>
Co-authored-by: Brian Gillespie <brian@mcneel.com>
Co-authored-by: Dale Lear <dalelear@mcneel.com>
Co-authored-by: Giulio Piacentino <giulio@mcneel.com>
Co-authored-by: Greg Arden <greg@mcneel.com>
Co-authored-by: Lars <lars@mcneel.com>
Co-authored-by: Lowell <lowell@mcneelcom>
Co-authored-by: Nathan Letwory <nathan@mcneel.com>
Co-authored-by: Pierre Cuvilliers <pierre@mcneel.com>
Co-authored-by: Tim Hemmelman <tim@mcneel.com>
This commit is contained in:
Bozo The Builder
2020-12-16 05:49:44 -08:00
parent 990401a8f5
commit 488533eb7a
54 changed files with 4026 additions and 898 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
opennurbs_model_component.cpp
View File

@@ -1748,7 +1748,8 @@ bool ON_ModelComponent::IsValidComponentName(
{
return
(length > 0
&& length == (size_t)ON_wString::Length(candidate_component_name)
&& length <= 2147483645
&& length == (size_t)ON_wString::Length(candidate_component_name,length+1)
&& ON_ModelComponent::IsValidComponentName(candidate_component_name)
);
}
@@ -1861,15 +1862,22 @@ bool ON_ModelComponent::IsValidComponentName(
return rc;
}
static bool Internal_IsValidComponentNameCodePoint(ON__UINT32 unicode_code_point)
{
return
unicode_code_point >= ON_UnicodeCodePoint::ON_Space
&& 0 != ON_IsValidUnicodeCodePoint(unicode_code_point)
&& 0 == ON_IsUnicodeC1ControlCodePoint(unicode_code_point)
;
}
bool ON_ModelComponent::IsValidComponentNameFirstCodePoint(
ON__UINT32 unicode_code_point
)
{
return
ON_IsValidUnicodeCodePoint(unicode_code_point)
&& unicode_code_point > ON_wString::Space
&& 127 != unicode_code_point
Internal_IsValidComponentNameCodePoint(unicode_code_point)
&& 0 == ON_IsUnicodeSpaceCodePoint(unicode_code_point)
&& unicode_code_point != '('
&& unicode_code_point != ')'
&& unicode_code_point != '['
@@ -1906,50 +1914,45 @@ bool ON_ModelComponent::IsValidComponentName(
const wchar_t* candidate_component_name
)
{
bool bPermitInternalSpaces = true;
bool rc = false;
bool bLastCharWasSpace = false;
const bool bPermitInternalSpaces = true;
if (nullptr == candidate_component_name || 0 == candidate_component_name[0])
return false;
// the first character in a component name cannot be a bracket, space or below
if ( nullptr != candidate_component_name
&& *candidate_component_name > ON_wString::Space
&& *candidate_component_name != '('
&& *candidate_component_name != ')'
&& *candidate_component_name != '['
&& *candidate_component_name != ']'
&& *candidate_component_name != '{'
&& *candidate_component_name != '}'
)
const ON__UINT32 c2[2] = { (ON__UINT32)(candidate_component_name[0]), (ON__UINT32)(candidate_component_name[1]) };
const ON__UINT32 first_code_point
= ON_IsValidUTF32Value(c2[0])
? c2[0]
: (ON_IsValidUTF16SurrogatePair(c2[0], c2[1]) ? ON_DecodeUTF16SurrogatePair(c2[0], c2[1],0): 0)
;
bool rc = IsValidComponentNameFirstCodePoint(first_code_point);
bool bLastCharWasSpace = false;
for ( const wchar_t* name = candidate_component_name; 0 != *name && rc; name++ )
{
rc = true;
for ( const wchar_t* name = candidate_component_name; 0 != *name && rc; name++ )
const ON__UINT32 c = (ON__UINT32)(name[0]);
if (0 == Internal_IsValidComponentNameCodePoint(c))
{
#if (2 == ON_SIZEOF_WCHAR_T)
if (0 == ON_IsValidUTF16Singleton((ON__UINT32)(name[0])))
if (ON_IsValidUTF16SurrogatePair(c, (ON__UINT32)(name[1])))
{
if (ON_IsValidUTF16SurrogatePair((ON__UINT32)(name[0]), (ON__UINT32)(name[1])))
{
name++;
continue;
}
return false;
}
#elif (4 == ON_SIZEOF_WCHAR_T)
if (0 == ON_IsValidUTF32Value((ON__UINT32)(name[0])))
{
return false;
}
#endif
if ( ON_wString::Space == *name )
{
rc = bPermitInternalSpaces;
bLastCharWasSpace = true;
}
else if ( 127 == *name || *name < ON_wString::Space )
rc = false;
else
// all code points that come from surrogate pairs are permitted
bLastCharWasSpace = false;
name++;
continue;
}
return false;
}
if (ON_IsUnicodeSpaceCodePoint(c))
{
rc = bPermitInternalSpaces;
bLastCharWasSpace = true;
}
else
bLastCharWasSpace = false;
}
return (rc && !bLastCharWasSpace) ? true : false;
}