From 4344749dfd571a0d583d9b2a4598118e4622fdf3 Mon Sep 17 00:00:00 2001
From: Daniel Habering <daniel.habering@rwth-aachen.de>
Date: Tue, 18 Jun 2019 16:50:35 +0200
Subject: [PATCH] environment: fix adding symbols with multiple environments

If we call AddSymbol, the symbol is created in the environment that
is set as the current environment, which is not necessarily the correct
environment. Instead use EnvAddSymbol and pass the environment pointer
to AddSymbol at the desired places
---
 clipsmm/environment.cpp |  4 ++--
 clipsmm/environment.h   | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/clipsmm/environment.cpp b/clipsmm/environment.cpp
index f2be758..874cb56 100644
--- a/clipsmm/environment.cpp
+++ b/clipsmm/environment.cpp
@@ -853,8 +853,8 @@ void Environment::set_return_value( void *env, void *rv, const Value &v)
   value_to_data_object_rawenv(env, v, (struct dataObject *)rv);
 }
 
-void* Environment::add_symbol( const char* s ) {
-  return AddSymbol( const_cast<char*>(s) );
+void* Environment::add_symbol(void *env, const char* s ) {
+  return EnvAddSymbol(env, const_cast<char*>(s) );
 }
 
 }
diff --git a/clipsmm/environment.h b/clipsmm/environment.h
index c2b8ad3..7af474f 100644
--- a/clipsmm/environment.h
+++ b/clipsmm/environment.h
@@ -811,7 +811,7 @@ namespace CLIPS {
       static void* get_function_context( void* env );
       static void  set_return_values( void *env, void *rv, const Values &v);
       static void  set_return_value( void *env, void *rv, const Value &v);
-      static void* add_symbol( const char* s );
+      static void* add_symbol( void *env, const char* s );
 
 
   };
@@ -1463,7 +1463,7 @@ namespace CLIPS {
       if ( get_arg_count( theEnv ) != 0 )
         throw std::logic_error( "clipsmm/string: wrong # args on slot callback; expected 0" );
       cb = static_cast<sigc::slot0<std::string>*>( cbptr );
-      return add_symbol( ( ( *cb ) ( )).c_str() );
+      return add_symbol( theEnv, ( ( *cb ) ( )).c_str() );
     }
     throw;
   }
@@ -1479,7 +1479,7 @@ namespace CLIPS {
         throw std::logic_error( "clipsmm: wrong # args on slot callback; expected 1" );
       get_argument( theEnv, 1, arg1 );
       cb = static_cast<sigc::slot1<std::string,T_arg1>*>( cbptr );
-      return add_symbol( ( ( *cb ) ( arg1 )).c_str() );
+      return add_symbol( theEnv, ( ( *cb ) ( arg1 )).c_str() );
     }
     throw;
   }
@@ -1497,7 +1497,7 @@ namespace CLIPS {
       get_argument( theEnv, 1, arg1 );
       get_argument( theEnv, 2, arg2 );
       cb = static_cast<sigc::slot2<std::string, T_arg1, T_arg2>*>( cbptr );
-      return add_symbol( ( ( *cb ) ( arg1, arg2 )).c_str() );
+      return add_symbol( theEnv, ( ( *cb ) ( arg1, arg2 )).c_str() );
     }
     throw;
   }
@@ -1517,7 +1517,7 @@ namespace CLIPS {
       get_argument( theEnv, 2, arg2 );
       get_argument( theEnv, 3, arg3 );
       cb = static_cast<sigc::slot3<std::string, T_arg1, T_arg2,T_arg3>*>( cbptr );
-      return add_symbol( ( ( *cb ) ( arg1, arg2, arg3 )).c_str() );
+      return add_symbol( theEnv, ( ( *cb ) ( arg1, arg2, arg3 )).c_str() );
     }
     throw;
   }
@@ -1541,7 +1541,7 @@ namespace CLIPS {
       get_argument( theEnv, 4, arg4 );
       cb = static_cast<sigc::slot4<std::string, T_arg1, T_arg2,T_arg3,T_arg4>*>( cbptr );
       s = ( *cb ) ( arg1, arg2, arg3, arg4 );
-      return add_symbol( s.c_str() );
+      return add_symbol( theEnv, s.c_str() );
     }
     throw;
   }
@@ -1565,7 +1565,7 @@ namespace CLIPS {
       get_argument( theEnv, 4, arg4 );
       get_argument( theEnv, 5, arg5 );
       cb = static_cast<sigc::slot5<std::string, T_arg1, T_arg2,T_arg3,T_arg4,T_arg5>*>( cbptr );
-      return add_symbol( ( ( *cb ) ( arg1, arg2, arg3, arg4, arg5 )).c_str() );
+      return add_symbol( theEnv, ( ( *cb ) ( arg1, arg2, arg3, arg4, arg5 )).c_str() );
     }
     throw;
   }
@@ -1591,7 +1591,7 @@ namespace CLIPS {
       get_argument( theEnv, 5, arg5 );
       get_argument( theEnv, 6, arg6 );
       cb = static_cast<sigc::slot6<std::string, T_arg1, T_arg2,T_arg3,T_arg4,T_arg5,T_arg6>*>( cbptr );
-      return add_symbol( ( ( *cb ) ( arg1, arg2, arg3, arg4, arg5, arg6 )).c_str() );
+      return add_symbol( theEnv, ( ( *cb ) ( arg1, arg2, arg3, arg4, arg5, arg6 )).c_str() );
     }
     throw;
   }
@@ -1619,7 +1619,7 @@ namespace CLIPS {
       get_argument( theEnv, 6, arg6 );
       get_argument( theEnv, 7, arg7 );
       cb = static_cast<sigc::slot7<std::string, T_arg1, T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7>*>( cbptr );
-      return add_symbol( ( ( *cb ) ( arg1, arg2, arg3, arg4, arg5, arg6, arg7 )).c_str() );
+      return add_symbol( theEnv, ( ( *cb ) ( arg1, arg2, arg3, arg4, arg5, arg6, arg7 )).c_str() );
     }
     throw;
   }