Basic static/moving circle collisions. (Fixes issue #5)

[python-bulletml.git] / bulletml / parser.py

diff --git a/bulletml/parser.py b/bulletml/parser.py
index 8f253fe..5435925 100644 (file)
--- a/bulletml/parser.py
+++ b/bulletml/parser.py
@@ -13,6 +13,12 @@ import math
 
 from xml.etree.ElementTree import ElementTree
 
+# Python 3 moved this for no really good reason.
+try:
+    from sys import intern
+except ImportError:
+    pass
+
 try:
     from io import StringIO
 except ImportError:
@@ -25,7 +31,7 @@ from bulletml.errors import Error
 from bulletml.expr import NumberDef, INumberDef
 
 
-__all_ = ["ParseError", "BulletML"]
+__all__ = ["ParseError", "BulletML"]
 
 class ParseError(Error):
     """Raised when an error occurs parsing the XML structure."""
@@ -64,7 +70,7 @@ class Direction(object):
     def __init__(self, type, value):
         if type not in self.VALID_TYPES:
             raise ValueError("invalid type %r" % type)
-        self.type = type
+        self.type = intern(type)
         self.value = value
 
     def __getstate__(self):
@@ -132,7 +138,7 @@ class Speed(object):
     def __init__(self, type, value):
         if type not in self.VALID_TYPES:
             raise ValueError("invalid type %r" % type)
-        self.type = type
+        self.type = intern(type)
         self.value = value
 
     def __getstate__(self):
@@ -355,10 +361,7 @@ class Accel(object):
 class BulletDef(object):
     """Bullet definition."""
 
-    direction = None
-    speed = None
-
-    def __init__(self, actions=[], direction=None, speed=None, tags=()):
+    def __init__(self, actions=(), direction=None, speed=None, tags=()):
         self.direction = direction
         self.speed = speed
         self.actions = list(actions)
@@ -386,6 +389,7 @@ class BulletDef(object):
         actions = []
         speed = None
         direction = None
+        tags = set()
         for subelem in element.getchildren():
             tag = realtag(subelem)
             if tag == "direction":
@@ -397,8 +401,8 @@ class BulletDef(object):
             elif tag == "actionRef":
                 actions.append(ActionRef.FromXML(doc, subelem))
             elif tag == "tag":
-                self.tags.add(subelem.text)
-        dfn = cls(actions, direction, speed)
+                tags.add(subelem.text)
+        dfn = cls(actions, direction, speed, tags)
         doc._bullets[element.get("label")] = dfn
         return dfn
 
@@ -536,7 +540,7 @@ class Offset(object):
     def __init__(self, type, x, y):
         if type not in self.VALID_TYPES:
             raise ValueError("invalid type %r" % type)
-        self.type = type
+        self.type = intern(type)
         self.x = x
         self.y = y
 
@@ -550,7 +554,9 @@ class Offset(object):
 
     def __setstate__(self, state):
         state = dict(state)
-        self.__init__(state["type"], state.get("x"), state.get("y"))
+        x = NumberDef(state["x"]) if "x" in state else None
+        y = NumberDef(state["y"]) if "y" in state else None
+        self.__init__(state["type"], x, y)
 
     @classmethod
     def FromXML(cls, doc, element):
@@ -613,6 +619,7 @@ class FireDef(object):
         direction = None
         speed = None
         offset = None
+        tags = set()
 
         for subelem in element.getchildren():
             tag = realtag(subelem)
@@ -627,9 +634,9 @@ class FireDef(object):
             elif tag == "offset":
                 offset = Offset.FromXML(doc, subelem)
             elif tag == "tag":
-                self.tags.add(subelem.text)
+                tags.add(subelem.text)
         try:
-            fire = cls(bullet, direction, speed, offset)
+            fire = cls(bullet, direction, speed, offset, tags)
         except UnboundLocalError as exc:
             raise ParseError(str(exc))
         else:
@@ -704,7 +711,7 @@ class BulletML(object):
         )
 
     def __init__(self, type="none", actions=None):
-        self.type = type
+        self.type = intern(type)
         self.actions = [] if actions is None else actions
 
     def __getstate__(self):
@@ -772,7 +779,7 @@ class BulletML(object):
         else:
             try:
                 return yaml.load(source)
-            except Exception, exc:
+            except Exception as exc:
                 raise ParseError(str(exc))
 
     @classmethod