+2005-08-09 Graydon Hoare <graydon@redhat.com>
+
+ * elaborate.cxx:
+ (delete_statement_symresolution_info): New struct.
+ (symresolution_info::visit_delete_statement): Use it.
+ (delete_statement_typeresolution_info): New struct.
+ (typeresolution_info::visit_delete_statement): Use it.
+ (symresolution_info::find_var): Accept -1 as 'unknown' arity.
+ * elaborate.h: Update to reflect changes in .cxx.
+ * translate.cxx (mapvar::del): New method.
+ (c_unparser::getmap): Check arity >= 1;
+ (delete_statement_operand_visitor): New struct.
+ (c_unparser::visit_delete_statement): Use it.
+ * staptree.cxx (vardecl::set_arity): Accept and ignore -1.
+ (vardecl::compatible_arity): Likewise.
+ * testsuite/buildok/eight.stp: New test for 'delete' operator.
+
2005-08-08 Roland McGrath <roland@redhat.com>
* loc2c-test.c: New file.
e->block->visit (this);
}
+struct
+delete_statement_symresolution_info:
+ public traversing_visitor
+{
+ symresolution_info *parent;
+
+ delete_statement_symresolution_info (symresolution_info *p):
+ parent(p)
+ {}
+
+ void visit_arrayindex (arrayindex* e)
+ {
+ parent->visit_arrayindex (e);
+ }
+ void visit_functioncall (functioncall* e)
+ {
+ parent->visit_functioncall (e);
+ }
+
+ void visit_symbol (symbol* e)
+ {
+ if (e->referent)
+ return;
+
+ vardecl* d = parent->find_var (e->name, -1);
+ if (d)
+ e->referent = d;
+ else
+ throw semantic_error ("unresolved array in delete statement", e->tok);
+ }
+};
+
+void
+symresolution_info::visit_delete_statement (delete_statement* s)
+{
+ delete_statement_symresolution_info di (this);
+ s->value->visit (&di);
+}
+
void
symresolution_info::visit_symbol (symbol* e)
vardecl*
-symresolution_info::find_var (const string& name, unsigned arity)
+symresolution_info::find_var (const string& name, int arity)
{
// search locals
// search processed globals
for (unsigned i=0; i<session.globals.size(); i++)
if (session.globals[i]->name == name
- && session.globals[i]->compatible_arity(arity))
+ && session.globals[i]->compatible_arity(arity))
{
session.globals[i]->set_arity (arity);
return session.globals[i];
}
-
+
// search library globals
for (unsigned i=0; i<session.library_files.size(); i++)
{
vardecl* g = f->globals[j];
if (g->name == name && g->compatible_arity (arity))
{
- g->set_arity (arity);
+ g->set_arity (arity);
// put library into the queue if not already there
if (find (session.files.begin(), session.files.end(), f)
}
+struct delete_statement_typeresolution_info:
+ public throwing_visitor
+{
+ typeresolution_info *parent;
+ delete_statement_typeresolution_info (typeresolution_info *p):
+ throwing_visitor ("invalid operand of delete expression"),
+ parent (p)
+ {}
+
+ void visit_arrayindex (arrayindex* e)
+ {
+ parent->visit_arrayindex (e);
+ }
+
+ void visit_symbol (symbol* e)
+ {
+ exp_type ignored = pe_unknown;
+ assert (e->referent != 0);
+ resolve_2types (e, e->referent, parent, ignored);
+ }
+};
+
+
void
typeresolution_info::visit_delete_statement (delete_statement* e)
{
- // XXX: not yet supported
- unresolved (e->tok);
+ delete_statement_typeresolution_info di (this);
+ t = pe_unknown;
+ e->value->visit (&di);
}
// XXX: instead in systemtap_session?
void derive_probes (match_node * root, probe *p, std::vector<derived_probe*>& dps);
-
-protected:
- vardecl* find_var (const std::string& name, unsigned arity);
+ vardecl* find_var (const std::string& name, int arity);
functiondecl* find_function (const std::string& name, unsigned arity);
void visit_block (block *s);
void visit_foreach_loop (foreach_loop* e);
void visit_arrayindex (arrayindex* e);
void visit_functioncall (functioncall* e);
+ void visit_delete_statement (delete_statement* s);
};
void
vardecl::set_arity (int a)
{
- assert (a >= 0);
+ if (a < 0)
+ return;
if (arity != a && arity >= 0)
throw semantic_error ("inconsistent arity", tok);
bool
vardecl::compatible_arity (int a)
{
- if (arity == -1)
+ if (arity == -1 || a == -1)
return true;
return arity == a;
}
--- /dev/null
+#! stap -p4
+
+global foo
+
+probe begin {
+ foo[1] = 1
+ delete foo[1]
+ delete foo[foo[foo[foo[1]]]]
+ delete foo
+}
static string key_typename(exp_type e);
static string value_typename(exp_type e);
+ string del () const
+ {
+ return "_stp_map_key_del (" + qname() + ")";
+ }
+
string seek (vector<tmpvar> const & indices) const
{
string result = "_stp_map_key" + mangled_indices() + " (";
mapvar
c_unparser::getmap(vardecl *v, token const *tok)
-{
+{
+ if (v->arity < 1)
+ throw new semantic_error("attempt to use scalar where map expected", tok);
return mapvar (is_local (v, tok), v->type, v->name, v->index_types);
}
}
+struct delete_statement_operand_visitor:
+ public throwing_visitor
+{
+ c_unparser *parent;
+ delete_statement_operand_visitor (c_unparser *p):
+ throwing_visitor ("invalid operand of delete expression"),
+ parent (p)
+ {}
+ void visit_symbol (symbol* e);
+ void visit_arrayindex (arrayindex* e);
+};
+
+void
+delete_statement_operand_visitor::visit_symbol (symbol* e)
+{
+ mapvar mvar = parent->getmap(e->referent, e->tok);
+ varlock guard (*parent, mvar);
+ parent->o->newline() << mvar.fini ();
+ parent->o->newline() << mvar.init ();
+}
+
+void
+delete_statement_operand_visitor::visit_arrayindex (arrayindex* e)
+{
+ vector<tmpvar> idx;
+ parent->load_map_indices (e, idx);
+ parent->o->newline() << "if (unlikely (c->errorcount)) goto out;";
+ {
+ mapvar mvar = parent->getmap (e->referent, e->tok);
+ varlock guard (*parent, mvar);
+ parent->o->newline() << mvar.seek (idx) << ";";
+ parent->o->newline() << mvar.del () << ";";
+ }
+}
+
+
void
c_unparser::visit_delete_statement (delete_statement* s)
{
- throw semantic_error ("delete statement not yet implemented", s->tok);
+ delete_statement_operand_visitor dv (this);
+ s->value->visit (&dv);
}