Remove the unused ir/adt/iterator.[ch].

diff --git a/ir/Makefile.am b/ir/Makefile.am
index 3ba0801..0d0bac1 100644 (file)
--- a/ir/Makefile.am
+++ b/ir/Makefile.am
@@ -261,7 +261,6 @@ EXTRA_DIST = \
        adt/bitset.h \
        adt/compiler.h \
        adt/fourcc.h \
-       adt/iterator.h \
        adt/raw_bitset.h \
        adt/util.h \
        ana/absgraph.h \

diff --git a/ir/adt/iterator.c b/ir/adt/iterator.c
deleted file mode 100644 (file)
index bd31240..0000000
--- a/ir/adt/iterator.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
- *
- * This file is part of libFirm.
- *
- * This file may be distributed and/or modified under the terms of the
- * GNU General Public License version 2 as published by the Free Software
- * Foundation and appearing in the file LICENSE.GPL included in the
- * packaging of this file.
- *
- * Licensees holding valid libFirm Professional Edition licenses may use
- * this file in accordance with the libFirm Commercial License.
- * Agreement provided with the Software.
- *
- * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE.
- */
-
-/**
- * @file
- * @brief   iterators
- * @author  Sebastian Hack
- */
-#include "config.h"
-
-#include <string.h>
-
-#include "pset.h"
-#include "list.h"
-#include "iterator.h"
-
-
-static void *it_pset_start(void *collection)
-{
-       return pset_first((pset*) collection);
-}
-
-static void *it_pset_next(void *collection, void *curr)
-{
-       (void) curr;
-       return pset_next((pset*) collection);
-}
-
-static void it_pset_finish(void *collection, void *curr)
-{
-       (void) collection;
-       (void) curr;
-}
-
-static const iterator_t iterator_pset = {
-       ITERATOR_MAGIC,
-       it_pset_start,
-       it_pset_next,
-       it_pset_finish
-};
-
-const iterator_t *pset_iterator = &iterator_pset;
-
-
-static void *it_list_next(void *coll, void *it)
-{
-       struct list_head *head = (list_head*) coll;
-       struct list_head *curr = (list_head*) it;
-       return curr->next != head ? curr->next : NULL;
-}
-
-static void *it_list_start(void *coll)
-{
-       return it_list_next(coll, coll);
-}
-
-static void it_list_finish(void *coll, void *curr)
-{
-       (void) coll;
-       (void) curr;
-}
-
-static const iterator_t iterator_list = {
-       ITERATOR_MAGIC,
-       it_list_start,
-       it_list_next,
-       it_list_finish
-};
-
-const iterator_t *list_iterator = &iterator_list;

diff --git a/ir/adt/iterator.h b/ir/adt/iterator.h
deleted file mode 100644 (file)
index a12ddb3..0000000
--- a/ir/adt/iterator.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
- *
- * This file is part of libFirm.
- *
- * This file may be distributed and/or modified under the terms of the
- * GNU General Public License version 2 as published by the Free Software
- * Foundation and appearing in the file LICENSE.GPL included in the
- * packaging of this file.
- *
- * Licensees holding valid libFirm Professional Edition licenses may use
- * this file in accordance with the libFirm Commercial License.
- * Agreement provided with the Software.
- *
- * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE.
- */
-
-/**
- * @file
- * @brief   Iterators for the several collection types used in firm.
- *          Useful for formatted and unified dumping of collections of objects.
- * @author  Sebastian Hack
- * @date    29.11.2004
- */
-#ifndef FIRM_ADT_ITERATOR_H
-#define FIRM_ADT_ITERATOR_H
-
-#include "fourcc.h"
-
-#include "../begin.h"
-
-/**
- * The iterator magic word.
- */
-#define ITERATOR_MAGIC FOURCC('I', 'T', 'E', 'R')
-
-/**
- * Check, if some memory object appears to be an iterator.
- * @param ptr Some memory.
- * @return 1, if that memory area appears to be an iterator, 0 if not.
- */
-#define is_iterator(ptr) (((const iterator_t *) (ptr))->magic == ITERATOR_MAGIC)
-
-typedef struct iterator_t {
-       unsigned magic;
-       void *(*start)(void *collection);
-       void *(*next)(void *collection, void *curr);
-       void (*finish)(void *collection, void *curr);
-} iterator_t;
-
-/**
- * An iterator implementation for linked lists.
- */
-extern const iterator_t *list_iterator;
-
-/**
- * An iterator implementation for psets.
- */
-extern const iterator_t *pset_iterator;
-
-#include "../end.h"
-
-#endif

diff --git a/ir/be/bechordal.c b/ir/be/bechordal.c
index 969de37..efa7c2a 100644 (file)
--- a/ir/be/bechordal.c
+++ b/ir/be/bechordal.c
@@ -32,7 +32,6 @@
 #include "list.h"
 #include "bitset.h"
 #include "raw_bitset.h"
-#include "iterator.h"
 #include "bipartite.h"
 #include "hungarian.h"
 

diff --git a/ir/be/bechordal_main.c b/ir/be/bechordal_main.c
index d7cfa28..cacb161 100644 (file)
--- a/ir/be/bechordal_main.c
+++ b/ir/be/bechordal_main.c
@@ -32,7 +32,6 @@
 #include "pset.h"
 #include "list.h"
 #include "bitset.h"
-#include "iterator.h"
 
 #include "lc_opts.h"
 #include "lc_opts_enum.h"

diff --git a/ir/be/belistsched.c b/ir/be/belistsched.c
index 6839410..20f8fbc 100644 (file)
--- a/ir/be/belistsched.c
+++ b/ir/be/belistsched.c
@@ -36,7 +36,6 @@
 
 #include "obst.h"
 #include "list.h"
-#include "iterator.h"
 
 #include "iredges_t.h"
 #include "irgwalk.h"

diff --git a/ir/ir/irprintf.c b/ir/ir/irprintf.c
index a3b1291..860caac 100644 (file)
--- a/ir/ir/irprintf.c
+++ b/ir/ir/irprintf.c
@@ -42,7 +42,6 @@
 #include "irprintf.h"
 #include "obst.h"
 #include "pset.h"
-#include "iterator.h"
 #include "bitset.h"
 #include "dbginfo_t.h"
 #include "irargs_t.h"

diff --git a/vc2005/libfirm.vcproj b/vc2005/libfirm.vcproj
index 734ad0e..c389a78 100644 (file)
--- a/vc2005/libfirm.vcproj
+++ b/vc2005/libfirm.vcproj
@@ -7487,10 +7487,6 @@
                                        RelativePath="..\include\libfirm\adt\impl.h"
                                        >
                                </File>
-                               <File
-                                       RelativePath="..\include\libfirm\adt\iterator.h"
-                                       >
-                               </File>
                                <File
                                        RelativePath="..\include\libfirm\adt\list.h"
                                        >

diff --git a/win32/header.list b/win32/header.list
index 42a0ddb..436dd0a 100644 (file)
--- a/win32/header.list
+++ b/win32/header.list
@@ -10,7 +10,6 @@ ir\adt\eset.h         adt
 ir\adt\hashptr.h       adt\r
 ir\adt\array.h         adt\r
 ir\adt\pdeq.h          adt\r
-ir\adt\iterator.h      adt\r
 ir\adt\align.h         adt\r
 ir\adt\fourcc.h                adt\r
 ir\adt\util.h          adt\r

diff --git a/win32/libfirm.dsp b/win32/libfirm.dsp
index 29efee1..11c2039 100644 (file)
--- a/win32/libfirm.dsp
+++ b/win32/libfirm.dsp
@@ -2559,10 +2559,6 @@ SOURCE=..\include\libfirm\adt\impl.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\libfirm\adt\iterator.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\libfirm\adt\list.h
 # End Source File
 # Begin Source File

diff --git a/win32/vc2010/firm.vcxproj b/win32/vc2010/firm.vcxproj
index ca8a0ce..fc4e97a 100644 (file)
--- a/win32/vc2010/firm.vcxproj
+++ b/win32/vc2010/firm.vcxproj
@@ -537,7 +537,6 @@
     <ClInclude Include="$(FirmRoot)\include\libfirm\adt\hashptr.h"/>
     <ClInclude Include="$(FirmRoot)\include\libfirm\adt\hungarian.h"/>
     <ClInclude Include="$(FirmRoot)\include\libfirm\adt\hashset.h"/>
-    <ClInclude Include="$(FirmRoot)\include\libfirm\adt\iterator.h"/>
     <ClInclude Include="$(FirmRoot)\include\libfirm\adt\list.h"/>
     <ClInclude Include="$(FirmRoot)\include\libfirm\adt\obstack.h"/>
     <ClInclude Include="$(FirmRoot)\include\libfirm\adt\pdeq.h"/>

diff --git a/win32/vc2010/firm.vcxproj.filters b/win32/vc2010/firm.vcxproj.filters
index 427b175..598d8c2 100644 (file)
--- a/win32/vc2010/firm.vcxproj.filters
+++ b/win32/vc2010/firm.vcxproj.filters
@@ -1380,9 +1380,6 @@
     <ClInclude Include="$(FirmRoot)\include\libfirm\adt\hungarian.h">
       <Filter>include\libfirm\adt</Filter>
     </ClInclude>
-    <ClInclude Include="$(FirmRoot)\include\libfirm\adt\iterator.h">
-      <Filter>include\libfirm\adt</Filter>
-    </ClInclude>
     <ClInclude Include="$(FirmRoot)\include\libfirm\adt\list.h">
       <Filter>include\libfirm\adt</Filter>
     </ClInclude>
@@ -3198,9 +3195,6 @@
     <ClInclude Include="$(FirmRoot)\include\libfirm\adt\hashset.h">
       <Filter>include\libfirm\adt</Filter>
     </ClInclude>
-    <ClInclude Include="$(FirmRoot)\include\libfirm\adt\iterator.h">
-      <Filter>include\libfirm\adt</Filter>
-    </ClInclude>
     <ClInclude Include="$(FirmRoot)\include\libfirm\adt\list.h">
       <Filter>include\libfirm\adt</Filter>
     </ClInclude>
@@ -4890,9 +4884,6 @@
     <ClInclude Include="$(FirmRoot)\include\libfirm\adt\hashset.h">
       <Filter>include\libfirm\adt</Filter>
     </ClInclude>
-    <ClInclude Include="$(FirmRoot)\include\libfirm\adt\iterator.h">
-      <Filter>include\libfirm\adt</Filter>
-    </ClInclude>
     <ClInclude Include="$(FirmRoot)\include\libfirm\adt\list.h">
       <Filter>include\libfirm\adt</Filter>
     </ClInclude>
@@ -6573,9 +6564,6 @@
     <ClInclude Include="$(FirmRoot)\include\libfirm\adt\hashset.h">
       <Filter>include\libfirm\adt</Filter>
     </ClInclude>
-    <ClInclude Include="$(FirmRoot)\include\libfirm\adt\iterator.h">
-      <Filter>include\libfirm\adt</Filter>
-    </ClInclude>
     <ClInclude Include="$(FirmRoot)\include\libfirm\adt\list.h">
       <Filter>include\libfirm\adt</Filter>
     </ClInclude>