- Claim iteration works nicely now.

src/arachne.c

@@ -14,6 +14,8 @@
 #include "states.h"
 #include "mgu.h"
 #include "arachne.h"
+#include "error.h"
+#include "claim.h"
 
 static System sys;
 Protocol INTRUDER;		// Pointers, to be set by the Init
@@ -777,16 +779,16 @@ iterate ()
 int
 arachne ()
 {
+  Claimlist cl;
   /*
    * set up claim role(s)
    */
 
   if (sys->maxruns > 0)
     {
-      sys->runs[0].length = roledef_length (sys->runs[0].start);
+      error ("Something is wrong, number of runs >0.");
     }
 
-#ifdef DEBUG
   int print_send (Protocol p, Role r, Roledef rd, int index)
   {
     eprintf ("IRS: ");
@@ -800,17 +802,48 @@ arachne ()
 
   iterate_role_sends (print_send);
 
-  explanation = NULL;
-  e_run = INVALID;
-  e_term1 = NULL;
-  e_term2 = NULL;
-  e_term3 = NULL;
-#endif
   indentDepth = 0;
-  printSemiState ();
+  cl = sys->claimlist;
+  while (cl != NULL)
+    {
+      Protocol p;
+      Role r;
 
-  /*
-   * iterate
-   */
-  iterate ();
+      explanation = NULL;
+      e_run = INVALID;
+      e_term1 = NULL;
+      e_term2 = NULL;
+      e_term3 = NULL;
+
+      p = (Protocol) cl->protocol;
+      r = (Role) cl->role;
+      indentPrint ();
+      eprintf ("Testing Claim ");
+      termPrint (cl->type);
+      eprintf (" in protocol ");
+      termPrint (p->nameterm);
+      eprintf (", role ");
+      termPrint (r->nameterm);
+      eprintf (" at index %i.\n", cl->ev);
+
+      indentDepth++;
+
+      roleInstance (sys, p, r, NULL);
+      sys->runs[0].length = cl->ev+1;
+#ifdef DEBUG
+      printSemiState ();
+#endif
+
+      /*
+       * iterate
+       */
+      iterate ();
+
+      //! Destroy
+      roleInstanceDestroy (sys);
+
+      // next
+      indentDepth--;
+      cl = cl->next;
+    }
 }

src/compiler.c

@@ -464,7 +464,9 @@ commEvent (int event, Tac tc)
       cl = memAlloc (sizeof (struct claimlist));
       cl->type = claim;
       cl->label = label;
+      cl->protocol = thisProtocol;
       cl->rolename = fromrole;
+      cl->role = thisRole;
       cl->count = 0;
       cl->failed = 0;
       cl->prec = NULL;

src/role.h

@@ -18,8 +18,12 @@ struct claimlist
   Term type;
   //! The term element for this node.
   Term label;
+  //! The pointer to the protocol (not defined yet?)
+  void *protocol;
   //! The name of the role in which it occurs.
   Term rolename;
+  //! The pointer to the role structure
+  void *role;
   //! Number of occurrences in system exploration.
   states_t count;
   //! Number of occurrences that failed.