diff options
Diffstat (limited to 'src/dffctdef.h')
| -rw-r--r-- | src/dffctdef.h | 61 |
1 files changed, 35 insertions, 26 deletions
diff --git a/src/dffctdef.h b/src/dffctdef.h index d2c3b32..97af508 100644 --- a/src/dffctdef.h +++ b/src/dffctdef.h @@ -1,7 +1,7 @@ /*******************************************************/ /* "C" Language Integrated Production System */ /* */ - /* CLIPS Version 6.24 06/05/06 */ + /* CLIPS Version 6.30 01/25/15 */ /* */ /* DEFFACTS HEADER FILE */ /*******************************************************/ @@ -13,12 +13,25 @@ /* Gary D. Riley */ /* */ /* Contributing Programmer(s): */ -/* Brian L. Donnell */ +/* Brian L. Dantes */ /* */ /* Revision History: */ /* */ /* 6.24: Renamed BOOLEAN macro type to intBool. */ /* */ +/* 6.30: Removed conditional code for unsupported */ +/* compilers/operating systems (IBM_MCW, */ +/* MAC_MCW, and IBM_TBC). */ +/* */ +/* Added const qualifiers to remove C++ */ +/* deprecation warnings. */ +/* */ +/* Converted API macros to function calls. */ +/* */ +/* Changed find construct functionality so that */ +/* imported modules are search when locating a */ +/* named construct. */ +/* */ /*************************************************************/ #ifndef _H_dffctdef @@ -49,14 +62,14 @@ #define DEFFACTS_DATA 0 struct deffactsData - { + { struct construct *DeffactsConstruct; - int DeffactsModuleIndex; + int DeffactsModuleIndex; #if CONSTRUCT_COMPILER && (! RUN_TIME) struct CodeGeneratorItem *DeffactsCodeItem; #endif }; - + struct deffacts { struct constructHeader header; @@ -68,9 +81,6 @@ struct deffactsModule struct defmoduleItemHeader header; }; -#define EnvGetDeffactsName(theEnv,x) GetConstructNameString((struct constructHeader *) x) -#define EnvGetDeffactsPPForm(theEnv,x) GetConstructPPForm(theEnv,(struct constructHeader *) x) -#define EnvDeffactsModule(theEnv,x) GetConstructModuleName((struct constructHeader *) x) #define DeffactsData(theEnv) ((struct deffactsData *) GetEnvironmentData(theEnv,DEFFACTS_DATA)) #ifdef LOCALE @@ -83,29 +93,28 @@ struct deffactsModule #define LOCALE extern #endif -#if ENVIRONMENT_API_ONLY -#define DeffactsModule(theEnv,x) GetConstructModuleName((struct constructHeader *) x) -#define FindDeffacts(theEnv,a) EnvFindDeffacts(theEnv,a) -#define GetDeffactsName(theEnv,x) GetConstructNameString((struct constructHeader *) x) -#define GetDeffactsPPForm(theEnv,x) GetConstructPPForm(theEnv,(struct constructHeader *) x) -#define GetNextDeffacts(theEnv,a) EnvGetNextDeffacts(theEnv,a) -#define IsDeffactsDeletable(theEnv,a) EnvIsDeffactsDeletable(theEnv,a) -#else -#define DeffactsModule(x) GetConstructModuleName((struct constructHeader *) x) -#define FindDeffacts(a) EnvFindDeffacts(GetCurrentEnvironment(),a) -#define GetDeffactsName(x) GetConstructNameString((struct constructHeader *) x) -#define GetDeffactsPPForm(x) GetConstructPPForm(GetCurrentEnvironment(),(struct constructHeader *) x) -#define GetNextDeffacts(a) EnvGetNextDeffacts(GetCurrentEnvironment(),a) -#define IsDeffactsDeletable(a) EnvIsDeffactsDeletable(GetCurrentEnvironment(),a) -#endif - LOCALE void InitializeDeffacts(void *); - LOCALE void *EnvFindDeffacts(void *,char *); + LOCALE void *EnvFindDeffacts(void *,const char *); + LOCALE void *EnvFindDeffactsInModule(void *,const char *); LOCALE void *EnvGetNextDeffacts(void *,void *); LOCALE void CreateInitialFactDeffacts(void); LOCALE intBool EnvIsDeffactsDeletable(void *,void *); LOCALE struct deffactsModule *GetDeffactsModuleItem(void *,struct defmodule *); + LOCALE const char *EnvDeffactsModule(void *,void *); + LOCALE const char *EnvGetDeffactsName(void *,void *); + LOCALE const char *EnvGetDeffactsPPForm(void *,void *); -#endif +#if ALLOW_ENVIRONMENT_GLOBALS + + LOCALE void *FindDeffacts(const char *); + LOCALE void *GetNextDeffacts(void *); + LOCALE intBool IsDeffactsDeletable(void *); + LOCALE const char *DeffactsModule(void *); + LOCALE const char *GetDeffactsName(void *); + LOCALE const char *GetDeffactsPPForm(void *); + +#endif /* ALLOW_ENVIRONMENT_GLOBALS */ + +#endif /* _H_dffctdef */ |