[vte] matcher: Remove unused trie matcher

[Christian Persch <chpe src gnome org>]

commit 66ce3c9346b74848e793bd002f93ffcc04a3d679
Author: Christian Persch <chpe gnome org>
Date:   Tue May 20 16:15:38 2014 +0200

    matcher: Remove unused trie matcher
    
    https://bugzilla.gnome.org/show_bug.cgi?id=728665

 src/Makefile.am |   38 +--
 src/debug.c     |    2 +-
 src/debug.h     |    2 +-
 src/matcher.c   |    6 +-
 src/trie.c      | 1110 -------------------------------------------------------
 src/trie.h      |   65 ----
 6 files changed, 6 insertions(+), 1217 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 220f1be..8918016 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -60,8 +60,6 @@ libvte_ VTE_API_MAJOR_VERSION@_ VTE_API_MINOR_VERSION@_la_SOURCES = \
        ring.h \
        table.c \
        table.h \
-       trie.c \
-       trie.h \
        vte.c \
        vte.h \
        vte-private.h \
@@ -305,8 +303,8 @@ TEST_SH = \
        $(NULL)
 EXTRA_DIST += $(TEST_SH)
 
-check_PROGRAMS = dumpkeys iso2022 reflect-text-view reflect-vte mev table trie xticker vteconv
-TESTS = table trie vteconv $(TEST_SH)
+check_PROGRAMS = dumpkeys iso2022 reflect-text-view reflect-vte mev table xticker vteconv
+TESTS = table vteconv $(TEST_SH)
 
 reflect_text_view_CPPFLAGS = -DUSE_TEXT_VIEW $(AM_CPPFLAGS)
 reflect_text_view_CFLAGS = $(VTE_CFLAGS) $(AM_CFLAGS)
@@ -330,8 +328,6 @@ interpret_SOURCES = \
        matcher.h \
        table.c \
        table.h \
-       trie.c \
-       trie.h \
        vteconv.c \
        vteconv.h \
        vtetree.c \
@@ -362,8 +358,6 @@ iso2022_SOURCES = \
        matcher.h \
        table.c \
        table.h \
-       trie.c \
-       trie.h \
        vteconv.c \
        vteconv.h \
        vtetree.c \
@@ -395,8 +389,6 @@ table_SOURCES = \
        matcher.h \
        table.c \
        table.h \
-       trie.c \
-       trie.h \
        vteconv.c \
        vteconv.h \
        $(NULL)
@@ -410,32 +402,6 @@ table_LDADD = \
        $(GLIB_LIBS) \
        $(GOBJECT_LIBS)
 
-trie_SOURCES = \
-       trie.c \
-       trie.h \
-       buffer.h \
-       caps.c \
-       caps.h \
-       debug.c \
-       debug.h \
-       matcher.c \
-       matcher.h \
-       table.c \
-       table.h \
-       vteconv.c \
-       vteconv.h \
-       $(NULL)
-trie_CPPFLAGS = \
-       -DTRIE_MAIN \
-       $(AM_CPPFLAGS)
-trie_CFLAGS = \
-       $(GLIB_CFLAGS) \
-       $(GOBJECT_CFLAGS) \
-       $(AM_CFLAGS)
-trie_LDADD = \
-       $(GLIB_LIBS) \
-       $(GOBJECT_LIBS)
-
 vteconv_SOURCES = buffer.h debug.c debug.h vteconv.c vteconv.h
 vteconv_CPPFLAGS = -DVTECONV_MAIN $(AM_CPPFLAGS)
 vteconv_CFLAGS = $(VTE_CFLAGS) $(AM_CFLAGS)
diff --git a/src/debug.c b/src/debug.c
index ac1c72a..257ef30 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -42,7 +42,7 @@ _vte_debug_init(void)
     { "cursor",       VTE_DEBUG_CURSOR       },
     { "keyboard",     VTE_DEBUG_KEYBOARD     },
     { "lifecycle",    VTE_DEBUG_LIFECYCLE    },
-    { "trie",         VTE_DEBUG_TRIE         },
+    { "matcher",      VTE_DEBUG_MATCHER      },
     { "work",         VTE_DEBUG_WORK         },
     { "cells",        VTE_DEBUG_CELLS        },
     { "timeout",      VTE_DEBUG_TIMEOUT      },
diff --git a/src/debug.h b/src/debug.h
index ca048bc..5eea5c1 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -50,7 +50,7 @@ typedef enum {
        VTE_DEBUG_CURSOR        = 1 << 10,
        VTE_DEBUG_KEYBOARD      = 1 << 11,
        VTE_DEBUG_LIFECYCLE     = 1 << 12,
-       VTE_DEBUG_TRIE          = 1 << 13,
+       VTE_DEBUG_MATCHER       = 1 << 13,
        VTE_DEBUG_WORK          = 1 << 14,
        VTE_DEBUG_CELLS         = 1 << 15,
        VTE_DEBUG_TIMEOUT       = 1 << 16,
diff --git a/src/matcher.c b/src/matcher.c
index e6a0af5..1bd40e4 100644
--- a/src/matcher.c
+++ b/src/matcher.c
@@ -25,7 +25,6 @@
 #include "caps.h"
 #include "matcher.h"
 #include "table.h"
-#include "trie.h"
 
 struct _vte_matcher {
        _vte_matcher_match_func match; /* shortcut to the most common op */
@@ -66,8 +65,8 @@ _vte_matcher_init(struct _vte_matcher *matcher)
                                  value, 0);
         }
 
-       _VTE_DEBUG_IF(VTE_DEBUG_TRIE) {
-               g_printerr("Trie contents:\n");
+       _VTE_DEBUG_IF(VTE_DEBUG_MATCHER) {
+               g_printerr("Matcher contents:\n");
                _vte_matcher_print(matcher);
                g_printerr("\n");
        }
@@ -81,7 +80,6 @@ _vte_matcher_create(void)
 
        _vte_debug_print(VTE_DEBUG_LIFECYCLE, "_vte_matcher_create()\n");
        ret = g_slice_new(struct _vte_matcher);
-        /* FIXMEchpe,egmont: The trie matcher is never used, we should remove it */
         ret->impl = &dummy_vte_matcher_table;
        ret->match = NULL;
        ret->free_params = NULL;