Reindent code for consistency.
This commit is contained in:
parent
369ae1e3f8
commit
0d9c23c33b
@ -195,7 +195,7 @@ goal_unbind (const Binding b)
|
|||||||
|
|
||||||
//! Check if term,run,ev already occurs in binding
|
//! Check if term,run,ev already occurs in binding
|
||||||
int
|
int
|
||||||
is_new_binding(const Term term, const int run, const int ev)
|
is_new_binding (const Term term, const int run, const int ev)
|
||||||
{
|
{
|
||||||
List bl = sys->bindings;
|
List bl = sys->bindings;
|
||||||
|
|
||||||
@ -252,7 +252,7 @@ goal_add (Term term, const int run, const int ev, const int level)
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Determine whether we already had it
|
// Determine whether we already had it
|
||||||
if (is_new_binding(term, run, ev))
|
if (is_new_binding (term, run, ev))
|
||||||
{
|
{
|
||||||
// Add a new binding
|
// Add a new binding
|
||||||
Binding b;
|
Binding b;
|
||||||
|
12
src/dotout.c
12
src/dotout.c
@ -726,7 +726,9 @@ isApplicationM0 (const System sys, const int run)
|
|||||||
* Name & documentation might be off; TODO later.
|
* Name & documentation might be off; TODO later.
|
||||||
* This is for now just a refactoring to get rid of trampolines.
|
* This is for now just a refactoring to get rid of trampolines.
|
||||||
*/
|
*/
|
||||||
int preceventPossible (const System sys, const int rank, const int run, const int rank2, const int run2, const int ev2)
|
int
|
||||||
|
preceventPossible (const System sys, const int rank, const int run,
|
||||||
|
const int rank2, const int run2, const int ev2)
|
||||||
{
|
{
|
||||||
// regular preceding event
|
// regular preceding event
|
||||||
|
|
||||||
@ -738,8 +740,7 @@ int preceventPossible (const System sys, const int rank, const int run, const in
|
|||||||
if (rank2 == rank)
|
if (rank2 == rank)
|
||||||
{
|
{
|
||||||
// equal rank: only if different run
|
// equal rank: only if different run
|
||||||
if ((sys->runs[run].protocol != INTRUDER)
|
if ((sys->runs[run].protocol != INTRUDER) && (run2 == run))
|
||||||
&& (run2 == run))
|
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -753,7 +754,8 @@ int preceventPossible (const System sys, const int rank, const int run, const in
|
|||||||
* This is for now just a refactoring to get rid of trampolines.
|
* This is for now just a refactoring to get rid of trampolines.
|
||||||
*/
|
*/
|
||||||
int
|
int
|
||||||
iteratePrecedingRole(const System sys, const int *ranks, const int run, const int ev, const int rank)
|
iteratePrecedingRole (const System sys, const int *ranks, const int run,
|
||||||
|
const int ev, const int rank)
|
||||||
{
|
{
|
||||||
int run2;
|
int run2;
|
||||||
|
|
||||||
@ -832,7 +834,7 @@ graph_ranks (int *ranks, int nodes)
|
|||||||
{
|
{
|
||||||
if (rd != NULL) // Shouldn't be needed (step should maintain invariant) but good to be safe
|
if (rd != NULL) // Shouldn't be needed (step should maintain invariant) but good to be safe
|
||||||
{
|
{
|
||||||
if ( ranks[eventNode (run, ev)] == INT_MAX)
|
if (ranks[eventNode (run, ev)] == INT_MAX)
|
||||||
{
|
{
|
||||||
if (iteratePrecedingRole (sys, ranks, run, ev, rank))
|
if (iteratePrecedingRole (sys, ranks, run, ev, rank))
|
||||||
{
|
{
|
||||||
|
@ -1703,7 +1703,8 @@ process_switches (int commandline)
|
|||||||
{
|
{
|
||||||
printf ("Try '%s --help' for more information, or visit:\n",
|
printf ("Try '%s --help' for more information, or visit:\n",
|
||||||
progname);
|
progname);
|
||||||
printf (" http://www.cs.ox.ac.uk/people/cas.cremers/scyther/index.html\n");
|
printf
|
||||||
|
(" http://www.cs.ox.ac.uk/people/cas.cremers/scyther/index.html\n");
|
||||||
exit (0);
|
exit (0);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -636,7 +636,7 @@ termLocal (const Term tPre, Termlist fromlist, Termlist tolist)
|
|||||||
if (tPre == NULL)
|
if (tPre == NULL)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
t = deVar(tPre);
|
t = deVar (tPre);
|
||||||
|
|
||||||
if (realTermLeaf (t))
|
if (realTermLeaf (t))
|
||||||
{
|
{
|
||||||
|
@ -539,13 +539,15 @@ isEventInteresting (const System sys, const Roledef rd)
|
|||||||
}
|
}
|
||||||
|
|
||||||
//! Refactoring code from below
|
//! Refactoring code from below
|
||||||
void xmlRunIndex (char *desc, const int run, const int index)
|
void
|
||||||
|
xmlRunIndex (char *desc, const int run, const int index)
|
||||||
{
|
{
|
||||||
xmlPrint ("<%s run=\"%i\" index=\"%i\" />", desc, run, index);
|
xmlPrint ("<%s run=\"%i\" index=\"%i\" />", desc, run, index);
|
||||||
}
|
}
|
||||||
|
|
||||||
//! Refactoring code from below
|
//! Refactoring code from below
|
||||||
void xmlShowThisBinding(const Binding b)
|
void
|
||||||
|
xmlShowThisBinding (const Binding b)
|
||||||
{
|
{
|
||||||
if (isTermVariable (b->term) && !b->done)
|
if (isTermVariable (b->term) && !b->done)
|
||||||
{
|
{
|
||||||
@ -656,7 +658,7 @@ xmlOutEvent (const System sys, Roledef rd, const int run, const int index)
|
|||||||
b = (Binding) bl->data;
|
b = (Binding) bl->data;
|
||||||
if (b->run_to == run && b->ev_to == index)
|
if (b->run_to == run && b->ev_to == index)
|
||||||
{
|
{
|
||||||
xmlShowThisBinding(b);
|
xmlShowThisBinding (b);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user