Integration into IvyLeague

Dnn -> Ivl
Some class names changed, because of conflicts with previous Uch classes
Imakefile is replaced with Makefile

1 files changed, 38 insertions, 41 deletions

diff --git a/dnn/Source.cc b/dnn/Source.cc
index 516a710..cd39808 100755
--- a/dnn/Source.cc
+++ b/dnn/Source.cc
@@ -15,47 +15,47 @@
 #include "Source.h"
 #include "Trigger.h"
 #include "Reaction.h"
-#include "ccu/Array.h"
-#include "ccu/HashTable.h"
+#include "ivl/Array.h"
+#include "ivl/HashTable.h"
 
-DnnEventSource :: DnnEventSource ()
+IvlEventSource :: IvlEventSource ()
 {
 }
 
-DnnEventSource :: ~DnnEventSource ()
+IvlEventSource :: ~IvlEventSource ()
 {
 }
 
 void
-DnnEventSource :: Emit (DnnEvent* ev)
+IvlEventSource :: Emit (IvlEvent* ev)
 {
 	/* should enqueue? */
 	DispatchEvent (ev);
 }
 
-DnnEventSelector :: DnnEventSelector ()
+IvlEventSelector :: IvlEventSelector ()
 {
 }
 
-DnnEventSelector :: ~DnnEventSelector ()
+IvlEventSelector :: ~IvlEventSelector ()
 {
 }
 
-DnnEventIntSelector :: DnnEventIntSelector (DnnIntExtractor exid, int max)
-: DnnEventSelector (),
+IvlEventIntSelector :: IvlEventIntSelector (IvlIntExtractor exid, int max)
+: IvlEventSelector (),
   IdExtractor (exid),
   MaxSize (max),
   Triggers (0)
 {
 }
 
-DnnEventIntSelector :: ~DnnEventIntSelector ()
+IvlEventIntSelector :: ~IvlEventIntSelector ()
 {
 	if (Triggers) {
 		int id = 0;
 #ifdef FIXME
 		while (id < MaxSize) {
-			DnnTrigger* t = (*Triggers)[id];
+			IvlTrigger* t = (*Triggers)[id];
 			if (t)
 				delete t;
 		}
@@ -63,27 +63,26 @@ DnnEventIntSelector :: ~DnnEventIntSelector ()
 	}
 }
 
-DnnTrigger*
-DnnEventIntSelector :: UseTrigger (int id)
+IvlTrigger*
+IvlEventIntSelector :: UseTrigger (int id)
 {
 	if (!Triggers && MaxSize) {
-		Triggers = new CcuArrayOf<DnnTrigger> (MaxSize, 0);
+		Triggers = new IvlArrayOf<IvlTrigger> (MaxSize, 0);
 	}
 
-	/* no need to check bounds: CcuArray does it */
-	DnnTrigger** t = *Triggers + id;
+	/* no need to check bounds: IvlArray does it */
+	IvlTrigger** t = *Triggers + id;
 	if (*t == 0) {
-		*t = new DnnTrigger;
+		*t = new IvlTrigger;
 	}
 
 	return *t;
 }
 
-
 void
-DnnEventIntSelector :: UnuseTrigger (int id, DnnBaseReaction* r)
+IvlEventIntSelector :: UnuseTrigger (int id, IvlBaseReaction* r)
 {
-	DnnTrigger** t;
+	IvlTrigger** t;
 	if (!Triggers || !(t = *Triggers + id))
 		return;
 
@@ -94,26 +93,25 @@ DnnEventIntSelector :: UnuseTrigger (int id, DnnBaseReaction* r)
 	}
 }
 
-DnnTrigger*
-DnnEventIntSelector :: FindTrigger (DnnEvent* ev)
+IvlTrigger*
+IvlEventIntSelector :: FindTrigger (IvlEvent* ev)
 {
-	DnnTrigger* t = 0;
+	IvlTrigger* t = 0;
 	int id = (IdExtractor) (ev);
 	if (Triggers)
 		t = (*Triggers) [id];
 	return t;
 }
 
-
-DnnEventPtrSelector :: DnnEventPtrSelector (DnnPtrExtractor exid, int sz)
-: DnnEventSelector (),
+IvlEventPtrSelector :: IvlEventPtrSelector (IvlPtrExtractor exid, int sz)
+: IvlEventSelector (),
   PtrExtractor (exid),
   TblSize (sz),
   Triggers (0)
 {
 }
 
-DnnEventPtrSelector :: ~DnnEventPtrSelector ()
+IvlEventPtrSelector :: ~IvlEventPtrSelector ()
 {
 	if (Triggers) {
 		int id = 0;
@@ -122,32 +120,31 @@ DnnEventPtrSelector :: ~DnnEventPtrSelector ()
 	}
 }
 
-DnnTrigger*
-DnnEventPtrSelector :: UseTrigger (void* id)
+IvlTrigger*
+IvlEventPtrSelector :: UseTrigger (void* id)
 {
 	if (!Triggers && TblSize) {
-		Triggers = new CcuHashTableOf<DnnTrigger> (TblSize);
+		Triggers = new IvlHashTableOf<IvlTrigger> (TblSize);
 	}
 
 	int found;
-	CcuHashCellOf<DnnTrigger>* c = Triggers->Add (id, &found);
-	DnnTrigger* t;
+	IvlHashCellOf<IvlTrigger>* c = Triggers->Add (id, &found);
+	IvlTrigger* t;
 	if (found)
 		t = c->GetInfo ();
 	else
-		c->SetInfo (t = new DnnTrigger);
+		c->SetInfo (t = new IvlTrigger);
 	return t;
 }
 
-
 void
-DnnEventPtrSelector :: UnuseTrigger (void* id, DnnBaseReaction* r)
+IvlEventPtrSelector :: UnuseTrigger (void* id, IvlBaseReaction* r)
 {
-	CcuHashCellOf<DnnTrigger>* c;
+	IvlHashCellOf<IvlTrigger>* c;
 	if (!Triggers || !(c = Triggers->Get (id)))
 		return;
 
-	DnnTrigger* t = c->GetInfo ();
+	IvlTrigger* t = c->GetInfo ();
 	r->UnsubscribeTo (*t);
 	if (t->IsUnused ()) {
 		delete t;
@@ -156,11 +153,11 @@ DnnEventPtrSelector :: UnuseTrigger (void* id, DnnBaseReaction* r)
 	}
 }
 
-DnnTrigger*
-DnnEventPtrSelector :: FindTrigger (DnnEvent* ev)
+IvlTrigger*
+IvlEventPtrSelector :: FindTrigger (IvlEvent* ev)
 {
-	DnnTrigger* t = 0;
-	CcuHashCellOf<DnnTrigger>* c;
+	IvlTrigger* t = 0;
+	IvlHashCellOf<IvlTrigger>* c;
 
 	void* id = (PtrExtractor) (ev);