1 files changed, 14 insertions, 6 deletions
diff --git a/staptree.h b/staptree.h
index b38221bc..cb22969b 100644
--- a/staptree.h
+++ b/staptree.h
@@ -364,18 +364,26 @@ struct stapfile
 };
 
 
-struct probe_point_spec // inherit from something or other?
-{
-  string functor;
-  const token* tok;
-  literal* arg;
+class provider;
+struct probe_point
+{
+  struct component // XXX: sort of a restricted functioncall
+  { 
+    string functor;
+    literal* arg;
+    component ();
+  };
+  vector<component*> components;
+  const token* tok; // points to first component's functor
+  provider* prov;
   void print (ostream& o);
+  probe_point ();
 };
 
 
 struct probe
 {
-  vector<probe_point_spec*> location;
+  vector<probe_point*> locations;
   const token* tok;
   block* body;
   vector<vardecl*> locals;