--- rpl/src/interface_cas.cpp 2011/06/25 10:40:48 1.7 +++ rpl/src/interface_cas.cpp 2011/07/25 07:44:59 1.11 @@ -1,6 +1,6 @@ /* ================================================================================ - RPL/2 (R) version 4.1.0.prerelease.4 + RPL/2 (R) version 4.1.2 Copyright (C) 1989-2011 Dr. BERTRAND Joël This file is part of RPL/2. @@ -20,14 +20,16 @@ */ -#include "giac.h" +#ifdef RPLCAS +# include "giac.h" -#undef PACKAGE -#undef PACKAGE_NAME -#undef PACKAGE_STRING -#undef PACKAGE_TARNAME -#undef PACKAGE_VERSION -#undef VERSION +# undef PACKAGE +# undef PACKAGE_NAME +# undef PACKAGE_STRING +# undef PACKAGE_TARNAME +# undef PACKAGE_VERSION +# undef VERSION +#endif extern "C" { @@ -38,7 +40,10 @@ extern "C" #include using namespace std; -using namespace giac; + +#ifdef RPLCAS + using namespace giac; +#endif static unsigned char * @@ -210,6 +215,7 @@ void interface_cas(struct_processus *s_etat_processus, enum t_rplcas_commandes commande) { +# ifdef RPLCAS struct_objet *s_objet_argument_1; struct_objet *s_objet_argument_2; @@ -264,7 +270,7 @@ interface_cas(struct_processus *s_etat_p string(reinterpret_cast(argument_2)), &contexte); - gen resultat = integrate(expression, variable, &contexte); + gen resultat = integrate_gen(expression, variable, &contexte); string chaine = "'" + resultat.print() + "'"; registre = s_etat_processus->instruction_courante; @@ -304,6 +310,23 @@ interface_cas(struct_processus *s_etat_p } return; + +#else + + if (s_etat_processus->langue == 'F') + { + printf("+++Attention : RPL/CAS non compilé !\n"); + } + else + { + printf("+++Warning : RPL/CAS not available !\n"); + } + + fflush(stdout); + + return; + +#endif } // vim: ts=4