- More progress, enough for now.

This commit is contained in:
ccremers 2005-11-16 19:50:40 +00:00
parent b436d4923a
commit 08f590f73d

View File

@ -45,9 +45,15 @@ def ifParse (str):
Basic = MatchFirst([ Variable, Constant, Number ]) Basic = MatchFirst([ Variable, Constant, Number ])
# Message definition is recursive
Message = Forward() Message = Forward()
def parseType(s,l,t): def parseType(s,l,t):
if t[0][0] == "pk":
# Public key thing, that's not really a type for
# us but a function
return [Term.TermEncrypt(t[0][1], t[0][0]) ]
term = t[0][1] term = t[0][1]
term.setType(t[0][0]) term.setType(t[0][0])
return [term] return [term]
@ -57,6 +63,9 @@ def ifParse (str):
def parseCrypt(s,l,t): def parseCrypt(s,l,t):
# Crypto types are ignored for now # Crypto types are ignored for now
type = t[0][0]
if type == "c":
return [Term.TermTuple( t[0][1],t[0][2] ) ]
return [Term.TermEncrypt(t[0][2],t[0][1])] return [Term.TermEncrypt(t[0][2],t[0][1])]
CryptOp = oneOf ("crypt scrypt c funct rcrypt tb") CryptOp = oneOf ("crypt scrypt c funct rcrypt tb")