Rename classes from MentalExistent=>MentalPhenomenon

smocore/include/artificedMentalExistent.h

@@ -1,30 +1,30 @@
-#ifndef _ARTIFICED_MENTAL_EXISTENT_H
-#define _ARTIFICED_MENTAL_EXISTENT_H
+#ifndef _ARTIFICED_MENTAL_PHENOMENON_H
+#define _ARTIFICED_MENTAL_PHENOMENON_H
 
-#include "mentalExistent.h"
+#include "implexa.h"
 
 namespace smo {
 
-class FogArtificedMentalExistent
-: public ArtificedMentalExistent
+class FogArtificedMentalPhenomenon
+: public ArtificedMentalPhenomenon
 {
 };
 
-typedef FogArtificedMentalExistent Fogaxent, FogArtixent;
+typedef FogArtificedMentalPhenomenon Fogen, Fogena;
 
-class IdyllicArtificedMentalExistent
-: public ArtificedMentalExistent
+class IdyllicArtificedMentalPhenomenon
+: public ArtificedMentalPhenomenon
 {
 };
 
-typedef IdyllicArtificedMentalExistent Idyllixent, IdyllArtixent;
+typedef IdyllicArtificedMentalPhenomenon Idyllen, Idyllena;
 
-class FantasyArtificedMentalExistent
-: public ArtificedMentalExistent
+class FantasyArtificedMentalPhenomenon
+: public ArtificedMentalPhenomenon
 {
 };
 
-typedef FantasyArtificedMentalExistent Fantaxent, FanArtixent;
+typedef FantasyArtificedMentalPhenomenon Fantan, Fantana;
 
 } // namespace smo
 

smocore/include/artificedMentalPhenomenon.h

@@ -0,0 +1,31 @@
+#ifndef _ARTIFICED_MENTAL_PHENOMENON_H
+#define _ARTIFICED_MENTAL_PHENOMENON_H
+
+#include "implexa.h"
+
+namespace smo {
+
+class FogArtificedMentalPhenomenon
+: public ArtificedMentalPhenomenon
+{
+};
+
+typedef FogArtificedMentalPhenomenon Fogenon;
+
+class IdyllicArtificedMentalPhenomenon
+: public ArtificedMentalPhenomenon
+{
+};
+
+typedef IdyllicArtificedMentalPhenomenon Idyllenon;
+
+class FantasyArtificedMentalPhenomenon
+: public ArtificedMentalPhenomenon
+{
+};
+
+typedef FantasyArtificedMentalPhenomenon Fantanon;
+
+} // namespace smo
+
+#endif // _ARTIFICED_MENTAL_PHENOMENON_H

smocore/include/fantasyArtificedMentalExistent.h

@@ -1,23 +1,23 @@
-#ifndef _FANTASY_ARTIFICED_MENTAL_EXISTENT_H
-#define _FANTASY_ARTIFICED_MENTAL_EXISTENT_H
+#ifndef _FANTASY_ARTIFICED_MENTAL_PHENOMENON_H
+#define _FANTASY_ARTIFICED_MENTAL_PHENOMENON_H
 
-#include "artificedMentalExistent.h"
+#include "artificedMentalPhenomenon.h"
 
 namespace smo {
 
-class FictionalFantasyArtificedMentalExistent
-: public FantasyArtificedMentalExistent
+class FictionalFantasyArtificedMentalPhenomenon
+: public FantasyArtificedMentalPhenomenon
 {
 };
 
-typedef FictionalFantasyArtificedMentalExistent Fictaxent, FictFantixent;
+typedef FictionalFantasyArtificedMentalPhenomenon Ficten, Fictena;
 
-class AspirationFantasyArtificedMentalExistent
-: public FantasyArtificedMentalExistent
+class AspirationFantasyArtificedMentalPhenomenon
+: public FantasyArtificedMentalPhenomenon
 {
 };
 
-typedef AspirationFantasyArtificedMentalExistent Aspixent, AsFantixent;
+typedef AspirationFantasyArtificedMentalPhenomenon Aspan, Aspana;
 
 } // namespace smo
 

smocore/include/fantasyArtificedMentalPhenomenon.h

@@ -0,0 +1,24 @@
+#ifndef _FANTASY_ARTIFICED_MENTAL_PHENOMENON_H
+#define _FANTASY_ARTIFICED_MENTAL_PHENOMENON_H
+
+#include "artificedMentalPhenomenon.h"
+
+namespace smo {
+
+class FictionalFantasyArtificedMentalPhenomenon
+: public FantasyArtificedMentalPhenomenon
+{
+};
+
+typedef FictionalFantasyArtificedMentalPhenomenon Fictenon;
+
+class AspirationFantasyArtificedMentalPhenomenon
+: public FantasyArtificedMentalPhenomenon
+{
+};
+
+typedef AspirationFantasyArtificedMentalPhenomenon Aspanon;
+
+} // namespace smo
+
+#endif // _FANTASY_ARTIFICED_MENTAL_PHENOMENON_H

smocore/include/implexa.h

@@ -0,0 +1,41 @@
+#ifndef _IMPLEXA_H
+#define _IMPLEXA_H
+
+#include "mentalEntity.h"
+
+namespace smo {
+
+/*
+ * MentalPhenomena are content of the mind that specifically represents
+ * phenomena. I.e: perceptual data, whether structural or implicative. All
+ * Menten are Mentities, but not all Mentities are Menten.
+ */
+
+struct MentalPhenomenon
+: public MentalEntity
+{
+public:
+	MentalPhenomenon(const MentalEntity::Id id)
+	: MentalEntity(id)
+	{}
+};
+
+typedef MentalPhenomenon Mentenon;
+
+class ImplexedMentalPhenomenon
+: public MentalPhenomenon
+{
+};
+
+typedef ImplexedMentalPhenomenon Implexon;
+
+class ArtificedMentalPhenomenon
+: public MentalPhenomenon
+{
+};
+
+typedef ArtificedMentalPhenomenon Artifenon;
+
+} // namespace smo
+
+#endif // _IMPLEXA_H

smocore/include/mentalExistent.h

@@ -1,41 +0,0 @@
-#ifndef _MENTAL_EXISTENT_H
-#define _MENTAL_EXISTENT_H
-
-#include "mentalEntity.h"
-
-namespace smo {
-
-/*
- * MentalExistents are content of the mind that specifically represents
- * existents. I.e: perceptual data, whether structural or implicative. All
- * Mentexents are Mentities, but not all Mentities are Mentexents.
- */
-
-struct MentalExistent
-: public MentalEntity
-{
-public:
-	MentalExistent(const MentalEntity::Id id)
-	: MentalEntity(id)
-	{}
-};
-
-typedef MentalExistent Mentexent;
-
-class ImplexedMentalExistent
-: public MentalExistent
-{
-};
-
-typedef ImplexedMentalExistent Implexent;
-
-class ArtificedMentalExistent
-: public MentalExistent
-{
-};
-
-typedef ArtificedMentalExistent Artifixent, Artixent;
-
-} // namespace smo
-
-#endif

smocore/include/quale.h

@@ -3,16 +3,16 @@
 
 #include <cstdint>
 #include <attentionTrigger.h>
-#include <mentalExistent.h>
+#include <implexa.h>
 
 namespace smo {
 
 class Quale
-: public MentalExistent
+: public MentalPhenomenon
 {
 public:
 	Quale(const MentalEntity::Id id, const int32_t intensity)
-	: MentalExistent(id),
+	: MentalPhenomenon(id),
 		intensity(intensity)
 	{}