From 631dfd9bd1b96540ccdc5d2419f2c47a9e15253e Mon Sep 17 00:00:00 2001 From: "Rafael H. Schloming" Date: Fri, 22 Jan 2010 14:26:11 +0000 Subject: added boolean literals to java & python address parser; added validation to python address usage git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@902095 13f79535-47bb-0310-9956-ffa450edef68 --- python/qpid/address.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'python/qpid/address.py') diff --git a/python/qpid/address.py b/python/qpid/address.py index bda7157a5f..ab0fe8221a 100644 --- a/python/qpid/address.py +++ b/python/qpid/address.py @@ -31,6 +31,8 @@ SEMI = l.define("SEMI", r";") SLASH = l.define("SLASH", r"/") COMMA = l.define("COMMA", r",") NUMBER = l.define("NUMBER", r'[+-]?[0-9]*\.?[0-9]+') +TRUE = l.define("TRUE", r'True') +FALSE = l.define("FALSE", r'False') ID = l.define("ID", r'[a-zA-Z_](?:[a-zA-Z0-9_-]*[a-zA-Z0-9_])?') STRING = l.define("STRING", r""""(?:[^\\"]|\\.)*"|'(?:[^\\']|\\.)*'""") ESC = l.define("ESC", r"\\[^ux]|\\x[0-9a-fA-F][0-9a-fA-F]|\\u[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]") @@ -59,6 +61,10 @@ def tok2str(tok): def tok2obj(tok): if tok.type in (STRING, NUMBER): return eval(tok.value) + elif tok.type == TRUE: + return True + elif tok.type == FALSE: + return False else: return tok.value @@ -127,7 +133,7 @@ class AddressParser(Parser): return (key, val) def value(self): - if self.matches(NUMBER, STRING, ID): + if self.matches(NUMBER, STRING, ID, TRUE, FALSE): return tok2obj(self.eat()) elif self.matches(LBRACE): return self.map() -- cgit v1.2.1