From 7810ee475debdd4ab106f69d4127529e71838092 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Sat, 28 Apr 2012 17:28:40 +1200 Subject: More language tweaks. Separators this time - move to colon-separated features, use = for header key/value separation. --- libpathod/rparse.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libpathod/rparse.py') diff --git a/libpathod/rparse.py b/libpathod/rparse.py index 18d05a69..79f133df 100644 --- a/libpathod/rparse.py +++ b/libpathod/rparse.py @@ -158,13 +158,13 @@ class ValueGenerate: u = reduce(operator.or_, [pp.Literal(i) for i in klass.UNITS.keys()]) e = e + pp.Optional(u, default=None) - s = pp.Literal(":").suppress() + s = pp.Literal("-").suppress() s += reduce(operator.or_, [pp.Literal(i) for i in DATATYPES.keys()]) e += pp.Optional(s, default="bytes") return e.setParseAction(lambda x: klass(*x)) def __str__(self): - return "!%s%s:%s"%(self.usize, self.unit, self.datatype) + return "!%s%s-%s"%(self.usize, self.unit, self.datatype) class ValueFile: @@ -286,7 +286,7 @@ class Header: def expr(klass): e = pp.Literal("h").suppress() e += Value - e += pp.Literal(":").suppress() + e += pp.Literal("=").suppress() e += Value return e.setParseAction(lambda x: klass(*x)) @@ -342,7 +342,7 @@ class Response: resp = pp.And( [ Code.expr(), - pp.ZeroOrMore(pp.Literal(",").suppress() + atom) + pp.ZeroOrMore(pp.Literal(":").suppress() + atom) ] ) return resp -- cgit v1.2.3