Cleaned up example05

Grzegorz Jabłoński
1 parent b2f035d8
Showing 26 changed files with 45 additions and 49 deletions
examples05/01-template/bubblesort
examples05/01-template/bubblesort.o
examples05/01-template/makefile
examples05/01-template/minimum
examples05/01-template/minimum.cpp
examples05/01-template/minimum.o
examples05/01-template/swap1
examples05/01-template/swap1.o
examples05/01-template/swap2
examples05/01-template/swap2.o
examples05/02-vectortmpl/makefile
examples05/02-vectortmpl/vector.h
examples05/03-assoctabl/assoctab.cpp
examples05/03-assoctabl/assoctab.o
examples05/03-assoctabl/makefile
examples05/03-assoctabl/testassoc
examples05/03-assoctabl/testassoc.o
examples05/04-assoctabl2/assoctab.cpp
examples05/04-assoctabl2/assoctab.o
examples05/04-assoctabl2/makefile
@@ -22,7 +22,7 @@ bubblesort: bubblesort.o
 	g++ -g -Wall -pedantic $^ -o $@
  
 bubblesort.o: bubblesort.cpp
-	g++ -g -c -Wall -pedantic $< -o $@
+	g++ -g -c -Wall $< -o $@
  
  
 .PHONY: clean
@@ -10,8 +10,6 @@ template &lt; class T &gt; T minimum (T x, T y)
     return y;
 }
  
-#define min(A,B) (((A)<(B))?(A):(B))
-
 int
 main ()
 {
@@ -19,8 +17,4 @@ main ()
   string a = "hello", b = "goodbye";
   cout << "minimum for ints " << minimum (x, y) << endl;
   cout << "minimum for strings " << minimum (a, b) << endl;
-
-  cout << "minimum for ints " << min(x, y) << endl;
-  cout << "minimum for strings " << min(a, b) << endl;
-
 }
 all: testvector opnew
  
 testvector: testvector.o
-	g++ -g -Wall -pedantic $^ -o $@
+	g++ -g -Wall $^ -o $@
  
 testvector.o: testvector.cpp vector.h
 	g++ -g -c -Wall -pedantic $< -o $@
  
 opnew: opnew.o
-	g++ -g -Wall -pedantic $^ -o $@
+	g++ -g -Wall $^ -o $@
  
 opnew.o: opnew.cpp
 	g++ -g -c -Wall -pedantic $< -o $@
@@ -3,54 +3,55 @@
  
 template<class C> class vector
 {
-  C *dane;
+  C *data;
   unsigned int size;
 public:
   class index_out_of_range{};
   explicit vector (int s)
   {
-    dane = new C[s]();
+    data = new C[s]();
     size = s;
   }
+  
    ~vector ()
   {
-    delete [] dane;
+    delete [] data;
   }
   C& operator[] (unsigned int pos)
   {
     if (pos >= size)
       throw index_out_of_range();
-    return dane[pos];
+    return data[pos];
   }
   C operator[] (unsigned int pos) const
   {
     if (pos >= size)
       throw index_out_of_range();
-    return dane[pos];
+    return data[pos];
   }
  
   vector (const vector<C> & s)
   {
-    dane = new C[s.size];
+    data = new C[s.size];
     size = s.size;
     try {
     for (unsigned i = 0; i < size; i++)
-      dane[i] = s.dane[i];
+      data[i] = s.data[i];
     }
     catch(...)
     {
-      delete [] dane;
+      delete [] data;
       throw;
     }
   }
  
   void swap(vector<C>& s)
   {
-    C* t1=s.dane;
+    C* t1=s.data;
     unsigned int t2=s.size;
-    s.dane=dane;
+    s.data=data;
     s.size=size;
-    dane=t1;
+    data=t1;
     size=t2;
   }
  
@@ -26,9 +26,9 @@ assocTab::~assocTab ()
 void
 assocTab::insert (const char *key, int value)
 {
-  node *nowy = new node (key);
-  nowy->next = head;
-  head = nowy;
+  node *newnode = new node (key);
+  newnode->next = head;
+  head = newnode;
   head->val = value;
 }
  
 testassoc: testassoc.o assoctab.o
-	g++ -g -Wall -pedantic $^ -o $@
+	g++ -g -Wall $^ -o $@
  
 assoctab.o: assoctab.cpp assoctab.h
 	g++ -g -c -Wall -pedantic $< -o $@
@@ -26,9 +26,9 @@ assocTab::~assocTab ()
 void
 assocTab::insert (const char *key, int value)
 {
-  node *nowy = new node (key);
-  nowy->next = head;
-  head = nowy;
+  node *newnode = new node (key);
+  newnode->next = head;
+  head = newnode;
   head->val = value;
 }
  
 testassoc: testassoc.o assoctab.o
-	g++ -g -Wall -pedantic $^ -o $@
+	g++ -g -Wall $^ -o $@
  
 assoctab.o: assoctab.cpp assoctab.h vector.h
 	g++ -g -c -Wall -pedantic $< -o $@
@@ -3,64 +3,65 @@
  
 template<class C> class vector
 {
-  C *dane;
+  C *data;
   unsigned int size;
 public:
   class index_out_of_range{};
   explicit vector (int s)
   {
-    dane = new C[s];
+    data = new C[s];
       size = s;
-   try
-   {
+    try 
+    {
     for (unsigned i = 0; i < size; i++)
-        dane[i] = C(); //redundant except POD types
-   }
-   catch (...)
-   {
-     delete [] dane;
-     throw;
-   }
+        data[i] = C(); //redundant except POD types
+    }
+    catch (...)
+    {
+      delete [] data;
+      throw;
+    }
   }
+  
    ~vector ()
   {
-    delete [] dane;
+    delete [] data;
   }
   C& operator[] (unsigned int pos)
   {
     if (pos >= size)
       throw index_out_of_range();
-    return dane[pos];
+    return data[pos];
   }
   C operator[] (unsigned int pos) const
   {
     if (pos >= size)
       throw index_out_of_range();
-    return dane[pos];
+    return data[pos];
   }
  
   vector (const vector<C> & s)
   {
-    dane = new C[s.size];
+    data = new C[s.size];
     size = s.size;
     try {
     for (unsigned i = 0; i < size; i++)
-      dane[i] = s.dane[i];
+      data[i] = s.data[i];
     }
     catch(...)
     {
-      delete [] dane;
+      delete [] data;
       throw;
     }
   }
  
   void swap(vector<C>& s)
   {
-    C* t1=s.dane;
+    C* t1=s.data;
     unsigned int t2=s.size;
-    s.dane=dane;
+    s.data=data;
     s.size=size;
-    dane=t1;
+    data=t1;
     size=t2;
   }
  
 static: static.o
-	g++ -g -Wall -pedantic $^ -o $@
+	g++ -g -Wall $^ -o $@
  
 static.o: static.cpp
 	g++ -g -c -Wall -pedantic $< -o $@