Evaluation optimizations.

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

diff --git a/bulletml/parser.py b/bulletml/parser.py
index 0af6694..933be80 100644 (file)
--- a/bulletml/parser.py
+++ b/bulletml/parser.py
@@ -36,10 +36,7 @@ class ParamList(object):
                     self.params.append(NumberDef(subelem.text))
 
     def __call__(self, params, rank):
-        new_params = [param(params, rank) for param in self.params]
-        while len(new_params) < len(params):
-            new_params.append(params[len(new_params)])
-        return new_params
+        return [param(params, rank) for param in self.params]
 
     def __repr__(self):
         return "%s(%r)" % (type(self).__name__, self.params)
@@ -181,10 +178,8 @@ class Accel(object):
 
     def __call__(self, params, rank):
         frames = self.term(params, rank)
-        horizontal = self.horizontal and (
-            self.horizontal(params, rank), self.horizontal.type)
-        vertical = self.vertical and (
-            self.vertical(params, rank), self.vertical.type)
+        horizontal = self.horizontal and self.horizontal(params, rank)
+        vertical = self.vertical and self.vertical(params, rank)
         return frames, horizontal, vertical
 
     def __repr__(self):
@@ -207,14 +202,12 @@ class BulletDef(object):
             elif tag == "speed":
                 self.speed = Speed(doc, subelem)
             elif tag == "action":
-                self.actions.append(ActionDef(doc, element))
+                self.actions.append(ActionDef(doc, subelem))
             elif tag == "actionRef":
-                self.actions.append(ActionRef(doc, element))
+                self.actions.append(ActionRef(doc, subelem))
 
     def __call__(self, params, rank):
-        actions = []
-        for action in self.actions:
-            actions.append(action(params, rank))
+        actions = [action(params, rank) for action in self.actions]
         return (
             self.direction and self.direction(params, rank),
             self.speed and self.speed(params, rank),
@@ -296,7 +289,7 @@ class FireDef(object):
         for subelem in element.getchildren():
             tag = realtag(subelem)
             if tag == "direction":
-                self.direction = Direction(doc, subelem)
+                self.direction = Direction(doc, subelem, "aim")
             elif tag == "speed":
                 self.speed = Speed(doc, subelem)
             elif tag == "bullet":