summaryrefslogtreecommitdiffabout
path: root/lib/forlanlex.l
authorSergey Poznyakoff <gray@gnu.org.ua>2018-03-15 11:29:52 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2018-03-15 12:12:23 (GMT)
commit58a8936d30bbb18b8ad93fecfe3fe2210d1c18b2 (patch) (side-by-side diff)
tree01fcd1416af582e2429f0ae8d120e2af39b8f9d9 /lib/forlanlex.l
parent677473cdfc42b9fd83623902e80de946f108825c (diff)
downloadeclat-58a8936d30bbb18b8ad93fecfe3fe2210d1c18b2.tar.gz
eclat-58a8936d30bbb18b8ad93fecfe3fe2210d1c18b2.tar.bz2
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.
Diffstat (limited to 'lib/forlanlex.l') (more/less context) (ignore whitespace changes)
-rw-r--r--lib/forlanlex.l15
1 files changed, 9 insertions, 6 deletions
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);

Return to:

Send suggestions and report system problems to the System administrator.