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

Allow for use of RECV instead of READ.

Browse Source 
Read will become deprecated later on.
This commit is contained in:
Cas Cremers 2008-08-20 16:15:27 +02:00
parent 739f59174f
commit aaf27779a3
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gui/Scyther/XMLReader.py
View File

@ -163,7 +163,7 @@ class XMLReader(object):
followlist.append(follow)
(etype,index) = (xml.get('type'),int(xml.get('index')))
if etype in ('send','read'):
if etype in ('send','read','recv'):
fr = self.readTerm(xml.find('from'))
to = self.readTerm(xml.find('to'))
message = self.readTerm(xml.find('message'))

12
src/parser.y
View File

@ -40,6 +40,7 @@ int yylex(void);
%token PROTOCOL
%token ROLE
%token READT
%token RECVT
%token SENDT
%token CLAIMT
%token VAR
@ -169,6 +170,10 @@ roledef : /* empty */
{ $$ = tacCat($1,$2); }
;
/*
* For now, recv and read are synonyms, but have their own branch below. That's ugly duplication. Ultimately we want to deprecate read,
* but that will take a while I guess.
*/
event : READT label '(' termlist ')' ';'
{ Tac t = tacCreate(TAC_READ);
t->t1.sym = $2;
@ -176,6 +181,13 @@ event : READT label '(' termlist ')' ';'
t->t2.tac = $4;
$$ = t;
}
| RECVT label '(' termlist ')' ';'
{ Tac t = tacCreate(TAC_READ);
t->t1.sym = $2;
/* TODO test here: tac2 should have at least 3 elements */
t->t2.tac = $4;
$$ = t;
}
| SENDT label '(' termlist ')' ';'
{ Tac t = tacCreate(TAC_SEND);
t->t1.sym = $2;

1
src/scanner.l
View File

@ -158,6 +158,7 @@ include BEGIN(incl);
protocol { return PROTOCOL; }
role { return ROLE; }
read { return READT; }
recv { return RECVT; }
send { return SENDT; }
var { return VAR; }
const { return CONST; }