projects
/
python-bulletml.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
70d2519
)
Order state elements to generate more readable YAML.
author
Joe Wreschnig
<joe.wreschnig@gmail.com>
Fri, 19 Mar 2010 05:45:31 +0000
(22:45 -0700)
committer
Joe Wreschnig
<joe.wreschnig@gmail.com>
Fri, 19 Mar 2010 05:45:31 +0000
(22:45 -0700)
bulletml/parser.py
patch
|
blob
|
history
diff --git
a/bulletml/parser.py
b/bulletml/parser.py
index
10b789a
..
51e15ad
100644
(file)
--- a/
bulletml/parser.py
+++ b/
bulletml/parser.py
@@
-45,7
+45,7
@@
class ParamList(object):
self.params = list(params)
@classmethod
self.params = list(params)
@classmethod
- def From
Element
(cls, doc, element):
+ def From
XML
(cls, doc, element):
"""Construct using an ElementTree-style element."""
return cls([NumberDef(subelem.text) for subelem in element
if realtag(subelem) == "param"])
"""Construct using an ElementTree-style element."""
return cls([NumberDef(subelem.text) for subelem in element
if realtag(subelem) == "param"])
@@
-68,13
+68,14
@@
class Direction(object):
self.value = value
def __getstate__(self):
self.value = value
def __getstate__(self):
- return
dict(type=self.type, value=self.value.expr)
+ return
[('type', self.type), ('value', self.value.expr)]
def __setstate__(self, state):
def __setstate__(self, state):
+ state = dict(state)
self.__init__(state["type"], NumberDef(state["value"]))
@classmethod
self.__init__(state["type"], NumberDef(state["value"]))
@classmethod
- def From
Element
(cls, doc, element, default="absolute"):
+ def From
XML
(cls, doc, element, default="absolute"):
"""Construct using an ElementTree-style element."""
return cls(element.get("type", default), NumberDef(element.text))
"""Construct using an ElementTree-style element."""
return cls(element.get("type", default), NumberDef(element.text))
@@
-93,21
+94,22
@@
class ChangeDirection(object):
self.direction = direction
def __getstate__(self):
self.direction = direction
def __getstate__(self):
- return
dict(frames=self.term.expr
,
-
type=self.direction.type
,
- value=self.direction.value.expr)
+ return
[('frames', self.term.expr)
,
+
('type', self.direction.type)
,
+ ('value', self.direction.value.expr)]
def __setstate__(self, state):
def __setstate__(self, state):
+ state = dict(state)
self.__init__(INumberDef(state["frames"]),
Direction(state["type"], NumberDef(state["value"])))
@classmethod
self.__init__(INumberDef(state["frames"]),
Direction(state["type"], NumberDef(state["value"])))
@classmethod
- def From
Element
(cls, doc, element):
+ def From
XML
(cls, doc, element):
"""Construct using an ElementTree-style element."""
for subelem in element.getchildren():
tag = realtag(subelem)
if tag == "direction":
"""Construct using an ElementTree-style element."""
for subelem in element.getchildren():
tag = realtag(subelem)
if tag == "direction":
- direction = Direction.From
Element
(doc, subelem)
+ direction = Direction.From
XML
(doc, subelem)
elif tag == "term":
term = INumberDef(subelem.text)
try:
elif tag == "term":
term = INumberDef(subelem.text)
try:
@@
-134,13
+136,14
@@
class Speed(object):
self.value = value
def __getstate__(self):
self.value = value
def __getstate__(self):
- return
dict(type=self.type, value=self.value.expr)
+ return
[('type', self.type), ('value', self.value.expr)]
def __setstate__(self, state):
def __setstate__(self, state):
+ state = dict(state)
self.__init__(state["type"], NumberDef(state["value"]))
@classmethod
self.__init__(state["type"], NumberDef(state["value"]))
@classmethod
- def From
Element
(cls, doc, element):
+ def From
XML
(cls, doc, element):
"""Construct using an ElementTree-style element."""
return cls(element.get("type", "absolute"), NumberDef(element.text))
"""Construct using an ElementTree-style element."""
return cls(element.get("type", "absolute"), NumberDef(element.text))
@@
-158,21
+161,22
@@
class ChangeSpeed(object):
self.speed = speed
def __getstate__(self):
self.speed = speed
def __getstate__(self):
- return
dict(frames=self.term.expr
,
-
type=self.speed.type
,
- value=self.speed.value.expr)
+ return
[('frames', self.term.expr)
,
+
('type', self.speed.type)
,
+ ('value', self.speed.value.expr)]
def __setstate__(self, state):
def __setstate__(self, state):
+ state = dict(state)
self.__init__(INumberDef(state["frames"]),
Speed(state["type"], NumberDef(state["value"])))
@classmethod
self.__init__(INumberDef(state["frames"]),
Speed(state["type"], NumberDef(state["value"])))
@classmethod
- def From
Element
(cls, doc, element):
+ def From
XML
(cls, doc, element):
"""Construct using an ElementTree-style element."""
for subelem in element.getchildren():
tag = realtag(subelem)
if tag == "speed":
"""Construct using an ElementTree-style element."""
for subelem in element.getchildren():
tag = realtag(subelem)
if tag == "speed":
- speed = Speed.From
Element
(doc, subelem)
+ speed = Speed.From
XML
(doc, subelem)
elif tag == "term":
term = INumberDef(subelem.text)
try:
elif tag == "term":
term = INumberDef(subelem.text)
try:
@@
-200,7
+204,7
@@
class Wait(object):
self.__init__(INumberDef(state["frames"]))
@classmethod
self.__init__(INumberDef(state["frames"]))
@classmethod
- def From
Element
(cls, doc, element):
+ def From
XML
(cls, doc, element):
"""Construct using an ElementTree-style element."""
return cls(INumberDef(element.text))
"""Construct using an ElementTree-style element."""
return cls(INumberDef(element.text))
@@
-223,7
+227,7
@@
class Tag(object):
self.__init__(state["tag"])
@classmethod
self.__init__(state["tag"])
@classmethod
- def From
Element
(cls, doc, element):
+ def From
XML
(cls, doc, element):
"""Construct using an ElementTree-style element."""
return cls(element.text)
"""Construct using an ElementTree-style element."""
return cls(element.text)
@@
-240,7
+244,7
@@
class Untag(object):
self.__init__(state["tag"])
@classmethod
self.__init__(state["tag"])
@classmethod
- def From
Element
(cls, doc, element):
+ def From
XML
(cls, doc, element):
"""Construct using an ElementTree-style element."""
return cls(element.text)
"""Construct using an ElementTree-style element."""
return cls(element.text)
@@
-251,7
+255,7
@@
class Vanish(object):
pass
@classmethod
pass
@classmethod
- def From
Element
(cls, doc, element):
+ def From
XML
(cls, doc, element):
"""Construct using an ElementTree-style element."""
return cls()
"""Construct using an ElementTree-style element."""
return cls()
@@
-266,22
+270,23
@@
class Repeat(object):
self.action = action
def __getstate__(self):
self.action = action
def __getstate__(self):
- return
dict(times=self.times.expr, action=self.action)
+ return
[('times', self.times.expr), ('action', self.action)]
def __setstate__(self, state):
def __setstate__(self, state):
+ state = dict(state)
self.__init__(INumberDef(state["times"]), state["action"])
@classmethod
self.__init__(INumberDef(state["times"]), state["action"])
@classmethod
- def From
Element
(cls, doc, element):
+ def From
XML
(cls, doc, element):
"""Construct using an ElementTree-style element."""
for subelem in element.getchildren():
tag = realtag(subelem)
if tag == "times":
times = INumberDef(subelem.text)
elif tag == "action":
"""Construct using an ElementTree-style element."""
for subelem in element.getchildren():
tag = realtag(subelem)
if tag == "times":
times = INumberDef(subelem.text)
elif tag == "action":
- action = ActionDef.From
Element
(doc, subelem)
+ action = ActionDef.From
XML
(doc, subelem)
elif tag == "actionRef":
elif tag == "actionRef":
- action = ActionRef.From
Element
(doc, subelem)
+ action = ActionRef.From
XML
(doc, subelem)
try:
return cls(times, action)
except UnboundLocalError as exc:
try:
return cls(times, action)
except UnboundLocalError as exc:
@@
-305,19
+310,20
@@
class Accel(object):
self.vertical = vertical
def __getstate__(self):
self.vertical = vertical
def __getstate__(self):
- state =
dict(frames=self.term.expr)
+ state =
[('frames', self.term.expr)]
if self.horizontal:
if self.horizontal:
- state
["horizontal"] = self.horizontal
+ state
.append(('horizontal', self.horizontal))
if self.vertical:
if self.vertical:
- state
["vertical"] = self.vertical
+ state
.append(('vertical', self.vertical))
return state
def __setstate__(self, state):
return state
def __setstate__(self, state):
+ state = dict(state)
self.__init__(INumberDef(state["frames"]), state.get("horizontal"),
state.get("vertical"))
@classmethod
self.__init__(INumberDef(state["frames"]), state.get("horizontal"),
state.get("vertical"))
@classmethod
- def From
Element
(cls, doc, element):
+ def From
XML
(cls, doc, element):
"""Construct using an ElementTree-style element."""
horizontal = None
vertical = None
"""Construct using an ElementTree-style element."""
horizontal = None
vertical = None
@@
-327,9
+333,9
@@
class Accel(object):
if tag == "term":
term = INumberDef(subelem.text)
elif tag == "horizontal":
if tag == "term":
term = INumberDef(subelem.text)
elif tag == "horizontal":
- horizontal = Speed.From
Element
(doc, subelem)
+ horizontal = Speed.From
XML
(doc, subelem)
elif tag == "vertical":
elif tag == "vertical":
- vertical = Speed.From
Element
(doc, subelem)
+ vertical = Speed.From
XML
(doc, subelem)
try:
return cls(term, horizontal, vertical)
try:
return cls(term, horizontal, vertical)
@@
-358,20
+364,21
@@
class BulletDef(object):
self.actions = list(actions)
def __getstate__(self):
self.actions = list(actions)
def __getstate__(self):
- state =
dict()
+ state =
[]
if self.direction:
if self.direction:
- state
["direction"] = self.direction
+ state
.append(("direction", self.direction))
if self.speed:
if self.speed:
- state
["speed"] = self.speed
+ state
.append(("speed", self.speed))
if self.actions:
if self.actions:
- state
["actions"] = self.actions
+ state
.append(("actions", self.actions))
return state
def __setstate__(self, state):
return state
def __setstate__(self, state):
+ state = dict(state)
self.__init__(**state)
@classmethod
self.__init__(**state)
@classmethod
- def From
Element
(cls, doc, element):
+ def From
XML
(cls, doc, element):
"""Construct using an ElementTree-style element."""
actions = []
speed = None
"""Construct using an ElementTree-style element."""
actions = []
speed = None
@@
-379,13
+386,13
@@
class BulletDef(object):
for subelem in element.getchildren():
tag = realtag(subelem)
if tag == "direction":
for subelem in element.getchildren():
tag = realtag(subelem)
if tag == "direction":
- direction = Direction.From
Element
(doc, subelem)
+ direction = Direction.From
XML
(doc, subelem)
elif tag == "speed":
elif tag == "speed":
- speed = Speed.From
Element
(doc, subelem)
+ speed = Speed.From
XML
(doc, subelem)
elif tag == "action":
elif tag == "action":
- actions.append(ActionDef.From
Element
(doc, subelem))
+ actions.append(ActionDef.From
XML
(doc, subelem))
elif tag == "actionRef":
elif tag == "actionRef":
- actions.append(ActionRef.From
Element
(doc, subelem))
+ actions.append(ActionRef.From
XML
(doc, subelem))
dfn = cls(actions, direction, speed)
doc.bullets[element.get("label")] = dfn
return dfn
dfn = cls(actions, direction, speed)
doc.bullets[element.get("label")] = dfn
return dfn
@@
-409,20
+416,23
@@
class BulletRef(object):
self.params = ParamList() if params is None else params
def __getstate__(self):
self.params = ParamList() if params is None else params
def __getstate__(self):
- state =
dict(bullet=self.bullet)
+ state =
[]
if self.params.params:
if self.params.params:
- state["params"] = [param.expr for param in self.params.params]
+ params = [param.expr for param in self.params.params]
+ state.append(("params", params))
+ state.append(('bullet', self.bullet))
return state
def __setstate__(self, state):
return state
def __setstate__(self, state):
+ state = dict(state)
bullet = state["bullet"]
params = [NumberDef(param) for param in state.get("params", [])]
self.__init__(bullet, ParamList(params))
@classmethod
bullet = state["bullet"]
params = [NumberDef(param) for param in state.get("params", [])]
self.__init__(bullet, ParamList(params))
@classmethod
- def From
Element
(cls, doc, element):
+ def From
XML
(cls, doc, element):
"""Construct using an ElementTree-style element."""
"""Construct using an ElementTree-style element."""
- bullet = cls(element.get("label"), ParamList.From
Element
(doc, element))
+ bullet = cls(element.get("label"), ParamList.From
XML
(doc, element))
doc._bullet_refs.append(bullet)
return bullet
doc._bullet_refs.append(bullet)
return bullet
@@
-438,7
+448,7
@@
class ActionDef(object):
To support parsing new actions, add tags to
ActionDef.CONSTRUCTORS. It maps tag names to classes with a
To support parsing new actions, add tags to
ActionDef.CONSTRUCTORS. It maps tag names to classes with a
- From
Element
classmethod, which take the BulletML instance and
+ From
XML
classmethod, which take the BulletML instance and
ElementTree element as arguments.
"""
ElementTree element as arguments.
"""
@@
-452,10
+462,11
@@
class ActionDef(object):
return dict(actions=self.actions)
def __setstate__(self, state):
return dict(actions=self.actions)
def __setstate__(self, state):
+ state = dict(state)
self.__init__(state["actions"])
@classmethod
self.__init__(state["actions"])
@classmethod
- def From
Element
(cls, doc, element):
+ def From
XML
(cls, doc, element):
"""Construct using an ElementTree-style element."""
actions = []
for subelem in element.getchildren():
"""Construct using an ElementTree-style element."""
actions = []
for subelem in element.getchildren():
@@
-465,7
+476,7
@@
class ActionDef(object):
except KeyError:
continue
else:
except KeyError:
continue
else:
- actions.append(ctr.From
Element
(doc, subelem))
+ actions.append(ctr.From
XML
(doc, subelem))
dfn = cls(actions)
doc.actions[element.get("label")] = dfn
return dfn
dfn = cls(actions)
doc.actions[element.get("label")] = dfn
return dfn
@@
-484,20
+495,23
@@
class ActionRef(object):
self.params = params or ParamList()
def __getstate__(self):
self.params = params or ParamList()
def __getstate__(self):
- state =
dict(action=self.action)
+ state =
[]
if self.params.params:
if self.params.params:
- state["params"] = [param.expr for param in self.params.params]
+ params = [param.expr for param in self.params.params]
+ state.append(("params", params))
+ state.append(('action', self.action))
return state
def __setstate__(self, state):
return state
def __setstate__(self, state):
+ state = dict(state)
action = state["action"]
params = [NumberDef(param) for param in state.get("params", [])]
self.__init__(action, ParamList(params))
@classmethod
action = state["action"]
params = [NumberDef(param) for param in state.get("params", [])]
self.__init__(action, ParamList(params))
@classmethod
- def From
Element
(cls, doc, element):
+ def From
XML
(cls, doc, element):
"""Construct using an ElementTree-style element."""
"""Construct using an ElementTree-style element."""
- action = cls(element.get("label"), ParamList.From
Element
(doc, element))
+ action = cls(element.get("label"), ParamList.From
XML
(doc, element))
doc._action_refs.append(action)
return action
doc._action_refs.append(action)
return action
@@
-521,18
+535,19
@@
class Offset(object):
self.y = y
def __getstate__(self):
self.y = y
def __getstate__(self):
- state =
dict(type=self.type)
+ state =
[('type', self.type)]
if self.x:
if self.x:
- state
["x"] = self.x.expr
+ state
.append(('x', self.x.expr))
if self.y:
if self.y:
- state
["y"] = self.y.expr
+ state
.append(('y', self.y.expr))
return state
def __setstate__(self, state):
return state
def __setstate__(self, state):
+ state = dict(state)
self.__init__(state["type"], state.get("x"), state.get("y"))
@classmethod
self.__init__(state["type"], state.get("x"), state.get("y"))
@classmethod
- def From
Element
(cls, doc, element):
+ def From
XML
(cls, doc, element):
"""Construct using an ElementTree-style element."""
type = element.get("type", "relative")
x = None
"""Construct using an ElementTree-style element."""
type = element.get("type", "relative")
x = None
@@
-559,28
+574,31
@@
class FireDef(object):
self.offset = offset
def __getstate__(self):
self.offset = offset
def __getstate__(self):
+ state = []
+ if self.direction:
+ state.append(("direction", self.direction))
+ if self.speed:
+ state.append(("speed", self.speed))
+ if self.offset:
+ state.append(("offset", self.offset))
try:
params = self.bullet.params
except AttributeError:
state = dict(bullet=self.bullet)
else:
if params.params:
try:
params = self.bullet.params
except AttributeError:
state = dict(bullet=self.bullet)
else:
if params.params:
- state
= dict(bullet=self.bullet
)
+ state
.append(('bullet', self.bullet)
)
else:
else:
- state = dict(bullet=self.bullet.bullet)
- if self.direction:
- state["direction"] = self.direction
- if self.speed:
- state["speed"] = self.speed
- if self.offset:
- state["offset"] = self.offset
+ # Strip out empty BulletRefs.
+ state.append(('bullet', self.bullet.bullet))
return state
def __setstate__(self, state):
return state
def __setstate__(self, state):
+ state = dict(state)
self.__init__(**state)
@classmethod
self.__init__(**state)
@classmethod
- def From
Element
(cls, doc, element):
+ def From
XML
(cls, doc, element):
"""Construct using an ElementTree-style element."""
direction = None
speed = None
"""Construct using an ElementTree-style element."""
direction = None
speed = None
@@
-589,15
+607,15
@@
class FireDef(object):
for subelem in element.getchildren():
tag = realtag(subelem)
if tag == "direction":
for subelem in element.getchildren():
tag = realtag(subelem)
if tag == "direction":
- direction = Direction.From
Element
(doc, subelem, "aim")
+ direction = Direction.From
XML
(doc, subelem, "aim")
elif tag == "speed":
elif tag == "speed":
- speed = Speed.From
Element
(doc, subelem)
+ speed = Speed.From
XML
(doc, subelem)
elif tag == "bullet":
elif tag == "bullet":
- bullet = BulletDef.From
Element
(doc, subelem)
+ bullet = BulletDef.From
XML
(doc, subelem)
elif tag == "bulletRef":
elif tag == "bulletRef":
- bullet = BulletRef.From
Element
(doc, subelem)
+ bullet = BulletRef.From
XML
(doc, subelem)
elif tag == "offset":
elif tag == "offset":
- offset = Offset.From
Element
(doc, subelem)
+ offset = Offset.From
XML
(doc, subelem)
try:
fire = cls(bullet, direction, speed, offset)
except UnboundLocalError as exc:
try:
fire = cls(bullet, direction, speed, offset)
except UnboundLocalError as exc:
@@
-626,20
+644,23
@@
class FireRef(object):
self.params = params or ParamList()
def __getstate__(self):
self.params = params or ParamList()
def __getstate__(self):
- state =
dict(fire=self.fire)
+ state =
[]
if self.params.params:
if self.params.params:
- state["params"] = [param.expr for param in self.params.params]
+ params = [param.expr for param in self.params.params]
+ state.append(("params", params))
+ state.append(('fire', self.fire))
return state
def __setstate__(self, state):
return state
def __setstate__(self, state):
+ state = dict(state)
fire = state["fire"]
params = [NumberDef(param) for param in state.get("params", [])]
self.__init__(fire, ParamList(params))
@classmethod
fire = state["fire"]
params = [NumberDef(param) for param in state.get("params", [])]
self.__init__(fire, ParamList(params))
@classmethod
- def From
Element
(cls, doc, element):
+ def From
XML
(cls, doc, element):
"""Construct using an ElementTree-style element."""
"""Construct using an ElementTree-style element."""
- fired = cls(element.get("label"), ParamList.From
Element
(doc, element))
+ fired = cls(element.get("label"), ParamList.From
XML
(doc, element))
doc._fire_refs.append(fired)
return fired
doc._fire_refs.append(fired)
return fired
@@
-657,7
+678,7
@@
class BulletML(object):
firings, as well as a base game type.
You can add tags to the BulletML.CONSTRUCTORS dictionary to extend
firings, as well as a base game type.
You can add tags to the BulletML.CONSTRUCTORS dictionary to extend
- its parsing. It maps tag names to classes with a From
Element
+ its parsing. It maps tag names to classes with a From
XML
classmethod, which take the BulletML instance and ElementTree
element as arguments.
classmethod, which take the BulletML instance and ElementTree
element as arguments.
@@
-676,9
+697,10
@@
class BulletML(object):
self.fires = {} if fires is None else fires
def __getstate__(self):
self.fires = {} if fires is None else fires
def __getstate__(self):
- return
dict(type=self.type, actions=self.actions)
+ return
[('type', self.type), ('actions', self.actions)]
def __setstate__(self, state):
def __setstate__(self, state):
+ state = dict(state)
self.__init__(state["type"], actions=state.get("actions"))
@classmethod
self.__init__(state["type"], actions=state.get("actions"))
@classmethod
@@
-699,7
+721,7
@@
class BulletML(object):
for element in root.getchildren():
tag = realtag(element)
if tag in self.CONSTRUCTORS:
for element in root.getchildren():
tag = realtag(element)
if tag in self.CONSTRUCTORS:
- self.CONSTRUCTORS[tag].From
Element
(self, element)
+ self.CONSTRUCTORS[tag].From
XML
(self, element)
try:
for ref in self._bullet_refs:
try:
for ref in self._bullet_refs:
@@
-749,7
+771,7
@@
class BulletML(object):
source.seek(0)
if start == "<":
return cls.FromXML(source)
source.seek(0)
if start == "<":
return cls.FromXML(source)
- elif start == "!":
+ elif start == "!"
or start == "#"
:
return cls.FromYAML(source)
else:
raise ParseError("unknown initial character %r" % start)
return cls.FromYAML(source)
else:
raise ParseError("unknown initial character %r" % start)