自定义类型

koshox · koshox · commit a12f862baf30 · 2020-09-09T00:42:35.000+08:00
diff --git a/object/hiDict.cpp b/object/hiDict.cpp
@@ -126,7 +126,7 @@ void DictKlass::del_subscr(HiObject *x, HiObject *y) {
     ((HiDict *) x)->remove(y);
 }
 
-HiObject *DictKlass::allocate_instance(ArrayList<HiObject *> *args) {
+HiObject *DictKlass::allocate_instance(HiObject *callable, ArrayList<HiObject *> *args) {
     if (!args || args->length() == 0) {
         return new HiDict();
     } else {
diff --git a/object/hiDict.hpp b/object/hiDict.hpp
@@ -23,7 +23,7 @@ class DictKlass : public Klass {
     virtual void store_subscr(HiObject* x, HiObject* y, HiObject* z);
     virtual void del_subscr (HiObject* x, HiObject* y);
 
-    virtual HiObject *allocate_instance(ArrayList<HiObject *> *args);
+    virtual HiObject *allocate_instance(HiObject* callable, ArrayList<HiObject *> *args);
 
     virtual size_t size();
 };
diff --git a/object/hiInteger.cpp b/object/hiInteger.cpp
@@ -182,7 +182,7 @@ HiObject *IntegerKlass::mod(HiObject *x, HiObject *y) {
     return new HiInteger(ix->value() % iy->value());
 }
 
-HiObject *IntegerKlass::allocate_instance(ArrayList<HiObject *> *args) {
+HiObject *IntegerKlass::allocate_instance(HiObject *callable, ArrayList<HiObject *> *args) {
     if (!args || args->length() == 0) {
         return new HiInteger(0);
     } else {
diff --git a/object/hiInteger.hpp b/object/hiInteger.hpp
@@ -30,7 +30,7 @@ class IntegerKlass : public Klass {
     virtual HiObject* div(HiObject* x, HiObject* y);
     virtual HiObject* mod(HiObject* x, HiObject* y);
 
-    virtual HiObject *allocate_instance(ArrayList<HiObject *> *args);
+    virtual HiObject *allocate_instance(HiObject* callable, ArrayList<HiObject *> *args);
 };
 
 class HiInteger : public HiObject {
diff --git a/object/hiList.cpp b/object/hiList.cpp
@@ -179,7 +179,7 @@ HiObject *ListKlass::iter(HiObject *x) {
     return new ListIterator((HiList *) x);
 }
 
-HiObject *ListKlass::allocate_instance(ArrayList<HiObject *> *args) {
+HiObject *ListKlass::allocate_instance(HiObject *callable, ArrayList<HiObject *> *args) {
     if (!args || args->length() == 0) {
         return new HiList();
     } else {
diff --git a/object/hiList.hpp b/object/hiList.hpp
@@ -30,7 +30,7 @@ class ListKlass : public Klass {
     virtual HiObject *len(HiObject *x);
     virtual HiObject *iter(HiObject* x);
 
-    virtual HiObject *allocate_instance(ArrayList<HiObject *> *args);
+    virtual HiObject *allocate_instance(HiObject* callable, ArrayList<HiObject *> *args);
 };
 
 class HiList : public HiObject {
diff --git a/object/hiString.cpp b/object/hiString.cpp
@@ -89,7 +89,7 @@ HiObject *StringKlass::len(HiObject *x) {
     return new HiInteger(((HiString *) x)->length());
 }
 
-HiObject *StringKlass::allocate_instance(ArrayList<HiObject *> *args) {
+HiObject *StringKlass::allocate_instance(HiObject *callable, ArrayList<HiObject *> *args) {
     if (!args || args->length() == 0) {
         return new HiString("");
     } else {
diff --git a/object/hiString.hpp b/object/hiString.hpp
@@ -30,7 +30,7 @@ class StringKlass : public Klass {
 
     virtual HiObject *len(HiObject *x);
 
-    virtual HiObject *allocate_instance(ArrayList<HiObject *> *args);
+    virtual HiObject *allocate_instance(HiObject* callable, ArrayList<HiObject *> *args);
 };
 
 class HiString : public HiObject {
diff --git a/object/klass.cpp b/object/klass.cpp
@@ -6,6 +6,8 @@
 #include "object/hiObject.hpp"
 #include "object/hiInteger.hpp"
 #include "object/hiString.hpp"
+#include "object/hiDict.hpp"
+#include "object/hiList.hpp"
 #include "runtime/universe.hpp"
 
 Klass::Klass() {
@@ -28,4 +30,33 @@ int Klass::compare_klass(Klass *x, Klass *y) {
     } else {
         return 1;
     }
-}
+}
+
+HiObject *Klass::create_klass(HiObject *x, HiObject *supers, HiObject *name) {
+    assert(x->klass() == (Klass *) DictKlass::get_instance());
+    assert(supers->klass() == (Klass *) ListKlass::get_instance());
+    assert(name->klass() == (Klass *) StringKlass::get_instance());
+
+    Klass *new_klass = new Klass();
+    HiDict *klass_dict = (HiDict *) x;
+    HiList *supers_list = (HiList *) supers;
+
+    new_klass->set_klass_dict(klass_dict);
+    new_klass->set_name((HiString *) name);
+    // TODO 暂时先处理单继承
+    if (supers_list->inner_list()->length() > 0) {
+        HiTypeObject *super = (HiTypeObject *) supers_list->inner_list()->get(0);
+        new_klass->set_super(super->own_klass());
+    }
+
+    HiTypeObject *type_obj = new HiTypeObject();
+    type_obj->set_own_klass(new_klass);
+
+    return type_obj;
+}
+
+HiObject *Klass::allocate_instance(HiObject *callable, ArrayList<HiObject *> *args) {
+    HiObject *instance = new HiObject();
+    instance->set_klass(((HiTypeObject*)callable)->own_klass());
+    return instance;
+}
diff --git a/object/klass.hpp b/object/klass.hpp
@@ -25,6 +25,8 @@ class Klass {
 public:
     Klass();
 
+    static HiObject *create_klass(HiObject *x, HiObject *supers, HiObject *name);
+
     static int compare_klass(Klass* x, Klass* y);
 
     void set_type_object(HiTypeObject *x) { _type_object = x; }
@@ -65,7 +67,7 @@ class Klass {
     virtual HiObject *next     (HiObject* x) { return 0; }
     virtual HiObject *iter     (HiObject* x) { return 0; }
 
-    virtual HiObject *allocate_instance(ArrayList<HiObject *> *args) { return 0;}
+    virtual HiObject *allocate_instance(HiObject* callable, ArrayList<HiObject *> *args);
 };
 
 #endif //PYTHONVM_KLASS_HPP
diff --git a/runtime/frameObject.cpp b/runtime/frameObject.cpp
@@ -16,6 +16,7 @@ FrameObject::FrameObject(CodeObject *codes) {
 
     _locals = new HiDict();
     _globals = _locals;
+    _locals->put(new HiString("__name__"), new HiString("__main__"));
     _fast_locals = NULL;
 
     _stack = new HiList();
diff --git a/runtime/functionObject.cpp b/runtime/functionObject.cpp
@@ -36,6 +36,8 @@ FunctionObject::FunctionObject(HiObject *code_object) {
     _func_code = co;
     _func_name = co->_co_name;
     _flags = co->_flag;
+    _globals   = NULL;
+    _closure   = NULL;
 
     set_klass(FunctionKlass::get_instance());
 }
@@ -44,7 +46,8 @@ FunctionObject::FunctionObject(NativeFuncPointer nfp) {
     _func_code = NULL;
     _func_name = NULL;
     _flags = 0;
-    _globals = NULL;
+    _globals   = NULL;
+    _closure   = NULL;
     _native_func = nfp;
 
     set_klass(NativeFunctionKlass::get_instance());
diff --git a/runtime/interpreter.cpp b/runtime/interpreter.cpp
@@ -187,13 +187,28 @@ void Interpreter::eval_frame() {
                 _frame->set_pc(b->_target);
                 break;
 
+            case ByteCode::LOAD_LOCALS:
+                PUSH(_frame->locals());
+                break;
+
             case ByteCode::POP_BLOCK:
                 b = _frame->_loop_stack->pop();
                 while (STACK_LEVEL() > b->_level) {
                     POP();
                 }
                 break;
 
+            case ByteCode::BUILD_CLASS:
+                // locals
+                v = POP();
+                // supers
+                u = POP();
+                // name
+                w = POP();
+                v = Klass::create_klass(v, u, w);
+                PUSH(v);
+                break;
+
             case ByteCode::STORE_NAME:
                 v = _frame->names()->get(op_arg);
                 _frame->locals()->put(v, POP());
@@ -513,7 +528,7 @@ void Interpreter::build_frame(HiObject *callable, ObjList args, int op_arg) {
         _frame = frame;
     } else if (callable->klass() == TypeKlass::get_instance()) {
         HiObject *instance = ((HiTypeObject *) callable)->own_klass()->
-                allocate_instance(args);
+                allocate_instance(callable, args);
         PUSH(instance);
     }
 }
diff --git a/test/class1.py b/test/class1.py
@@ -0,0 +1,5 @@
+class A(object):
+    value = 1
+
+a = A()
+print a.value

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ void DictKlass::del_subscr(HiObject x, HiObject y) {`
`126`	`126`	`((HiDict *) x)->remove(y);`
`127`	`127`	`}`
`128`	`128`
`129`		`-HiObject DictKlass::allocate_instance(ArrayList<HiObject > *args) {`
	`129`	`+HiObject DictKlass::allocate_instance(HiObject callable, ArrayList<HiObject > args) {`
`130`	`130`	`if (!args \|\| args->length() == 0) {`
`131`	`131`	`return new HiDict();`
`132`	`132`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ HiObject IntegerKlass::mod(HiObject x, HiObject *y) {`
`182`	`182`	`return new HiInteger(ix->value() % iy->value());`
`183`	`183`	`}`
`184`	`184`
`185`		`-HiObject IntegerKlass::allocate_instance(ArrayList<HiObject > *args) {`
	`185`	`+HiObject IntegerKlass::allocate_instance(HiObject callable, ArrayList<HiObject > args) {`
`186`	`186`	`if (!args \|\| args->length() == 0) {`
`187`	`187`	`return new HiInteger(0);`
`188`	`188`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ HiObject ListKlass::iter(HiObject x) {`
`179`	`179`	`return new ListIterator((HiList *) x);`
`180`	`180`	`}`
`181`	`181`
`182`		`-HiObject ListKlass::allocate_instance(ArrayList<HiObject > *args) {`
	`182`	`+HiObject ListKlass::allocate_instance(HiObject callable, ArrayList<HiObject > args) {`
`183`	`183`	`if (!args \|\| args->length() == 0) {`
`184`	`184`	`return new HiList();`
`185`	`185`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ HiObject StringKlass::len(HiObject x) {`
`89`	`89`	`return new HiInteger(((HiString *) x)->length());`
`90`	`90`	`}`
`91`	`91`
`92`		`-HiObject StringKlass::allocate_instance(ArrayList<HiObject > *args) {`
	`92`	`+HiObject StringKlass::allocate_instance(HiObject callable, ArrayList<HiObject > args) {`
`93`	`93`	`if (!args \|\| args->length() == 0) {`
`94`	`94`	`return new HiString("");`
`95`	`95`	`} else {`