andr3/scyther
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added public functions list to knowledge structure and added AddFunction for it.

Browse Source
This commit is contained in:
Cas Cremers 2012-06-12 21:36:27 +02:00
parent 214e3ed09f
commit 61c451d7f8
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/knowledge.c
View File

@ -83,6 +83,7 @@ emptyKnowledge ()
know->encrypt = NULL; know->encrypt = NULL;
know->inverses = NULL; know->inverses = NULL;
know->vars = NULL; know->vars = NULL;
know->publicfunctions = NULL;
return know; return know;
} }
@ -110,6 +111,7 @@ knowledgeDuplicate (Knowledge know)
newknow->encrypt = termlistShallow (know->encrypt); newknow->encrypt = termlistShallow (know->encrypt);
newknow->vars = termlistShallow (know->vars); newknow->vars = termlistShallow (know->vars);
newknow->inverses = know->inverses; newknow->inverses = know->inverses;
newknow->publicfunctions = termlistShallow (know->publicfunctions);
return newknow; return newknow;
} }
@ -126,6 +128,7 @@ knowledgeDelete (Knowledge know)
termlistDelete (know->basic); termlistDelete (know->basic);
termlistDelete (know->encrypt); termlistDelete (know->encrypt);
termlistDelete (know->vars); termlistDelete (know->vars);
termlistDelete (know->publicfunctions);
free (know); free (know);
} }
} }
@ -145,6 +148,7 @@ knowledgeDestroy (Knowledge know)
termlistDestroy (know->encrypt); termlistDestroy (know->encrypt);
termlistDestroy (know->vars); termlistDestroy (know->vars);
// termlistDestroy(know->inverses); // termlistDestroy(know->inverses);
termlistDestroy (know->publicfunctions);
free (know); free (know);
} }
} }
@ -483,3 +487,18 @@ knowledgeSubstDo (const Knowledge know)
/* otherwise a copy (for deletion) is returned. */ /* otherwise a copy (for deletion) is returned. */
return knowledgeReconstruction (know); return knowledgeReconstruction (know);
} }
//! Add public function
void
knowledgeAddPublicFunction (const Knowledge know, const Term f)
{
know->publicfunctions = termlistAdd (know->publicfunctions, f);
return;
}
//! Check public function
int
isKnowledgePublicFunction (const Knowledge know, const Term f)
{
return inTermlist (know->publicfunctions, f);
}

4
src/knowledge.h
View File

@ -42,6 +42,8 @@ struct knowledge
* and we need to reconstruct the knowledge set. * and we need to reconstruct the knowledge set.
*/ */
Termlist vars; // special: denotes unsubstituted variables Termlist vars; // special: denotes unsubstituted variables
//! A list of public functions
Termlist publicfunctions;
}; };
//! Shorthand for knowledge pointer. //! Shorthand for knowledge pointer.
@ -67,6 +69,8 @@ Termlist knowledgeSet (const Knowledge know);
Termlist knowledgeGetInverses (const Knowledge know); Termlist knowledgeGetInverses (const Knowledge know);
int knowledgeSubstNeeded (const Knowledge know); int knowledgeSubstNeeded (const Knowledge know);
Knowledge knowledgeSubstDo (const Knowledge know); Knowledge knowledgeSubstDo (const Knowledge know);
void knowledgeAddPublicFunction (const Knowledge know, const Term f);
int isKnowledgePublicFunction (const Knowledge know, const Term f);
//! Harnass macro for recursive procedures. //! Harnass macro for recursive procedures.
#define mindwipe(k,recurse) \ #define mindwipe(k,recurse) \