[template-glib] lexer: fix overzealous circular checks

[Christian Hergert <chergert src gnome org>]

commit 6be148099c21debebc8c9e80639cba36d07412b6
Author: Christian Hergert <chergert redhat com>
Date:   Tue Oct 24 05:27:14 2017 -0700

    lexer: fix overzealous circular checks
    
    If we include the same file multiple times, we could hit this
    when we should be fine to recursively include.

 src/tmpl-lexer.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/src/tmpl-lexer.c b/src/tmpl-lexer.c
index fbf7d66..edfeea5 100644
--- a/src/tmpl-lexer.c
+++ b/src/tmpl-lexer.c
@@ -122,6 +122,9 @@ tmpl_lexer_next (TmplLexer     *self,
            */
           if (local_error == NULL)
             {
+              const gchar *path = g_object_get_data (G_OBJECT (stream), "PATH");
+              if (path != NULL && self->circular != NULL)
+                g_hash_table_remove (self->circular, path);
               g_queue_pop_head (self->stream_stack);
               g_object_unref (stream);
               continue;
@@ -161,6 +164,7 @@ tmpl_lexer_next (TmplLexer     *self,
           g_hash_table_insert (self->circular, g_strdup (path), NULL);
 
           stream = tmpl_token_input_stream_new (input);
+          g_object_set_data_full (G_OBJECT (stream), "PATH", g_strdup (path), g_free);
           g_queue_push_head (self->stream_stack, stream);
 
           g_clear_pointer (token, tmpl_token_free);