Integration into IvyLeague

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

1 files changed, 15 insertions, 17 deletions

diff --git a/dnn/test.cc b/dnn/test.cc
index 2697f1f..521fa0b 100644
--- a/dnn/test.cc
+++ b/dnn/test.cc
@@ -1,32 +1,31 @@
-#include "ccu.h"
+#include "ivl.h"
 #include "dnn.h"
 #include <stdio.h>
 #include "Loop.h"
 #include "Disposable.h"
 
-
 #if 0
 #if 0
 class A {
 public:
-	void	foo (DnnEvent&);
+	void	foo (IvlEvent&);
 };
 
 main ()
 {
 	A a;
-	DnnReactionOf <A> r (a, &A::foo);
+	IvlReactionOf <A> r (a, &A::foo);
 }
 
 #else
 
-DnnEventFeature evf [] = {{"X", sizeof (int)}, {"Y", sizeof (int)}};
-DnnEventType click ("click", 2, evf);
+IvlEventFeature evf [] = {{"X", sizeof (int)}, {"Y", sizeof (int)}};
+IvlEventType click ("click", 2, evf);
 
-class DnnClickEvent : public DnnEvent {
+class IvlClickEvent : public IvlEvent {
 public:
 	int X, Y;
-    inline	DnnClickEvent (int x, int y) : DnnEvent (&click, false), X (x), Y (y)	{}
+    inline	IvlClickEvent (int x, int y) : IvlEvent (&click, false), X (x), Y (y)	{}
     inline	void	SetX (int x) { X = x; }       
     inline	void	SetY (int y) { Y = y; }       
     inline int	GetX () const { return X; }
@@ -35,7 +34,7 @@ public:
 
 main ()
 {
-	DnnEvent ev (&click);
+	IvlEvent ev (&click);
 	int x = 3, y = 5;
 	ev.SetFeature (0, &x);
 	ev.SetFeature (1, &y);
@@ -43,7 +42,7 @@ main ()
 	ev.GetFeature (0, &x2);
 	ev.GetFeature (1, &y2);
 	printf ("(%d, %d)\n", x2, y2);
-	DnnClickEvent ev2 (3, 5);
+	IvlClickEvent ev2 (3, 5);
 	int x22, y22;
 	ev.GetFeature (0, &x22);
 	ev.GetFeature (1, &y22);
@@ -54,7 +53,7 @@ main ()
 #endif
 #else
 
-class A : public DnnDisposable {
+class A : public IvlDisposable {
 public:
 	A () { printf ("A::A\n"); }
 	~A () { printf ("A::~A\n"); }
@@ -69,19 +68,18 @@ foo ()
 	printf ("%d\n", i);
 	if (i >= 5) {
 		a->Trash ();
-		DnnStop ();
+		IvlStop ();
 	}
 	i++;
 }
 
-
 main ()
 {
-	DnnOpen ();
+	IvlOpen ();
 	a = new A;
-	DnnMpx->AddHook (foo);
-	DnnLoop ();
-	DnnClose ();
+	IvlMpx->AddHook (foo);
+	IvlLoop ();
+	IvlClose ();
 }
 
 #endif