- Reindented stuff (this was needed, really)
This commit is contained in:
parent
d02621c608
commit
a856e795b0
126
src/xmlout.c
126
src/xmlout.c
@ -98,7 +98,7 @@ xmlTermPrintInner (const Term term)
|
|||||||
{
|
{
|
||||||
if (term != NULL)
|
if (term != NULL)
|
||||||
{
|
{
|
||||||
if (realTermLeaf(term))
|
if (realTermLeaf (term))
|
||||||
{
|
{
|
||||||
// Variable?
|
// Variable?
|
||||||
if (realTermVariable (term))
|
if (realTermVariable (term))
|
||||||
@ -109,7 +109,7 @@ xmlTermPrintInner (const Term term)
|
|||||||
if (term->subst == NULL)
|
if (term->subst == NULL)
|
||||||
{
|
{
|
||||||
// Free variable
|
// Free variable
|
||||||
termPrint (term); // Must be a normal termPrint
|
termPrint (term); // Must be a normal termPrint
|
||||||
printf ("\" free=\"true\" />");
|
printf ("\" free=\"true\" />");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -117,7 +117,7 @@ xmlTermPrintInner (const Term term)
|
|||||||
// Bound variable
|
// Bound variable
|
||||||
substbuffer = term->subst; // Temporarily unsubst for printing
|
substbuffer = term->subst; // Temporarily unsubst for printing
|
||||||
term->subst = NULL;
|
term->subst = NULL;
|
||||||
termPrint (term); // Must be a normal termPrint
|
termPrint (term); // Must be a normal termPrint
|
||||||
term->subst = substbuffer;
|
term->subst = substbuffer;
|
||||||
printf ("\">");
|
printf ("\">");
|
||||||
xmlTermPrintInner (term->subst);
|
xmlTermPrintInner (term->subst);
|
||||||
@ -127,13 +127,13 @@ xmlTermPrintInner (const Term term)
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Constant
|
// Constant
|
||||||
termPrint (term); // Must be a normal termPrint
|
termPrint (term); // Must be a normal termPrint
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Node
|
// Node
|
||||||
if (realTermEncrypt(term))
|
if (realTermEncrypt (term))
|
||||||
{
|
{
|
||||||
if (isTermLeaf (TermKey (term))
|
if (isTermLeaf (TermKey (term))
|
||||||
&& inTermlist (TermKey (term)->stype, TERM_Function))
|
&& inTermlist (TermKey (term)->stype, TERM_Function))
|
||||||
@ -147,20 +147,20 @@ xmlTermPrintInner (const Term term)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
printf ("<encrypt><op>");
|
printf ("<encrypt><op>");
|
||||||
xmlTermPrintInner (TermOp(term));
|
xmlTermPrintInner (TermOp (term));
|
||||||
printf ("</op><key>");
|
printf ("</op><key>");
|
||||||
xmlTermPrintInner (TermKey(term));
|
xmlTermPrintInner (TermKey (term));
|
||||||
printf ("</key></encrypt>");
|
printf ("</key></encrypt>");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Assume tuple
|
// Assume tuple
|
||||||
printf ("<tuple><op1>");
|
printf ("<tuple><op1>");
|
||||||
xmlTermPrintInner (TermOp1(term));
|
xmlTermPrintInner (TermOp1 (term));
|
||||||
printf ("</op1><op2>");
|
printf ("</op1><op2>");
|
||||||
xmlTermPrintInner (TermOp2(term));
|
xmlTermPrintInner (TermOp2 (term));
|
||||||
printf ("</op2></tuple>");
|
printf ("</op2></tuple>");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -261,7 +261,7 @@ xmlAgentsOfRunPrint (const System sys, const int run)
|
|||||||
{
|
{
|
||||||
xmlPrint ("<role>");
|
xmlPrint ("<role>");
|
||||||
xmlOutTerm ("name", roles->term);
|
xmlOutTerm ("name", roles->term);
|
||||||
xmlOutTerm ("agent",deVar(agentOfRunRole (sys, run, roles->term)));
|
xmlOutTerm ("agent", deVar (agentOfRunRole (sys, run, roles->term)));
|
||||||
xmlPrint ("</role>");
|
xmlPrint ("</role>");
|
||||||
roles = roles->next;
|
roles = roles->next;
|
||||||
}
|
}
|
||||||
@ -360,65 +360,65 @@ xmlOutEvent (const System sys, Roledef rd, const int run, const int index)
|
|||||||
|
|
||||||
|
|
||||||
// Display any incoming bindings
|
// Display any incoming bindings
|
||||||
|
{
|
||||||
|
int incomingArrows;
|
||||||
|
|
||||||
|
int xmlBindingState (void *dt)
|
||||||
{
|
{
|
||||||
int incomingArrows;
|
Binding b;
|
||||||
|
|
||||||
int xmlBindingState (void *dt)
|
void xmlRunIndex (char *desc, const int run, const int index)
|
||||||
{
|
{
|
||||||
Binding b;
|
xmlPrint ("<%s run=\"%i\" index=\"%i\" />", desc, run, index);
|
||||||
|
|
||||||
void xmlRunIndex (char *desc, const int run, const int index)
|
|
||||||
{
|
|
||||||
xmlPrint ("<%s run=\"%i\" index=\"%i\" />", desc, run, index);
|
|
||||||
}
|
|
||||||
|
|
||||||
b = (Binding) dt;
|
|
||||||
if (b->run_to == run && b->ev_to == index)
|
|
||||||
{
|
|
||||||
if (isTermVariable (b->term) && ! b->done)
|
|
||||||
{
|
|
||||||
// Generate from m0
|
|
||||||
xmlPrint ("<choose>");
|
|
||||||
|
|
||||||
xmlindent++;
|
|
||||||
xmlIndentPrint ();
|
|
||||||
xmlTermPrint (b->term);
|
|
||||||
printf ("\n");
|
|
||||||
xmlindent--;
|
|
||||||
|
|
||||||
xmlPrint ("</choose>");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// Normal binding
|
|
||||||
xmlPrint ("<follows>");
|
|
||||||
|
|
||||||
xmlindent++;
|
|
||||||
if (b->done)
|
|
||||||
xmlRunIndex ("after", b->run_from, b->ev_from);
|
|
||||||
else
|
|
||||||
xmlPrint ("<unbound />");
|
|
||||||
if (b->blocked)
|
|
||||||
printf ("<blocked />");
|
|
||||||
xmlIndentPrint ();
|
|
||||||
xmlTermPrint (b->term);
|
|
||||||
printf ("\n");
|
|
||||||
xmlindent--;
|
|
||||||
|
|
||||||
xmlPrint ("</follows>");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
xmlindent++;
|
b = (Binding) dt;
|
||||||
if (sys->bindings != NULL)
|
if (b->run_to == run && b->ev_to == index)
|
||||||
{
|
{
|
||||||
list_iterate (sys->bindings, xmlBindingState);
|
if (isTermVariable (b->term) && !b->done)
|
||||||
|
{
|
||||||
|
// Generate from m0
|
||||||
|
xmlPrint ("<choose>");
|
||||||
|
|
||||||
|
xmlindent++;
|
||||||
|
xmlIndentPrint ();
|
||||||
|
xmlTermPrint (b->term);
|
||||||
|
printf ("\n");
|
||||||
|
xmlindent--;
|
||||||
|
|
||||||
|
xmlPrint ("</choose>");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Normal binding
|
||||||
|
xmlPrint ("<follows>");
|
||||||
|
|
||||||
|
xmlindent++;
|
||||||
|
if (b->done)
|
||||||
|
xmlRunIndex ("after", b->run_from, b->ev_from);
|
||||||
|
else
|
||||||
|
xmlPrint ("<unbound />");
|
||||||
|
if (b->blocked)
|
||||||
|
printf ("<blocked />");
|
||||||
|
xmlIndentPrint ();
|
||||||
|
xmlTermPrint (b->term);
|
||||||
|
printf ("\n");
|
||||||
|
xmlindent--;
|
||||||
|
|
||||||
|
xmlPrint ("</follows>");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
xmlindent--;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
xmlindent++;
|
||||||
|
if (sys->bindings != NULL)
|
||||||
|
{
|
||||||
|
list_iterate (sys->bindings, xmlBindingState);
|
||||||
|
}
|
||||||
|
xmlindent--;
|
||||||
|
}
|
||||||
|
|
||||||
xmlindent--;
|
xmlindent--;
|
||||||
xmlPrint ("</event>");
|
xmlPrint ("</event>");
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user