}
default:
assert(0);
- throw Exception::BadType(ValueBase::type_name(get_type()));
+ throw Exception::BadType(ValueBase::type_local_name(get_type()));
}
}
bool
ValueNode_Composite::set_link_vfunc(int i,ValueNode::Handle x)
{
- assert(i>=0);
- assert(i<6);
+ assert(i>=0 && i<link_count());
if(PlaceholderValueNode::Handle::cast_dynamic(x))
{
switch(get_type())
{
case ValueBase::TYPE_VECTOR:
- assert(i<2);
if(x->get_type()==ValueBase(Real()).get_type() || PlaceholderValueNode::Handle::cast_dynamic(x))
{
components[i]=x;
break;
case ValueBase::TYPE_COLOR:
- assert(i<4);
if(x->get_type()==ValueBase(Real()).get_type() || PlaceholderValueNode::Handle::cast_dynamic(x))
{
components[i]=x;
break;
case ValueBase::TYPE_SEGMENT:
- assert(i<4);
if(x->get_type()==ValueBase(Point()).get_type() || PlaceholderValueNode::Handle::cast_dynamic(x))
{
components[i]=x;
break;
case ValueBase::TYPE_BLINEPOINT:
- assert(i<6);
if((i==0 || i==4 || i==5) && x->get_type()==ValueBase(Point()).get_type())
{
components[i]=x;
ValueNode::LooseHandle
ValueNode_Composite::get_link_vfunc(int i)const
{
- assert(i>=0 && i<6);
+ assert(i>=0 && i<link_count());
+
return components[i];
}
String
ValueNode_Composite::link_local_name(int i)const
{
- assert(i>=0 && i<6);
+ assert(i>=0 && i<link_count());
+
switch(get_type())
{
case ValueBase::TYPE_VECTOR:
String
ValueNode_Composite::link_name(int i)const
{
- assert(i>=0 && i<5);
+ assert(i>=0 && i<link_count());
+
return strprintf("c%d",i);
}