Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 8862082

Browse files
committed
Tidy up after incremental JSON parser patch
Remove junk left over from non-vpath builds. Try to remedy gettext error on some platforms.
1 parent 1b00fe3 commit 8862082

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

src/common/jsonapi.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2112,9 +2112,9 @@ json_errdetail(JsonParseErrorType error, JsonLexContext *lex)
21122112
break;
21132113
case JSON_INVALID_LEXER_TYPE:
21142114
if (lex->incremental)
2115-
return (_("Recursive descent parser cannot use incremental lexer"));
2115+
return _("Recursive descent parser cannot use incremental lexer");
21162116
else
2117-
return (_("Incremental parser requires incremental lexer"));
2117+
return _("Incremental parser requires incremental lexer");
21182118
case JSON_NESTING_TOO_DEEP:
21192119
return (_("JSON nested too deep, maximum permitted depth is 6400"));
21202120
case JSON_ESCAPING_INVALID:
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
tmp_check
2+
test_json_parser_perf
3+
test_json_parser_incremental

src/test/modules/test_json_parser/Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ include $(top_builddir)/src/Makefile.global
1717
include $(top_srcdir)/contrib/contrib-global.mk
1818
endif
1919

20+
.PHONY: clean
21+
2022
all: test_json_parser_incremental$(X) test_json_parser_perf$(X)
2123

2224
%.o: $(top_srcdir)/$(subdir)/%.c
@@ -34,3 +36,6 @@ speed-check: test_json_parser_perf$(X)
3436
time ./test_json_parser_perf 10000 $(top_srcdir)/$(subdir)/tiny.json
3537
@echo Incremental parser:
3638
time ./test_json_parser_perf -i 10000 $(top_srcdir)/$(subdir)/tiny.json
39+
40+
clean:
41+
rm -rf test_json_parser_perf test_json_parser_incremental tmp_check $(OBJS)

0 commit comments

Comments
 (0)