andr3/scyther
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup: Cleanup of some spacing, conform coding conventions.

Browse Source 
This is simply the result from running reindent.sh again.
This commit is contained in:
Cas Cremers 2013-06-19 21:51:52 +02:00
parent c6280d745e
commit 45d5cb0a3a
5 changed files with 55 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/compiler.c
View File

@ -810,10 +810,12 @@ matchEvent (Tac tc)
myrole = thisRole->nameterm; myrole = thisRole->nameterm;
/* add send event */ /* add send event */
thisRole->roledef = roledefAdd (thisRole->roledef, SEND, label1, myrole, myrole, msg1, NULL); thisRole->roledef =
roledefAdd (thisRole->roledef, SEND, label1, myrole, myrole, msg1, NULL);
markLastRoledef (thisRole->roledef, tc->lineno); markLastRoledef (thisRole->roledef, tc->lineno);
/* add recv event */ /* add recv event */
thisRole->roledef = roledefAdd (thisRole->roledef, RECV, label1, myrole, myrole, msg2, NULL); thisRole->roledef =
roledefAdd (thisRole->roledef, RECV, label1, myrole, myrole, msg2, NULL);
markLastRoledef (thisRole->roledef, tc->lineno); markLastRoledef (thisRole->roledef, tc->lineno);
} }
@ -835,7 +837,8 @@ nonMatchEvent (Tac tc)
mpat = tacTerm (tc->t1.tac); mpat = tacTerm (tc->t1.tac);
mmsg = tacTerm (tc->t2.tac); mmsg = tacTerm (tc->t2.tac);
msg = makeTermTuple (mpat, mmsg); msg = makeTermTuple (mpat, mmsg);
claimCreate (sys, thisProtocol, thisRole, CLAIM_Notequal, NULL, msg, tc->lineno); claimCreate (sys, thisProtocol, thisRole, CLAIM_Notequal, NULL, msg,
tc->lineno);
} }
//! Parse a communication event tc of type event, and add a role definition event for it. //! Parse a communication event tc of type event, and add a role definition event for it.

6
src/prune_theorems.c
View File

@ -212,13 +212,15 @@ inequalityConstraints (const System sys)
if (isTermEqual (rd->claiminfo->type, CLAIM_Notequal)) if (isTermEqual (rd->claiminfo->type, CLAIM_Notequal))
{ {
// TODO ASSERT: Message should be a pair for NotEqual claims // TODO ASSERT: Message should be a pair for NotEqual claims
if (isTermEqual (TermOp1(rd->message),TermOp2(rd->message))) if (isTermEqual
(TermOp1 (rd->message), TermOp2 (rd->message)))
{ {
// Inequality violated, no solution exists that makes them inequal anymore. // Inequality violated, no solution exists that makes them inequal anymore.
if (switches.output == PROOF) if (switches.output == PROOF)
{ {
indentPrint (); indentPrint ();
eprintf ("Pruned because the pattern violates an inequality constraint based on the term "); eprintf
("Pruned because the pattern violates an inequality constraint based on the term ");
termPrint (TermOp1 (rd->message)); termPrint (TermOp1 (rd->message));
eprintf (".\n"); eprintf (".\n");
} }