Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-10 10:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

GH-213: change type of vector for-loop index to a count

Browse source
This commit is contained in:
Jon Siwek 2019-01-14 18:02:05 -06:00
parent 89da20339d
commit ed1a50ec5b
4 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Stmt.cc
View file

@ -1387,7 +1387,7 @@ ForStmt::ForStmt(id_list* arg_loop_vars, Expr* loop_expr)
BroType* t = (*loop_vars)[0]->Type();
if ( ! t )
delete add_local((*loop_vars)[0], base_type(TYPE_INT),
delete add_local((*loop_vars)[0], base_type(TYPE_COUNT),
INIT_NONE, 0, 0, VAR_REGULAR);
else if ( ! IsIntegral(t->Tag()) )
@ -1470,7 +1470,7 @@ Val* ForStmt::DoExec(Frame* f, Val* v, stmt_flow_type& flow) const
{
VectorVal* vv = v->AsVectorVal();
for ( int i = 0; i <= int(vv->Size()); ++i )
for ( auto i = 0u; i <= vv->Size(); ++i )
{
// Skip unassigned vector indices.
if ( ! vv->Lookup(i) )
@ -1479,7 +1479,7 @@ Val* ForStmt::DoExec(Frame* f, Val* v, stmt_flow_type& flow) const
// Set the loop variable to the current index, and make
// another pass over the loop body.
f->SetElement((*loop_vars)[0]->Offset(),
new Val(i, TYPE_INT));
new Val(i, TYPE_COUNT));
flow = FLOW_NEXT;
ret = body->Exec(f, flow);