shuffle around some methods

akaptur · akaptur · commit 38780cda693e · 2014-07-06T14:40:30.000-04:00
diff --git a/interpreter/byterun/pyvm2.py b/interpreter/byterun/pyvm2.py
@@ -87,6 +87,38 @@ def __init__(self):
         self.return_value = None
         self.last_exception = None
 
+    # Frame manipulation
+    def make_frame(self, code, callargs={}, f_globals=None, f_locals=None):
+        if f_globals is not None:
+            f_globals = f_globals
+            if f_locals is None:
+                f_locals = f_globals
+        elif self.frames:
+            f_globals = self.frame.f_globals
+            f_locals = {}
+        else:
+            f_globals = f_locals = {
+                '__builtins__': __builtins__,
+                '__name__': '__main__',
+                '__doc__': None,
+                '__package__': None,
+            }
+        f_locals.update(callargs)
+        frame = Frame(code, f_globals, f_locals, self.frame)
+        return frame
+
+    def push_frame(self, frame):
+        self.frames.append(frame)
+        self.frame = frame
+
+    def pop_frame(self):
+        self.frames.pop()
+        if self.frames:
+            self.frame = self.frames[-1]
+        else:
+            self.frame = None
+
+    # Data stack manipulation
     def top(self):
         return self.frame.stack[-1]
 
@@ -107,10 +139,7 @@ def popn(self, n):
         else:
             return []
 
-    def jump(self, jump):
-        """Move the bytecode pointer to `jump`, so it will execute next."""
-        self.frame.f_lasti = jump
-
+    # Block stack manipulation
     def push_block(self, b_type, handler=None):
         level = len(self.frame.stack)
         self.frame.block_stack.append(Block(b_type, handler, level))
@@ -131,36 +160,12 @@ def unwind_block(self, block):
             traceback, value, exctype = self.popn(3)
             self.last_exception = exctype, value, traceback
 
-    def make_frame(self, code, callargs={}, f_globals=None, f_locals=None):
-        if f_globals is not None:
-            f_globals = f_globals
-            if f_locals is None:
-                f_locals = f_globals
-        elif self.frames:
-            f_globals = self.frame.f_globals
-            f_locals = {}
-        else:
-            f_globals = f_locals = {
-                '__builtins__': __builtins__,
-                '__name__': '__main__',
-                '__doc__': None,
-                '__package__': None,
-            }
-        f_locals.update(callargs)
-        frame = Frame(code, f_globals, f_locals, self.frame)
-        return frame
-
-    def push_frame(self, frame):
-        self.frames.append(frame)
-        self.frame = frame
-
-    def pop_frame(self):
-        self.frames.pop()
-        if self.frames:
-            self.frame = self.frames[-1]
-        else:
-            self.frame = None
+    # Jumping through bytecode
+    def jump(self, jump):
+        """Move the bytecode pointer to `jump`, so it will execute next."""
+        self.frame.f_lasti = jump
 
+    # An entry point
     def run_code(self, code, f_globals=None, f_locals=None):
         frame = self.make_frame(code, f_globals=f_globals, f_locals=f_locals)
         val = self.run_frame(frame)
