clipsruby 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b86283884e46ed71a0e4db078683c2443b9f1baf9220ab0a5e9f90eef02b0ba
-  data.tar.gz: 0632d1971aedb15f695e0d43400113f45693fba7db6547d6497887df81c019a4
+  metadata.gz: 4e3ac17e072a0fec194ad7a163acefb487ed0b2d822c04ba71f28e517278fe7a
+  data.tar.gz: 76b21dc4e2c25ae2017d94c064ac33f9bd2e3ff9d6a9b9505e5bd2f298b1d837
 SHA512:
-  metadata.gz: e72f8a5f5eae7b0befcfcfe5fd850a62cdef2c984f5a6cbbfcfab52190adcfa90a5c5af5a7ef028ee573105f4aacfd5ead750bbae7c496bde05e0eedb07df3b9
-  data.tar.gz: c08ddb4e2559ee1bf6113e6866ff7c75880801201a740292fe6ba3109fe9a7806f1074bdd6b2a6093bacb27c83bd24dff8979e45cb2d137f82e7a3de3ce6c9d6
+  metadata.gz: a665cd9fd033552cad6807dea0616cf5ebb9f41e1d07f37357c57d85e3e3db50c4845792626e47d01c8c0a6a1a1454983b8f32979624bfadc0d08388d96cefc1
+  data.tar.gz: 2ac05ff02cbb504aba1eab34cfcd5f7ff4c800cd4021de5bf956edec010725af34a5dcaa531b91b633761f9198b5835316b1b3ca20d639c0860297da5b40e46e

data/ext/clipsruby/clipsruby.c

@@ -323,8 +323,10 @@ static VALUE clips_environment_static_assert_hash(VALUE self, VALUE environment,
 	return clips_environment_assert_hash(environment, deftemplate_name, hash);
 }
 
-static void CLIPSValue_to_VALUE(CLIPSValue *from, VALUE *value, Environment *env)
+static void CLIPSValue_to_VALUE(CLIPSValue *from, VALUE *value, VALUE *rbEnvironment)
 {
+	Environment *env;
+	TypedData_Get_Struct(*rbEnvironment, Environment, &Environment_type, env);
 	switch (from->header->type)
 	{
 		case VOID_TYPE:
@@ -338,7 +340,7 @@ static void CLIPSValue_to_VALUE(CLIPSValue *from, VALUE *value, Environment *env
 			for (size_t i = 0; i < from->multifieldValue->length; i++)
 			{
 				VALUE innerValue;
-				CLIPSValue_to_VALUE(&from->multifieldValue->contents[i], &innerValue, env);
+				CLIPSValue_to_VALUE(&from->multifieldValue->contents[i], &innerValue, rbEnvironment);
 				rb_ary_push(*value, innerValue);
 			}
 			break;
@@ -358,8 +360,13 @@ static void CLIPSValue_to_VALUE(CLIPSValue *from, VALUE *value, Environment *env
 		case INSTANCE_NAME_TYPE:
 			*value = rb_str_new2(from->lexemeValue->contents);
 			break;
-		case EXTERNAL_ADDRESS_TYPE:
 		case FACT_ADDRESS_TYPE:
+			*value =
+				TypedData_Wrap_Struct(rb_const_get(CLASS_OF(*rbEnvironment), rb_intern("Fact")), &Fact_type, from->factValue);
+
+			rb_iv_set(*value, "@environment", *rbEnvironment);
+			break;
+		case EXTERNAL_ADDRESS_TYPE:
 		case INSTANCE_ADDRESS_TYPE:
 		default:
 			WriteString(env,STDERR,"Unsupported data type returned from function\n");
@@ -368,8 +375,10 @@ static void CLIPSValue_to_VALUE(CLIPSValue *from, VALUE *value, Environment *env
 	}
 }
 
-static void UDFValue_to_VALUE(UDFValue *from, VALUE *value, Environment *env)
+static void UDFValue_to_VALUE(UDFValue *from, VALUE *value, VALUE *rbEnvironment)
 {
+	Environment *env;
+	TypedData_Get_Struct(*rbEnvironment, Environment, &Environment_type, env);
 	switch (from->header->type)
 	{
 		case VOID_TYPE:
@@ -383,7 +392,7 @@ static void UDFValue_to_VALUE(UDFValue *from, VALUE *value, Environment *env)
 			VALUE innerValue;
 			for (size_t i = 0; i < from->multifieldValue->length; i++)
 			{
-				CLIPSValue_to_VALUE(&from->multifieldValue->contents[i], &innerValue, env);
+				CLIPSValue_to_VALUE(&from->multifieldValue->contents[i], &innerValue, rbEnvironment);
 				rb_ary_push(*value, innerValue);
 			}
 			break;
@@ -403,8 +412,13 @@ static void UDFValue_to_VALUE(UDFValue *from, VALUE *value, Environment *env)
 		case INSTANCE_NAME_TYPE:
 			*value = rb_str_new2(from->lexemeValue->contents);
 			break;
-		case EXTERNAL_ADDRESS_TYPE:
 		case FACT_ADDRESS_TYPE:
+			*value =
+				TypedData_Wrap_Struct(rb_const_get(CLASS_OF(*rbEnvironment), rb_intern("Fact")), &Fact_type, from->factValue);
+
+			rb_iv_set(*value, "@environment", *rbEnvironment);
+			break;
+		case EXTERNAL_ADDRESS_TYPE:
 		case INSTANCE_ADDRESS_TYPE:
 		default:
 			WriteString(env,STDERR,"Unsupported data type returned from function\n");
@@ -424,10 +438,11 @@ void UDFGenericFunction(
 	UDFValue theArg;
 	VALUE method = (VALUE)(context->context);
 	VALUE theValue;
+	VALUE rbEnvironment = rb_funcall(method, rb_intern("receiver"), 0);
 	while (UDFHasNextArgument(context))
 	{
 		UDFNextArgument(context, ANY_TYPE_BITS, &theArg);
-		UDFValue_to_VALUE(&theArg, current_argv, theEnv);
+		UDFValue_to_VALUE(&theArg, current_argv, &rbEnvironment);
 		current_argv++;
 	}
 	// Call the method on the object with the provided arguments
@@ -570,7 +585,7 @@ static VALUE clips_environment_run(int argc, VALUE *argv, VALUE environment) {
 
 	TypedData_Get_Struct(environment, Environment, &Environment_type, env);
 
-	return NUM2INT(Run(env, NUM2INT(integer)));
+	return INT2NUM(Run(env, NUM2INT(integer)));
 }
 
 static VALUE clips_environment_static_run(int argc, VALUE *argv, VALUE klass) {
@@ -584,7 +599,53 @@ static VALUE clips_environment_static_run(int argc, VALUE *argv, VALUE klass) {
 
 	TypedData_Get_Struct(environment, Environment, &Environment_type, env);
 
-	return NUM2INT(Run(env, NUM2INT(integer)));
+	return INT2NUM(Run(env, NUM2INT(integer)));
+}
+
+/*
+static VALUE clips_environment_find_all_facts(VALUE self)
+{
+	Fact *fact;
+
+	TypedData_Get_Struct(self, Fact, &Fact_type, fact);
+
+	return ID2SYM(rb_intern(DeftemplateName(FactDeftemplate(fact))));
+}
+
+static VALUE clips_environment_static_find_all_facts(VALUE self, VALUE rbFact)
+{
+	return clips_environment_fact_deftemplate_name(rbFact);
+}
+*/
+
+static VALUE clips_environment_eval(VALUE self, VALUE string)
+{
+	Environment *env;
+	CLIPSValue output;
+	VALUE toReturn;
+
+	TypedData_Get_Struct(self, Environment, &Environment_type, env);
+
+	switch(Eval(env, StringValueCStr(string), &output))
+	{
+		case EE_NO_ERROR:
+			break;
+		case EE_PROCESSING_ERROR:
+			rb_warn("`eval` failed!");
+			break;
+		case EE_PARSING_ERROR:
+			rb_warn("`eval` failed! Could not parse string correctly.");
+			break;
+	}
+
+	CLIPSValue_to_VALUE(&output, &toReturn, &self);
+
+	return toReturn;
+}
+
+static VALUE clips_environment_static_eval(VALUE self, VALUE rbEnvironment, VALUE string)
+{
+	return clips_environment_eval(rbEnvironment, string);
 }
 
 void Init_clipsruby(void)
@@ -606,6 +667,12 @@ void Init_clipsruby(void)
 	rb_define_method(rbEnvironment, "add_udf", clips_environment_add_udf, -1);
 	rb_define_singleton_method(rbEnvironment, "run", clips_environment_static_run, -1);
 	rb_define_method(rbEnvironment, "run", clips_environment_run, -1);
+/*
+	rb_define_singleton_method(rbEnvironment, "find_all_facts", clips_environment_static_find_all_facts, 2);
+	rb_define_method(rbEnvironment, "find_all_facts", clips_environment_find_all_facts, 1);
+*/
+	rb_define_singleton_method(rbEnvironment, "_eval", clips_environment_static_eval, 2);
+	rb_define_method(rbEnvironment, "_eval", clips_environment_eval, 1);
 
 	VALUE rbFact = rb_define_class_under(rbEnvironment, "Fact", rb_cObject);
 	rb_define_singleton_method(rbFact, "deftemplate_name", clips_environment_fact_static_deftemplate_name, 1);

metadata

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