- Improved readability of printed claims.

- Fixed comment.
This commit is contained in:
ccremers 2004-10-14 13:19:36 +00:00
parent 0efd39e028
commit 2bc1df6135
3 changed files with 33 additions and 11 deletions

View File

@ -757,19 +757,37 @@ timersPrint (const System sys)
anyclaims = 0; anyclaims = 0;
while (cl_scan != NULL) while (cl_scan != NULL)
{ {
/**
* for now, we don't print the actual claim label.
*@todo When termPrint can also go to stderr, fix this.
*/
anyclaims = 1; anyclaims = 1;
eprintf ("claim\t"); eprintf ("claim\t");
/* claim label is tuple */
if (realTermTuple (cl_scan->label))
{
/* modern version: claim label is tuple (protocname, label) */
/* first print protocol.role */
termPrint (cl_scan->label->left.op1);
eprintf (".");
termPrint (cl_scan->rolename);
eprintf ("\t");
/* second print event_label */
termPrint (cl_scan->type);
eprintf ("_");
termPrint (cl_scan->label->right.op2);
eprintf ("\t");
}
else
{
/* old-fashioned output */
termPrint (cl_scan->type); termPrint (cl_scan->type);
eprintf ("\t"); eprintf ("\t");
termPrint (cl_scan->rolename); termPrint (cl_scan->rolename);
eprintf (" ("); eprintf (" (");
termPrint (cl_scan->label); termPrint (cl_scan->label);
eprintf (")\tfound:\t"); eprintf (")\t");
}
/* print counts etc. */
eprintf ("found:\t");
statesFormat (cl_scan->count); statesFormat (cl_scan->count);
if (cl_scan->count > 0) if (cl_scan->count > 0)
{ {

View File

@ -18,7 +18,8 @@ struct claimlist
Term type; Term type;
//! The term element for this node. //! The term element for this node.
Term label; Term label;
//! The pointer to the protocol (not defined yet?) //! The pointer to the protocol (not defined typically, because
//! at compile time of the claim the protocol structure is not known yet.)
void *protocol; void *protocol;
//! The name of the role in which it occurs. //! The name of the role in which it occurs.
Term rolename; Term rolename;

View File

@ -1,3 +1,6 @@
- Make different error codes for compilation error/ other error. This can be
useful for scripts. However, it might shift some constants for the Elegast
scripts.
- Consider where in Arachne dependency graph is used. If this is only for - Consider where in Arachne dependency graph is used. If this is only for
pruning states, we can construct it there only. However, the base 'role pruning states, we can construct it there only. However, the base 'role
defs/bindings' graph might be re-used. defs/bindings' graph might be re-used.