clipsruby 0.0.37 → 0.0.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bdf3718a68644b1772e951c9a1056581d95b53a0d63d691d7cd434076d8877a
-  data.tar.gz: d76e7156d421d9cb0db3bd73314f061377c2972ecdafcd3eef1c480c113d4d2f
+  metadata.gz: 80e4a680ddbc8bf4562a2b6995c645c0b5dd436ad36a1ee3445ba3fec7f13971
+  data.tar.gz: 297c0e0c46cb3355acddde65530c2f424d0994691a25aa84fd030fd041631d59
 SHA512:
-  metadata.gz: 4b4e7e0f16be94698e19d4b8d53bfbc07eeecbcb26e71eb9347ee2d36a9526c4a50708ca2b8cefc042b846fa81197500a1c03a46020f61ebe6111c6d715b574b
-  data.tar.gz: a29961896b77bd1cb0874bd51dc001d94b31c8b7000137b27fca0ef4820055895d69cc3302145514163a5b628791d625cb4208722feea618fb9488d25a5a049a
+  metadata.gz: c46acccb9d8b0edc1841f56ad046f8a36c06bcae3baf155b08ef3dff1b46acdf61ef82bcfc73ca5059796bfb87e767571f25f00fbc5a89bf359c992c38b3d32b
+  data.tar.gz: 76c92b24f599195d9878907a09d6ef765aea158784fcb1847692e608220463de97932baa96bcf9c6c5bdd484eed4d14ed9fffc9c0a8370d634531528d445b95d

data/README.md

@@ -494,6 +494,16 @@ CLIPS::Environment::Defclass.defmodule_name(defclass)
 defclass.defmodule_name
 ```
 
+### `CLIPS::Environment::Defclass.defmodule`
+### `CLIPS::Environment::Defclass#defmodule`
+
+Returns the defmodule in which the defclass is defined
+
+```ruby
+CLIPS::Environment::Defclass.defmodule(defclass)
+defclass.defmodule
+```
+
 ### `CLIPS::Environment::Defclass.get_instance_list`
 ### `CLIPS::Environment::Defclass#get_instance_list`
 
@@ -582,6 +592,16 @@ CLIPS::Environment::Defrule.defmodule_name(defrule)
 defrule.defmodule_name
 ```
 
+### `CLIPS::Environment::Defrule.defmodule`
+### `CLIPS::Environment::Defrule#defmodule`
+
+Returns the defmodule in which the defrule is defined
+
+```ruby
+CLIPS::Environment::Defrule.defmodule(defrule)
+defrule.defmodule
+```
+
 ### `CLIPS::Environment::Defrule.is_deletable`
 ### `CLIPS::Environment::Defrule#is_deletable`
 
@@ -846,6 +866,16 @@ CLIPS::Environment::Deftemplate.defmodule_name(deftemplate)
 deftemplate.defmodule_name
 ```
 
+### `CLIPS::Environment::Deftemplate.defmodule`
+### `CLIPS::Environment::Deftemplate#defmodule`
+
+Returns the defmodule in which the deftemplate is defined
+
+```ruby
+CLIPS::Environment::Deftemplate.defmodule(deftemplate)
+deftemplate.defmodule
+```
+
 ### `CLIPS::Environment::Deftemplate.slot_names`
 ### `CLIPS::Environment::Deftemplate#slot_names`
 

data/ext/clipsruby/clipsruby.c

@@ -1,6 +1,24 @@
 #include "clips.h"
 #include "ruby.h"
 
+void environment_free(void *data)
+{
+	DestroyEnvironment((Environment*) data);
+}
+
+size_t environment_size(const void *data)
+{
+	return MemUsed((Environment*) data);
+}
+
+static const rb_data_type_t Environment_type = {
+	.function = {
+		.dfree = environment_free,
+		.dsize = environment_size
+	},
+	.flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 size_t deffacts_size(const void *data)
 {
 	return sizeof(Deffacts);
@@ -133,6 +151,36 @@ static VALUE clips_environment_deftemplate_static_defmodule_name(VALUE self, VAL
 	return clips_environment_deftemplate_defmodule_name(rbDeftemplate);
 }
 
+static VALUE clips_environment_deftemplate_defmodule(VALUE self)
+{
+	Deftemplate *template;
+	const char *defmoduleName;
+	Defmodule *defmodule = NULL;
+	Environment *env;
+
+	VALUE rbEnvironment = rb_iv_get(self, "@environment");
+	TypedData_Get_Struct(rbEnvironment, Environment, &Environment_type, env);
+
+	TypedData_Get_Struct(self, Deftemplate, &Deftemplate_type, template);
+	
+	defmoduleName = DeftemplateModule(template);
+
+	if (defmoduleName != NULL) {
+		defmodule = FindDefmodule(env, defmoduleName);
+	}
+
+	if (defmodule != NULL) {
+		return TypedData_Wrap_Struct(rb_const_get(CLASS_OF(rbEnvironment), rb_intern("Defmodule")), &Defmodule_type, defmodule);
+	} else {
+		return Qnil;
+	}
+}
+
+static VALUE clips_environment_deftemplate_static_defmodule(VALUE self, VALUE rbDeftemplate)
+{
+	return clips_environment_deftemplate_defmodule(rbDeftemplate);
+}
+
 static VALUE clips_environment_defrule_defmodule_name(VALUE self)
 {
 	Defrule *rule;
@@ -147,24 +195,36 @@ static VALUE clips_environment_defrule_static_defmodule_name(VALUE self, VALUE r
 	return clips_environment_defrule_defmodule_name(rbDefrule);
 }
 
-void environment_free(void *data)
+static VALUE clips_environment_defrule_defmodule(VALUE self)
 {
-	DestroyEnvironment((Environment*) data);
+	Defrule *rule;
+	const char *defmoduleName;
+	Defmodule *defmodule = NULL;
+	Environment *env;
+
+	VALUE rbEnvironment = rb_iv_get(self, "@environment");
+	TypedData_Get_Struct(rbEnvironment, Environment, &Environment_type, env);
+
+	TypedData_Get_Struct(self, Defrule, &Defrule_type, rule);
+	
+	defmoduleName = DefruleModule(rule);
+
+	if (defmoduleName != NULL) {
+		defmodule = FindDefmodule(env, defmoduleName);
+	}
+
+	if (defmodule != NULL) {
+		return TypedData_Wrap_Struct(rb_const_get(CLASS_OF(rbEnvironment), rb_intern("Defmodule")), &Defmodule_type, defmodule);
+	} else {
+		return Qnil;
+	}
 }
 
-size_t environment_size(const void *data)
+static VALUE clips_environment_defrule_static_defmodule(VALUE self, VALUE rbDefrule)
 {
-	return MemUsed((Environment*) data);
+	return clips_environment_defrule_defmodule(rbDefrule);
 }
 
-static const rb_data_type_t Environment_type = {
-	.function = {
-		.dfree = environment_free,
-		.dsize = environment_size
-	},
-	.flags = RUBY_TYPED_FREE_IMMEDIATELY
-};
-
 static VALUE clips_environment_facts(VALUE self)
 {
 	Environment *env;
@@ -279,6 +339,36 @@ static VALUE clips_environment_defclass_static_defmodule_name(VALUE self, VALUE
 	return clips_environment_defclass_defmodule_name(rbDefclass);
 }
 
+static VALUE clips_environment_defclass_defmodule(VALUE self)
+{
+	Defclass *class;
+	const char *defmoduleName;
+	Defmodule *defmodule = NULL;
+	Environment *env;
+
+	VALUE rbEnvironment = rb_iv_get(self, "@environment");
+	TypedData_Get_Struct(rbEnvironment, Environment, &Environment_type, env);
+
+	TypedData_Get_Struct(self, Defclass, &Defclass_type, class);
+	
+	defmoduleName = DefclassModule(class);
+
+	if (defmoduleName != NULL) {
+		defmodule = FindDefmodule(env, defmoduleName);
+	}
+
+	if (defmodule != NULL) {
+		return TypedData_Wrap_Struct(rb_const_get(CLASS_OF(rbEnvironment), rb_intern("Defmodule")), &Defmodule_type, defmodule);
+	} else {
+		return Qnil;
+	}
+}
+
+static VALUE clips_environment_defclass_static_defmodule(VALUE self, VALUE rbDefclass)
+{
+	return clips_environment_defclass_defmodule(rbDefclass);
+}
+
 static VALUE clips_environment_defclass_pp_form(VALUE self)
 {
 	Defclass *defclass;
@@ -1952,6 +2042,7 @@ static VALUE clips_environment_fact_static_index(VALUE self, VALUE rbFact)
 
 static VALUE clips_environment_find_defrule(VALUE self, VALUE defrule_name)
 {
+	VALUE rbDefrule;
 	Environment *env;
 	Defrule *rule;
 
@@ -1972,7 +2063,9 @@ static VALUE clips_environment_find_defrule(VALUE self, VALUE defrule_name)
 	if (rule == NULL) {
 		return Qnil;
 	} else {
-		return TypedData_Wrap_Struct(rb_const_get(CLASS_OF(self), rb_intern("Defrule")), &Defrule_type, rule);
+		rbDefrule = TypedData_Wrap_Struct(rb_const_get(CLASS_OF(self), rb_intern("Defrule")), &Defrule_type, rule); 
+		rb_iv_set(rbDefrule, "@environment", self);
+		return rbDefrule;
 	}
 }
 
@@ -2029,10 +2122,16 @@ static VALUE clips_environment_deffacts_static_name(VALUE self, VALUE rbDeffacts
 static VALUE clips_environment_deffacts_pp_form(VALUE self)
 {
 	Deffacts *deffacts;
+	const char *pp_form;
 
 	TypedData_Get_Struct(self, Deffacts, &Deffacts_type, deffacts);
 
-	return rb_str_new2(DeffactsPPForm(deffacts));
+	pp_form = DeffactsPPForm(deffacts);
+	if (pp_form == NULL) {
+		return Qnil;
+	} else {
+		return rb_str_new2(pp_form);
+	}
 }
 
 static VALUE clips_environment_deffacts_static_pp_form(VALUE self, VALUE rbDeffacts)
@@ -2417,10 +2516,16 @@ static VALUE clips_environment_deftemplate_static_name(VALUE self, VALUE rbDefte
 static VALUE clips_environment_deftemplate_pp_form(VALUE self)
 {
 	Deftemplate *deftemplate;
+	const char *pp_form;
 
 	TypedData_Get_Struct(self, Deftemplate, &Deftemplate_type, deftemplate);
 
-	return rb_str_new2(DeftemplatePPForm(deftemplate));
+	pp_form = DeftemplatePPForm(deftemplate);
+	if (pp_form == NULL) {
+		return Qnil;
+	} else {
+		return rb_str_new2(pp_form);
+	}
 }
 
 static VALUE clips_environment_deftemplate_static_pp_form(VALUE self, VALUE rbDeftemplate)
@@ -2967,10 +3072,16 @@ static VALUE clips_environment_defmodule_static_name(VALUE self, VALUE rbDefmodu
 static VALUE clips_environment_defmodule_pp_form(VALUE self)
 {
 	Defmodule *defmodule;
+	const char *pp_form;
 
 	TypedData_Get_Struct(self, Defmodule, &Defmodule_type, defmodule);
 
-	return rb_str_new2(DefmodulePPForm(defmodule));
+	pp_form = DefmodulePPForm(defmodule);
+	if (pp_form == NULL) {
+		return Qnil;
+	} else {
+		return rb_str_new2(pp_form);
+	}
 }
 
 static VALUE clips_environment_defmodule_static_pp_form(VALUE self, VALUE rbDefmodule)
@@ -4197,6 +4308,8 @@ void Init_clipsruby(void)
 	rb_define_method(rbDeftemplate, "pp_form", clips_environment_deftemplate_pp_form, 0);
 	rb_define_singleton_method(rbDeftemplate, "assert_hash", clips_environment_deftemplate_static_assert_hash, 2);
 	rb_define_method(rbDeftemplate, "assert_hash", clips_environment_deftemplate_assert_hash, 1);
+	rb_define_singleton_method(rbDeftemplate, "defmodule", clips_environment_deftemplate_static_defmodule, 1);
+	rb_define_method(rbDeftemplate, "defmodule", clips_environment_deftemplate_defmodule, 0);
 	rb_define_singleton_method(rbDeftemplate, "defmodule_name", clips_environment_deftemplate_static_defmodule_name, 1);
 	rb_define_method(rbDeftemplate, "defmodule_name", clips_environment_deftemplate_defmodule_name, 0);
 	rb_define_singleton_method(rbDeftemplate, "slot_names", clips_environment_deftemplate_static_slot_names, 1);
@@ -4284,6 +4397,8 @@ void Init_clipsruby(void)
 	rb_define_method(rbDefrule, "salience", clips_environment_defrule_salience, 0);
 	rb_define_singleton_method(rbDefrule, "defmodule_name", clips_environment_defrule_static_defmodule_name, 1);
 	rb_define_method(rbDefrule, "defmodule_name", clips_environment_defrule_defmodule_name, 0);
+	rb_define_singleton_method(rbDefrule, "defmodule", clips_environment_defrule_static_defmodule, 1);
+	rb_define_method(rbDefrule, "defmodule", clips_environment_defrule_defmodule, 0);
 
 	VALUE rbDefclass = rb_define_class_under(rbEnvironment, "Defclass", rb_cObject);
 	rb_define_alloc_func(rbDefclass, defclass_alloc);
@@ -4291,6 +4406,8 @@ void Init_clipsruby(void)
 	rb_define_method(rbDefclass, "name", clips_environment_defclass_name, 0);
 	rb_define_singleton_method(rbDefclass, "defmodule_name", clips_environment_defclass_static_defmodule_name, 1);
 	rb_define_method(rbDefclass, "defmodule_name", clips_environment_defclass_defmodule_name, 0);
+	rb_define_singleton_method(rbDefclass, "defmodule", clips_environment_defclass_static_defmodule, 1);
+	rb_define_method(rbDefclass, "defmodule", clips_environment_defclass_defmodule, 0);
 	rb_define_singleton_method(rbDefclass, "pp_form", clips_environment_defclass_static_pp_form, 1);
 	rb_define_method(rbDefclass, "pp_form", clips_environment_defclass_pp_form, 0);
 	rb_define_singleton_method(rbDefclass, "get_instance_list", clips_environment_defclass_static_get_instance_list, -1);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clipsruby
 version: !ruby/object:Gem::Version
-  version: 0.0.37
+  version: 0.0.39
 platform: ruby
 authors:
 - Ryan Johnston
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-28 00:00:00.000000000 Z
+date: 2024-09-30 00:00:00.000000000 Z
 dependencies: []
 description: Calling the CLIPS programming language from within Ruby
 email: mrryanjohnston@gmail.com