added support for maps

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@634803 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 26 insertions, 4 deletions

diff --git a/python/qpid/spec010.py b/python/qpid/spec010.py
index c3f3e6ad57..b84be7a047 100644
--- a/python/qpid/spec010.py
+++ b/python/qpid/spec010.py
@@ -122,7 +122,6 @@ class Type(Named, Node):
 
   def register(self, node):
     Named.register(self, node)
-    node.types.append(self)
     Node.register(self)
 
 class Primitive(Coded, Type):
@@ -133,6 +132,11 @@ class Primitive(Coded, Type):
     self.fixed = fixed
     self.variable = variable
 
+  def register(self, node):
+    Type.register(self, node)
+    if self.code is not None:
+      self.spec.types[self.code] = self
+
   def is_present(self, value):
     if self.fixed == 0:
       return value
@@ -265,7 +269,8 @@ class Struct(Composite):
 
   def register(self, node):
     Composite.register(self, node)
-    self.spec.structs[self.code] = self
+    if self.code is not None:
+      self.spec.structs[self.code] = self
 
   def __str__(self):
     fields = ",\n    ".join(["%s: %s" % (f.name, f.type.qname)
@@ -384,7 +389,6 @@ class Class(Named, Coded, Node):
     Named.__init__(self, name)
     Coded.__init__(self, code)
     Node.__init__(self, children)
-    self.types = []
     self.controls = []
     self.commands = []
 
@@ -441,6 +445,16 @@ class Exception(Named, Node):
 
 class Spec(Node):
 
+  ENCODINGS = {
+    basestring: "vbin16",
+    int: "int32",
+    long: "int64",
+    None.__class__: "void",
+    list: "list",
+    tuple: "list",
+    dict: "map"
+    }
+
   def __init__(self, major, minor, port, children):
     Node.__init__(self, children)
     self.major = major
@@ -448,7 +462,7 @@ class Spec(Node):
     self.port = port
     self.constants = []
     self.classes = []
-    self.types = []
+    self.types = {}
     self.qname = None
     self.spec = self
     self.klass = None
@@ -457,6 +471,14 @@ class Spec(Node):
     self.commands = {}
     self.structs = {}
 
+  def encoding(self, klass):
+    if Spec.ENCODINGS.has_key(klass):
+      return self.named[Spec.ENCODINGS[klass]]
+    for base in klass.__bases__:
+      result = self.encoding(base)
+      if result != None:
+        return result
+
 class Implement:
 
   def __init__(self, handle):