Upgrade grecs

* grecs: pull
* configure.ac: Enable json
* lib/Makefile.am (AM_CPPFLAGS): Use @GRECS_INCLUDES@
(libeclat_a_SOURCES): Remove json sources.
* src/Makefile.am (AM_CPPFLAGS): Use @GRECS_INCLUDES@
* tests/Makefile.am: Likewise.

* lib/json.h: Remove.
* lib/jsongrm.y: Remove.
* lib/jsonlex.l: Remove.
* tests/tjson.c: Remove.

* src/config.c (eclat_kw): Mark statically initialized memory locations
as such.
* src/mktags.c (process_tags): Use wordsplit to process quoted arguments.

* lib/bidimap.c (bidimap_config): Fill allocated memory with 0's
* lib/filemap.c (filemap_config): Likewise.
* lib/gdbmmap.c (gdbm_map_config): Likewise.
* lib/seqmap.c (seqmap_config): Likewise.

15 files changed, 34 insertions, 603 deletions

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 711bc98..e1ed1c3 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,5 +1,5 @@
 # This file is part of Eclat 
-# Copyright (C) 2012-2015 Sergey Poznyakoff
+# Copyright (C) 2012-2018 Sergey Poznyakoff
 #
 # Eclat is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -43,10 +43,6 @@ libeclat_a_SOURCES=\
  forlangrm.y\
  forlanlex.l\
  istore.c\
- json.h\
- jsongrm.h\
- jsongrm.y\
- jsonlex.l\
  getans.c\
  getyn.c\
  hmac_sha1.c\
@@ -71,14 +67,11 @@ libeclat_a_SOURCES=\
  $(maps)
 
 AM_LDFLAGS = $(CURL_LIBS)
-AM_CPPFLAGS = -I$(top_srcdir)/grecs/src/ $(CURL_CFLAGS)
+AM_CPPFLAGS = @GRECS_INCLUDES@ $(CURL_CFLAGS)
 
 forlanlex.c: forlangrm.h
 forlangrm.c forlangrm.h: forlangrm.y
 
-jsonlex.c: jsongrm.h
-jsongrm.c jsongrm.h: jsongrm.y
-
 AM_YFLAGS=-tdv
 AM_LFLAGS=-dp
 
diff --git a/lib/bidimap.c b/lib/bidimap.c
index fc601c8..aafc736 100644
--- a/lib/bidimap.c
+++ b/lib/bidimap.c
@@ -1,5 +1,5 @@
 /* This file is part of Eclat.
-   Copyright (C) 2012-2015 Sergey Poznyakoff.
+   Copyright (C) 2012-2018 Sergey Poznyakoff.
  
    Eclat is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -100,7 +100,7 @@ bidimap_config(int dbg, struct grecs_node *node, void *data)
         struct bidimap *map, **return_map = data;
         int i;
         
-        map = grecs_malloc(sizeof(*map));
+        map = grecs_zalloc(sizeof(*map));
         for (i = 0; bidimap_kw[i].ident; i++)
                 bidimap_kw[i].varptr = map;
         if (grecs_tree_process(node->down, bidimap_kw)) {
diff --git a/lib/filemap.c b/lib/filemap.c
index 6c5e286..26582ec 100644
--- a/lib/filemap.c
+++ b/lib/filemap.c
@@ -1,5 +1,5 @@
 /* This file is part of Eclat.
-   Copyright (C) 2012-2015 Sergey Poznyakoff.
+   Copyright (C) 2012-2018 Sergey Poznyakoff.
  
    Eclat is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -60,7 +60,7 @@ filemap_config(int dbg, struct grecs_node *node, void *data)
         int i;
         struct grecs_node *p;
         
-        filemap = grecs_malloc(sizeof(*filemap));
+        filemap = grecs_zalloc(sizeof(*filemap));
         for (i = 0; filemap_kw[i].ident; i++)
                 filemap_kw[i].varptr = filemap;
         if (grecs_tree_process(node->down, filemap_kw)) {
diff --git a/lib/forlangrm.y b/lib/forlangrm.y
index ecfbf25..2db1274 100644
--- a/lib/forlangrm.y
+++ b/lib/forlangrm.y
@@ -1,6 +1,6 @@
 %{
 /* This file is part of Eclat.
-   Copyright (C) 2012-2015 Sergey Poznyakoff.
+   Copyright (C) 2012-2018 Sergey Poznyakoff.
  
    Eclat is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 
 #include "libeclat.h"
 #include <grecs.h>
-#include <grecs-locus.h>
+#include <grecs/locus.h>
 #include "forlangrm.h"
 #include "forlan.h"
 #include <string.h>
diff --git a/lib/forlanlex.l b/lib/forlanlex.l
index db893df..62265cb 100644
--- a/lib/forlanlex.l
+++ b/lib/forlanlex.l
@@ -1,6 +1,6 @@
 %{
 /* This file is part of Eclat.
-   Copyright (C) 2012-2015 Sergey Poznyakoff.
+   Copyright (C) 2012-2018 Sergey Poznyakoff.
  
    Eclat is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 #include <sysexits.h>
 #include <ctype.h>
 #include <grecs.h>
-#include <grecs-locus.h>
+#include <grecs/locus.h>
 #include "forlangrm.h"
 #include "forlan.h"
 
@@ -100,15 +100,18 @@ continue              return CONTINUE;
 \"[^\\"\n]*\\\n        { BEGIN(STR);
                          grecs_line_begin();
                          grecs_line_acc_grow_unescape_last(yytext + 1,
-                                                           yyleng - 1);
+                                                           yyleng - 1,
+                                                           &yylloc);
                          grecs_locus_point_advance_line(grecs_current_locus_point); }
 \"[^\\"\n]*\\.         { BEGIN(STR);
                          grecs_line_begin();
                          grecs_line_acc_grow_unescape_last(yytext + 1,
-                                                           yyleng - 1); }
-<STR>\"[^\\"\n]*\\\n  { grecs_line_acc_grow_unescape_last(yytext, yyleng);
+                                                           yyleng - 1,
+                                                           &yylloc); }
+<STR>\"[^\\"\n]*\\\n  { grecs_line_acc_grow_unescape_last(yytext, yyleng,
+                                                          &yylloc);
                         grecs_locus_point_advance_line(grecs_current_locus_point); }
-<STR>[^\\"\n]*\\.     { grecs_line_acc_grow_unescape_last(yytext, yyleng); }
+<STR>[^\\"\n]*\\.     { grecs_line_acc_grow_unescape_last(yytext, yyleng, &yylloc); }
 <STR>[^\\"\n]*\"      { BEGIN(INITIAL);
                         if (yyleng > 1) 
                                 grecs_line_add(yytext, yyleng - 1); 
diff --git a/lib/gdbmmap.c b/lib/gdbmmap.c
index dde6b02..a2887df 100644
--- a/lib/gdbmmap.c
+++ b/lib/gdbmmap.c
@@ -1,5 +1,5 @@
 /* This file is part of Eclat.
-   Copyright (C) 2012-2015 Sergey Poznyakoff.
+   Copyright (C) 2012-2018 Sergey Poznyakoff.
  
    Eclat is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -69,7 +69,7 @@ gdbm_map_config(int dbg, struct grecs_node *node, void *data)
         struct grecs_node *p;
         int i;
 
-        gdbm_map = grecs_malloc(sizeof(*gdbm_map));
+        gdbm_map = grecs_zalloc(sizeof(*gdbm_map));
         for (i = 0; gdbm_map_kw[i].ident; i++)
                 gdbm_map_kw[i].varptr = gdbm_map;
         if (grecs_tree_process(node->down, gdbm_map_kw)) {
diff --git a/lib/json.h b/lib/json.h
deleted file mode 100644
index 36ca243..0000000
--- a/lib/json.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* This file is part of Eclat.
-   Copyright (C) 2012-2015 Sergey Poznyakoff.
- 
-   Eclat is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
- 
-   Eclat is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
- 
-   You should have received a copy of the GNU General Public License
-   along with Eclat.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include <grecs.h>
-
-enum json_object_type
-{
-        json_null,
-        json_bool,
-        json_number,
-        json_string,
-        json_arr,
-        json_obj
-};
-
-struct json_object;
-struct json_array {
-        size_t oc;
-        struct json_object **ov;
-};