clipsruby 0.0.39 → 0.0.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80e4a680ddbc8bf4562a2b6995c645c0b5dd436ad36a1ee3445ba3fec7f13971
-  data.tar.gz: 297c0e0c46cb3355acddde65530c2f424d0994691a25aa84fd030fd041631d59
+  metadata.gz: f9f5ef0ebbc5224f3c9ee6ab3bc3a025e543ec210aea37062d6eb7a8389424e6
+  data.tar.gz: d850a5303be6baca4514d9ed7de5061efacad449666fa56e80a15c7c29dd6e67
 SHA512:
-  metadata.gz: c46acccb9d8b0edc1841f56ad046f8a36c06bcae3baf155b08ef3dff1b46acdf61ef82bcfc73ca5059796bfb87e767571f25f00fbc5a89bf359c992c38b3d32b
-  data.tar.gz: 76c92b24f599195d9878907a09d6ef765aea158784fcb1847692e608220463de97932baa96bcf9c6c5bdd484eed4d14ed9fffc9c0a8370d634531528d445b95d
+  metadata.gz: 282703a59de83937e2afafb3bf66b315cc5bf0175d87ffb7eba3f3e34e831fbc7ebd8f764f64b430062d1cec587c3e4ce12248d5e6417b24b139d126be9a90d0
+  data.tar.gz: afaaf02eca5132f0092cec3665e0a4820b4e9517f04bda680f8c15cef85f8cdbcc2fd80a3dc752a103f220c11d270a26299b4a6c8121356394dc284df81842cf

data/README.md

@@ -464,6 +464,19 @@ CLIPS::Environment::Instance.defclass(instance)
 instance.defclass
 ```
 
+### `CLIPS::Environment::Instance.to_h`
+### `CLIPS::Environment::Instance#to_h`
+
+Returns a hash representing the instance slot names and their values.
+Pass a `true` as an argument to get inhereted slots as well.
+
+```ruby
+CLIPS::Environment::Instance.to_h(instance)
+instance.to_h
+CLIPS::Environment::Instance.to_h(instance, true)
+instance.to_h(true)
+```
+
 ### `CLIPS::Environment::Defclass.name`
 ### `CLIPS::Environment::Defclass#name`
 
@@ -484,6 +497,19 @@ CLIPS::Environment::Defclass.pp_form(defclass)
 defclass.pp_form
 ```
 
+### `CLIPS::Environment::Defclass.slots`
+### `CLIPS::Environment::Defclass#slots`
+
+Returns an array representing the slot names of a Defclass.
+Pass `true` as an argument to get inherited slots, as well.
+
+```ruby
+CLIPS::Environment::Defclass.slots(defclass)
+defclass.slots
+CLIPS::Environment::Defclass.slots(defclass, true)
+defclass.slots(true)
+```
+
 ### `CLIPS::Environment::Defclass.defmodule_name`
 ### `CLIPS::Environment::Defclass#defmodule_name`
 

data/ext/clipsruby/clipsruby.c

@@ -1266,10 +1266,6 @@ static VALUE clips_environment_defclass_subclasses(int argc, VALUE *argv, VALUE
 
 	rb_scan_args(argc, argv, "01", &inherit);
 
-	if (NIL_P(inherit)) {
-		inherit = Qfalse;
-	}
-
 	TypedData_Get_Struct(rbDefclass, Defclass, &Defclass_type, defclass);
 
 	ClassSubclasses(defclass, &value, RTEST(inherit));
@@ -1299,6 +1295,46 @@ static VALUE clips_environment_defclass_static_subclasses(int argc, VALUE *argv,
 	return out;
 }
 
+static VALUE clips_environment_defclass_slots(int argc, VALUE *argv, VALUE rbDefclass)
+{
+	VALUE rbEnvironment, inherit;
+	Defclass *defclass;
+	CLIPSValue value;
+	VALUE out;
+
+	rbEnvironment = rb_iv_get(rbDefclass, "@environment");
+
+	rb_scan_args(argc, argv, "01", &inherit);
+
+	TypedData_Get_Struct(rbDefclass, Defclass, &Defclass_type, defclass);
+
+	ClassSlots(defclass, &value, RTEST(inherit));
+
+	CLIPSValue_to_VALUE(&value, &out, &rbEnvironment);
+
+	return out;
+}
+
+static VALUE clips_environment_defclass_static_slots(int argc, VALUE *argv, VALUE klass)
+{
+	VALUE rbEnvironment, inherit, rbDefclass;
+	Defclass *defclass;
+	CLIPSValue value;
+	VALUE out;
+
+	rb_scan_args(argc, argv, "11", &rbDefclass, &inherit);
+
+	TypedData_Get_Struct(rbDefclass, Defclass, &Defclass_type, defclass);
+
+	rbEnvironment = rb_iv_get(rbDefclass, "@environment");
+
+	ClassSlots(defclass, &value, RTEST(inherit));
+
+	CLIPSValue_to_VALUE(&value, &out, &rbEnvironment);
+
+	return out;
+}
+
 static VALUE clips_environment_run(int argc, VALUE *argv, VALUE environment) {
 	VALUE integer;
 	Environment *env;
@@ -1436,6 +1472,57 @@ static VALUE clips_environment_fact_static_to_h(VALUE self, VALUE rbFact)
 	return clips_environment_fact_to_h(rbFact);
 }
 
+static VALUE clips_environment_instance_to_h(int argc, VALUE *argv, VALUE rbInstance)
+{
+	VALUE rbEnvironment, inherit;
+	Instance *instance;
+	CLIPSValue key, value;
+	rbEnvironment = rb_iv_get(rbInstance, "@environment");
+
+	TypedData_Get_Struct(rbInstance, Instance, &Instance_type, instance);
+
+	rb_scan_args(argc, argv, "01", &inherit);
+
+	ClassSlots(InstanceClass(instance), &key, RTEST(inherit));
+
+	VALUE hash = rb_hash_new();
+	for (size_t i = 0; i < key.multifieldValue->length; i++)
+	{
+		VALUE innerValue;
+		DirectGetSlot(instance, key.multifieldValue->contents[i].lexemeValue->contents, &value);
+		CLIPSValue_to_VALUE(&value, &innerValue, &rbEnvironment);
+		rb_hash_aset(hash, ID2SYM(rb_intern(key.multifieldValue->contents[i].lexemeValue->contents)), innerValue);
+	}
+
+	return hash;
+}
+
+static VALUE clips_environment_instance_static_to_h(int argc, VALUE *argv, VALUE klass)
+{
+	VALUE rbInstance, rbEnvironment, inherit;
+	Instance *instance;
+	CLIPSValue key, value;
+
+	rb_scan_args(argc, argv, "11", &rbInstance, &inherit);
+
+	rbEnvironment = rb_iv_get(rbInstance, "@environment");
+
+	TypedData_Get_Struct(rbInstance, Instance, &Instance_type, instance);
+
+	ClassSlots(InstanceClass(instance), &key, RTEST(inherit));
+
+	VALUE hash = rb_hash_new();
+	for (size_t i = 0; i < key.multifieldValue->length; i++)
+	{
+		VALUE innerValue;
+		DirectGetSlot(instance, key.multifieldValue->contents[i].lexemeValue->contents, &value);
+		CLIPSValue_to_VALUE(&value, &innerValue, &rbEnvironment);
+		rb_hash_aset(hash, ID2SYM(rb_intern(key.multifieldValue->contents[i].lexemeValue->contents)), innerValue);
+	}
+
+	return hash;
+}
+
 static VALUE clips_environment_batch_star(VALUE self, VALUE path)
 {
 	Environment *env;
@@ -4416,6 +4503,8 @@ void Init_clipsruby(void)
 	rb_define_method(rbDefclass, "superclasses", clips_environment_defclass_superclasses, -1);
 	rb_define_singleton_method(rbDefclass, "subclasses", clips_environment_defclass_static_subclasses, -1);
 	rb_define_method(rbDefclass, "subclasses", clips_environment_defclass_subclasses, -1);
+	rb_define_singleton_method(rbDefclass, "slots", clips_environment_defclass_static_slots, -1);
+	rb_define_method(rbDefclass, "slots", clips_environment_defclass_slots, -1);
 
 	VALUE rbInstance = rb_define_class_under(rbEnvironment, "Instance", rb_cObject);
 	rb_define_alloc_func(rbInstance, instance_alloc);
@@ -4429,4 +4518,6 @@ void Init_clipsruby(void)
 	rb_define_method(rbInstance, "name", clips_environment_instance_name, 0);
 	rb_define_singleton_method(rbInstance, "pp_form", clips_environment_instance_static_pp_form, 1);
 	rb_define_method(rbInstance, "pp_form", clips_environment_instance_pp_form, 0);
+	rb_define_singleton_method(rbInstance, "to_h", clips_environment_instance_static_to_h, -1);
+	rb_define_method(rbInstance, "to_h", clips_environment_instance_to_h, -1);
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clipsruby
 version: !ruby/object:Gem::Version
-  version: 0.0.39
+  version: 0.0.40
 platform: ruby
 authors:
 - Ryan Johnston