yield实现简单协程

Author: koshox

object/hiList.cpp

@@ -22,6 +22,7 @@ void ListKlass::initialize() {
     klass_dict->put(new HiString("insert"), new FunctionObject(list_insert));
     klass_dict->put(new HiString("index"), new FunctionObject(list_index));
     klass_dict->put(new HiString("pop"), new FunctionObject(list_pop));
+    klass_dict->put(new HiString("popleft"), new FunctionObject(list_popleft));
     klass_dict->put(new HiString("remove"), new FunctionObject(list_remove));
     klass_dict->put(new HiString("reverse"), new FunctionObject(list_reverse));
     klass_dict->put(new HiString("sort"), new FunctionObject(list_sort));
@@ -251,6 +252,14 @@ HiObject *list_pop(ObjList args) {
     return list->pop();
 }
 
+HiObject *list_popleft(ObjList args) {
+    HiList *list = (HiList *) (args->get(0));
+    assert(list && list->klass() == ListKlass::get_instance());
+    HiObject *left = list->get(0);
+    list->delete_index(0);
+    return left;
+}
+
 HiObject *list_remove(ObjList args) {
     HiList *list = (HiList *) (args->get(0));
     HiObject *target = args->get(1);
@@ -345,7 +354,7 @@ size_t ListKlass::size() {
 }
 
 void ListKlass::oops_do(OopClosure *f, HiObject *obj) {
-    assert(obj && obj->klass() == (Klass*) this);
+    assert(obj && obj->klass() == (Klass *) this);
 
-    f->do_array_list(&((HiList*)obj)->_inner_list);
+    f->do_array_list(&((HiList *) obj)->_inner_list);
 }

object/hiList.hpp

@@ -64,6 +64,7 @@ HiObject *list_append(ObjList args);
 HiObject *list_insert(ObjList args);
 HiObject *list_index(ObjList args);
 HiObject *list_pop(ObjList args);
+HiObject *list_popleft(ObjList args);
 HiObject *list_remove(ObjList args);
 HiObject *list_reverse(ObjList args);
 HiObject *list_sort(ObjList args);

runtime/interpreter.cpp

@@ -150,6 +150,7 @@ void Interpreter::eval_frame() {
                 break;
 
             case ByteCode::BINARY_MULTIPLY:
+            case ByteCode::INPLACE_MULTIPLY:
                 v = POP();
                 w = POP();
                 PUSH(w->mul(v));
@@ -189,6 +190,7 @@ void Interpreter::eval_frame() {
                 break;
 
             case ByteCode::BINARY_SUBTRACT:
+            case ByteCode::INPLACE_SUBSTRACT:
                 v = POP();
                 w = POP();
                 PUSH(w->sub(v));
@@ -318,6 +320,11 @@ void Interpreter::eval_frame() {
                 u->setattr(v, w);
                 break;
 
+            case ByteCode::STORE_GLOBAL:
+                v = _frame->names()->get(op_arg);
+                _frame->globals()->put(v, POP());
+                break;
+
             case ByteCode::DUP_TOPX:
                 for (int i = 0; i < op_arg; i++) {
                     int index = STACK_LEVEL() - op_arg;
@@ -481,8 +488,16 @@ void Interpreter::eval_frame() {
 
             case ByteCode::POP_JUMP_IF_FALSE:
                 v = POP();
-                if (v == Universe::HiFalse)
+                if (v == Universe::HiFalse) {
+                    _frame->set_pc(op_arg);
+                }
+                break;
+
+            case ByteCode::POP_JUMP_IF_TRUE:
+                v = POP();
+                if (v == Universe::HiTrue) {
                     _frame->set_pc(op_arg);
+                }
                 break;
 
             case ByteCode::JUMP_FORWARD:
@@ -729,6 +744,12 @@ void Interpreter::eval_frame() {
 }
 
 HiObject *Interpreter::eval_generator(Generator *g) {
+    if (g->frame() == NULL) {
+        // 说明frame已经被销毁了
+        do_raise(Universe::stop_iteration, NULL, NULL);
+        return NULL;
+    }
+
     Handle handle(g);
     enter_frame(g->frame());
     g->_frame->set_entry_frame(true);

test/test_coroutine.py

@@ -0,0 +1,49 @@
+# Two simple generator functions
+def countdown(n):
+    while n > 0:
+        print('T-minus', n)
+        yield
+        n -= 1
+    print('Blastoff!')
+
+
+def countup(n):
+    x = 0
+    while x < n:
+        print('Counting up', x)
+        yield
+        x += 1
+
+
+class TaskScheduler:
+    def __init__(self):
+        self._task_queue = []
+
+    def new_task(self, task):
+        '''
+        Admit a newly started task to the scheduler
+
+        '''
+        self._task_queue.append(task)
+
+    def run(self):
+        '''
+        Run until there are no more tasks
+        '''
+        while len(self._task_queue) > 0:
+            task = self._task_queue.popleft()
+            try:
+                # Run until the next yield statement
+                task.next()
+                self._task_queue.append(task)
+
+            except StopIteration:
+                # Generator is no longer executing
+                pass
+
+
+# Example use
+sched = TaskScheduler()
+sched.new_task(countdown(2))
+sched.new_task(countup(5))
+sched.run()

test/test_iter_fib.py

@@ -33,6 +33,5 @@ def next(self):
 while True:
     try:
         print itor.next()
-    # TODO raise ex
     except StopIteration, e:
         break

util/arrayList.cpp

@@ -51,7 +51,7 @@ void ArrayList<T>::expand() {
     _array = new_array;
 
     _length <<= 1;
-    printf("expand an array to %d, size is %d\n", _length, _size);
+    // printf("expand an array to %d, size is %d\n", _length, _size);
 }
 
 template<typename T>