diff options
Diffstat (limited to 'src/json-lex.l')
| -rw-r--r-- | src/json-lex.l | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/json-lex.l b/src/json-lex.l index 169cf32..1068404 100644 --- a/src/json-lex.l +++ b/src/json-lex.l @@ -22,16 +22,16 @@ You should have received a copy of the GNU General Public License along with Grecs. If not, see <http://www.gnu.org/licenses/>. */ -#include "grecs.h" +#include "argot.h" #include "json-gram.h" -#include "grecs/json.h" +#include "argot/json.h" static char const *input_ptr; static size_t input_size; -struct grecs_locus_point json_current_locus_point; /* Input location */ +struct argot_locus_point json_current_locus_point; /* Input location */ char const *json_err_diag; -struct grecs_locus json_err_locus; +struct argot_locus json_err_locus; #undef YY_INPUT #define YY_INPUT(buf,result,max_size) \ @@ -122,7 +122,7 @@ utf8_wctomb(char *u) case 1: r[0] = wc; } - grecs_line_acc_grow(r, count); + argot_line_acc_grow(r, count); return count; } @@ -148,13 +148,13 @@ yywrap() return 1; } -static struct grecs_txtacc *json_line_acc; +static struct argot_txtacc *json_line_acc; static void json_line_begin() { if (!json_line_acc) - json_line_acc = grecs_txtacc_create(); + json_line_acc = argot_txtacc_create(); } static char * @@ -162,8 +162,8 @@ json_line_finish() { if (json_line_acc) { char nil = 0; - grecs_txtacc_grow(json_line_acc, &nil, 1); - return grecs_txtacc_finish(json_line_acc, 1); + argot_txtacc_grow(json_line_acc, &nil, 1); + return argot_txtacc_finish(json_line_acc, 1); } return NULL; } @@ -171,7 +171,7 @@ json_line_finish() static void json_line_grow(char const *text, size_t len) { - grecs_txtacc_grow(json_line_acc, text, len); + argot_txtacc_grow(json_line_acc, text, len); } %} D [0-9] @@ -224,6 +224,6 @@ true { yylval.b = 1; return T_BOOL; } false { yylval.b = 0; return T_BOOL; } "{"|"}"|"["|"]"|":"|"," return yytext[0]; [ \t]* ; -\n grecs_locus_point_advance_line(json_current_locus_point); +\n argot_locus_point_advance_line(json_current_locus_point); . { jsonlex_diag("bogus character"); return T_ERR; } |