U++ forum: Welcome to the forum

Re: Some questions about witz [message #37319 is a reply to message #37117]

Fri, 21 September 2012 23:34

dolik.rce
Messages: 1791
Registered: August 2008
Location: Czech Republic

Ultimate Contributor

Hi Mirek,

I think I found another little bug Smile

The subscript operators sometimes work wrong for maps with numeric indices. Testcase:

handler

SKYLARK(HomePage, "")
{
ValueMap m;
m.Add(1, "first");
m.Add(2, "second");

http("TEST", m)
.RenderResult("Test/index");
}

index.witz

This renders as:

TEST = { 1: first, 2: second }
TEST[0] = first
TEST[1] = second
TEST[2] = second
TEST[3] =

To fix it, it is necessary to first check for ValueMap and only after that try ValueArray in ExeBracket::Eval():

Value Compiler::ExeBracket::Eval(ExeContext& x) const
{
	Value m = value->Eval(x);
	Value q = index->Eval(x);
	if(IsValueMap(m)) {
		ValueMap map = m;
		return map[q];
	}
	if(IsNumber(q) && IsValueArray(m)) {
		ValueArray va = m;
		int i = q;
		if(i >= 0 && i < va.GetCount())
			return va[i];
	}
	return Value();	
}

With this fix it renders correctly as

TEST = { 1: first, 2: second }
TEST[0] =
TEST[1] = first
TEST[2] = second
TEST[3] =

Is this solution correct?

Best regards,
Honza

Report message to a moderator