From 6f485818cbf237cdcd6fd3bfc7215b61f3656e14 Mon Sep 17 00:00:00 2001 From: "Rafael H. Schloming" Date: Thu, 17 Dec 2009 04:56:17 +0000 Subject: QPID-2286: added list support to address parser git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@891536 13f79535-47bb-0310-9956-ffa450edef68 --- python/qpid/address.py | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) (limited to 'python/qpid/address.py') diff --git a/python/qpid/address.py b/python/qpid/address.py index 5c675b8782..6228ac757b 100644 --- a/python/qpid/address.py +++ b/python/qpid/address.py @@ -24,6 +24,8 @@ l = Lexicon() LBRACE = l.define("LBRACE", r"\{") RBRACE = l.define("RBRACE", r"\}") +LBRACK = l.define("LBRACK", r"\[") +RBRACK = l.define("RBRACK", r"\]") COLON = l.define("COLON", r":") SEMI = l.define("SEMI", r";") SLASH = l.define("SLASH", r"/") @@ -128,8 +130,30 @@ class AddressParser(Parser): return tok2obj(self.eat()) elif self.matches(LBRACE): return self.map() + elif self.matches(LBRACK): + return self.list() else: - raise ParseError(self.next(), NUMBER, STRING, ID, LBRACE) + raise ParseError(self.next(), NUMBER, STRING, ID, LBRACE, LBRACK) + + def list(self): + self.eat(LBRACK) + + result = [] + + while True: + if self.matches(RBRACK): + break + else: + result.append(self.value()) + if self.matches(COMMA): + self.eat(COMMA) + elif self.matches(RBRACK): + break + else: + raise ParseError(self.next(), COMMA, RBRACK) + + self.eat(RBRACK) + return result def parse(addr): return AddressParser(lex(addr)).parse() -- cgit v1.2.1