Changeset 112:2d048c0ed5e3

Timestamp:

12/20/10 12:58:45 (5 years ago)

Author:

Alex Martynov <martiran@òÀæ>

Branch:

default

Parents:

110:763c07539658 (diff), 111:9486211ec334 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Automated merge with òÀËssh://kodomo.fbb.msu.ru/snake

Files:

• snake.py (modified) (1 diff, 1 prop)
• snake.py (modified) (2 diffs)

snake.py

@@ -66 +66 @@
         for cell in self.cells:
             cell.snake = self
+        for cell in self.cells:
+            cell.type = 'body'
         self.cells[0].type = 'head'
-        for cell in self.cells[1:-1]:
-            cell.type = 'body'
         self.cells[-1].type = 'tail'
         return

snake.py

@@ -9 +9 @@
     line = line.rstrip()
     return line
+
+class File(object):
+    """Wrapper around file that saves the current line number."""
+    def __init__(self, file):
+        self.file = file
+        self.name = file.name
+        self.line_no = 0
+    def __iter__(self):
+        for line_no, line in enumerate(self.file, self.line_no):
+            self.line_no = line_no
+            yield line
 
 class Snake(object):
@@ -32 +43 @@
         See program design docs for file syntax.
         """
+        file = File(file)
+        try:
+            self._load(file)
+        except Exception, e:
+            raise Exception("%s:%s: %s" % (file.name, file.line_no, e))
+
+    def _load (self, file):
+        """Actually do the loading."""
         for line in file:
             magic, self.name = preprocess(line).split(' ', 1)