Commit: 8d86a0519d2f6d9c8e5a04513f9abee8c0d30641 - mruby_tad (git)

TADや、その他BTRON基本データ型を扱うmrbgemの開発用

Commit MetaInfo

• Revisión: 8d86a0519d2f6d9c8e5a04513f9abee8c0d30641 (tree)
• Tiempo: 2017-06-24 01:31:30
• Autor: ornse01 <ornse01@user...>
• Commiter: ornse01

Log Message

fix compile error.

Cambiar Resumen

• modified: src/tad.c

Diferencia incremental

--- a/src/tad.c
+++ b/src/tad.c
@@ -1,4 +1,8 @@
 #include "mruby.h"
+#include "mruby/class.h"
+#include "mruby/data.h"
+
+#include <btron/btron.h>
 
 const static struct mrb_data_type mrb_PNT_type = { "PNT", mrb_free };
 
@@ -27,7 +31,7 @@ mrb_PNT_init(mrb_state *mrb, mrb_value self)
 	p->y = arg.y;
 
 	DATA_TYPE(self) = &mrb_PNT_type;
-	DATA_PTR(self) = h;
+	DATA_PTR(self) = p;
 
 	return self;
 }
@@ -87,7 +91,7 @@ mrb_PNT_init_copy(mrb_state *mrb, mrb_value copy)
 		mrb_raise(mrb, E_TYPE_ERROR, "wrong argument class");
 	}
 	if (!DATA_PTR(copy)) {
-		DATA_PTR(copy) = (struct hoge *)mrb_malloc(mrb, sizeof(struct hoge));
+		DATA_PTR(copy) = (struct hoge *)mrb_malloc(mrb, sizeof(PNT));
 		DATA_TYPE(copy) = &mrb_PNT_type;
 	}
 	*(PNT*)DATA_PTR(copy) = *(PNT*)DATA_PTR(src);
@@ -98,14 +102,14 @@ mrb_PNT_init_copy(mrb_state *mrb, mrb_value copy)
 LOCAL mrb_value
 mrb_PNT_equal(mrb_state *mrb, mrb_value self)
 {
-	mrb_value src;
+	mrb_value other;
 	PNT *self_real, *other_real;
 
 	mrb_get_args(mrb, "o", &other);
 	if (mrb_obj_equal(mrb, self, other)) {
 		return mrb_bool_value(FALSE);
 	}
-	if (!mrb_obj_is_instance_of(mrb, other, mrb_obj_class(mrb, copy))) {
+	if (!mrb_obj_is_instance_of(mrb, other, mrb_obj_class(mrb, self))) {
 		return mrb_bool_value(FALSE);
 	}
 	if (!DATA_PTR(other)) {
@@ -114,7 +118,7 @@ mrb_PNT_equal(mrb_state *mrb, mrb_value self)
 
 	self_real = DATA_PTR(self);
 	other_real = DATA_PTR(other);
-	if ((self_real->x == other_real->x) && (self_real->y == other_real.y)) {
+	if ((self_real->x == other_real->x) && (self_real->y == other_real->y)) {
 		return mrb_bool_value(TRUE);
 	}
 	return mrb_bool_value(FALSE);
@@ -124,7 +128,7 @@ LOCAL mrb_value
 mrb_PNT_plus(mrb_state *mrb, mrb_value self)
 {
 	struct RClass *cls;
-	mrb_value src, result;
+	mrb_value other, result;
 	PNT *self_real, *other_real;
 
 	cls = mrb_obj_class(mrb, self);
@@ -150,7 +154,7 @@ LOCAL mrb_value
 mrb_PNT_minus(mrb_state *mrb, mrb_value self)
 {
 	struct RClass *cls;
-	mrb_value src, result;
+	mrb_value other, result;
 	PNT *self_real, *other_real;
 
 	cls = mrb_obj_class(mrb, self);