1 files changed, 126 insertions, 126 deletions

diff --git a/src/lookup.c b/src/lookup.c
index 7cb95df..8c0df3f 100644
--- a/src/lookup.c
+++ b/src/lookup.c
@@ -1,4 +1,4 @@
-/* grecs - Gray's Extensible Configuration System
+/* argot - Gray's Extensible Configuration System
    Copyright (C) 2007-2016 Sergey Poznyakoff
 
    Grecs is free software; you can redistribute it and/or modify it
@@ -20,16 +20,16 @@
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
-#include "grecs.h"
+#include "argot.h"
 #include "wordsplit.h"
 #include <fnmatch.h>
 #include <stdlib.h>
 
 static int
-_grecs_list_eq(struct grecs_value *a, struct grecs_value *b)
+_argot_list_eq(struct argot_value *a, struct argot_value *b)
 {
-        struct grecs_list_entry *aent, *bent;
-        if (grecs_list_size(a->v.list) != grecs_list_size(b->v.list))
+        struct argot_list_entry *aent, *bent;
+        if (argot_list_size(a->v.list) != argot_list_size(b->v.list))
                 return 0;
 
         for (aent = a->v.list->head, bent = b->v.list->head;;
@@ -38,7 +38,7 @@ _grecs_list_eq(struct grecs_value *a, struct grecs_value *b)
                         return bent == NULL;
                 if (!bent)
                         return 0;
-                if (!grecs_value_eq(aent->data, bent->data))
+                if (!argot_value_eq(aent->data, bent->data))
                         return 0;
         }
         /*notreached*/
@@ -46,7 +46,7 @@ _grecs_list_eq(struct grecs_value *a, struct grecs_value *b)
 }
 
 static int
-_grecs_array_eq(struct grecs_value *a, struct grecs_value *b)
+_argot_array_eq(struct argot_value *a, struct argot_value *b)
 {
         size_t i;
 
@@ -54,39 +54,39 @@ _grecs_array_eq(struct grecs_value *a, struct grecs_value *b)
                 return 0;
 
         for (i = 0; i < a->v.arg.c; i++)
-                if (!grecs_value_eq(a->v.arg.v[i], b->v.arg.v[i]))
+                if (!argot_value_eq(a->v.arg.v[i], b->v.arg.v[i]))
                         return 0;
         return 1;
 }
 
 /* Return 1 if configuration value A equals B */
 int
-grecs_value_eq(struct grecs_value *a, struct grecs_value *b)
+argot_value_eq(struct argot_value *a, struct argot_value *b)
 {
         if (a == 0 || b == 0)
                 return a == b;
         if (a->type != b->type)
                 return 0;
         switch (a->type) {
-        case GRECS_TYPE_STRING:
+        case ARGOT_TYPE_STRING:
                 if (a->v.string == NULL)
                         return b->v.string == NULL;
                 return strcmp(a->v.string, b->v.string) == 0;
       
-        case GRECS_TYPE_LIST:
-                return _grecs_list_eq(a, b);
+        case ARGOT_TYPE_LIST:
+                return _argot_list_eq(a, b);
       
-        case GRECS_TYPE_ARRAY:
-                return _grecs_array_eq(a, b);
+        case ARGOT_TYPE_ARRAY:
+                return _argot_array_eq(a, b);
     }
   return 0;
 }
 
 static int
-_grecs_list_match(struct grecs_value *pat, struct grecs_value *b, int flags)
+_argot_list_match(struct argot_value *pat, struct argot_value *b, int flags)
 {
-        struct grecs_list_entry *aent, *bent;
-        if (grecs_list_size(pat->v.list) != grecs_list_size(b->v.list))
+        struct argot_list_entry *aent, *bent;
+        if (argot_list_size(pat->v.list) != argot_list_size(b->v.list))
                 return 0;
 
         for (aent = pat->v.list->head, bent = b->v.list->head;;
@@ -95,7 +95,7 @@ _grecs_list_match(struct grecs_value *pat, struct grecs_value *b, int flags)
                         return bent == NULL;
                 if (!bent)
                         return 0;
-                if (!grecs_value_match(aent->data, bent->data, flags))
+                if (!argot_value_match(aent->data, bent->data, flags))
                         return 0;
         }
         /*notreached*/
@@ -103,7 +103,7 @@ _grecs_list_match(struct grecs_value *pat, struct grecs_value *b, int flags)
 }
 
 static int
-_grecs_array_match(struct grecs_value *pat, struct grecs_value *b, int flags)
+_argot_array_match(struct argot_value *pat, struct argot_value *b, int flags)
 {
         size_t i;
 
@@ -111,61 +111,61 @@ _grecs_array_match(struct grecs_value *pat, struct grecs_value *b, int flags)
                 return 0;
 
         for (i = 0; i < pat->v.arg.c; i++)
-                if (!grecs_value_match(pat->v.arg.v[i], b->v.arg.v[i], flags))
+                if (!argot_value_match(pat->v.arg.v[i], b->v.arg.v[i], flags))
                         return 0;
         return 1;
 }
 
 int
-grecs_value_match(struct grecs_value *pat, struct grecs_value *b, int flags)
+argot_value_match(struct argot_value *pat, struct argot_value *b, int flags)
 {
         if (pat == 0 || b == 0)
                 return pat == b;
         if (pat->type != b->type) {
-                if (pat->type != GRECS_TYPE_STRING)
+                if (pat->type != ARGOT_TYPE_STRING)
                         return 0;
                 switch (b->type) {
-                case GRECS_TYPE_LIST:
-                        b = grecs_list_index(b->v.list, 0);
+                case ARGOT_TYPE_LIST:
+                        b = argot_list_index(b->v.list, 0);
                         break;
 
-                case GRECS_TYPE_ARRAY:
+                case ARGOT_TYPE_ARRAY:
                         b = b->v.arg.v[0];
                 }
         }
         
         switch (pat->type) {
-        case GRECS_TYPE_STRING:
+        case ARGOT_TYPE_STRING:
                 if (pat->v.string == NULL)
                         return b->v.string == NULL;
                 return fnmatch(pat->v.string, b->v.string, flags) == 0;
       
-        case GRECS_TYPE_LIST:
-                return _grecs_list_match(pat, b, flags);
+        case ARGOT_TYPE_LIST:
+                return _argot_list_match(pat, b, flags);
       
-        case GRECS_TYPE_ARRAY:
-                return _grecs_array_match(pat, b, flags);
+        case ARGOT_TYPE_ARRAY:
+                return _argot_array_match(pat, b, flags);
     }
   return 0;
 }
 
 
-struct grecs_match_buf {
+struct argot_match_buf {
         int argc;                      /* number of path components */
         char **argv;                   /* array of path components */
         int argi;                      /* Index of the current component */
-        struct grecs_value **labelv;   /* Component labels */
-        struct grecs_node *root;       /* Root node */
-        struct grecs_node *node;       /* Last found node */ 
+        struct argot_value **labelv;   /* Component labels */
+        struct argot_node *root;       /* Root node */
+        struct argot_node *node;       /* Last found node */ 
 };
 
 #define ISWC(c,w) ((c)[0] == (w) && (c)[1] == 0)
 
-grecs_match_buf_t
-grecs_match_buf_create(int argc, char **argv, struct grecs_value **labelv)
+argot_match_buf_t
+argot_match_buf_create(int argc, char **argv, struct argot_value **labelv)
 {
         int i;
-        struct grecs_match_buf *buf = grecs_zalloc(sizeof(*buf));
+        struct argot_match_buf *buf = argot_zalloc(sizeof(*buf));