ralsina/shortcode
1
0
Fork 0
Code Pull Requests Activity

return errors from parse() #1

Merged
ralsina merged 12 commits from return-errors into main 2023-07-14 01:05:13 +00:00
Conversation 0 Commits 12 Files Changed 6 +24 -20
4 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 47ee73edbe - Show all commits

17
Makefile
View File

@ -1,14 +1,17 @@
CC=gcc CC=gcc
all: tests all: tests
shortcodes.c: shortcodes.rl shortcodes.c: shortcodes.rl
ragel -G2 shortcodes.rl -o shortcodes.c ragel -G2 -L shortcodes.rl -o shortcodes.c
%.o: %.c %.o: %.c
$(CC) -fPIC -c -o $@ $^ $(CC) -fPIC -c -o $@ $^ -g
tests.so: shortcodes.o tests.o tests.so: shortcodes.o tests.o
$(CC) -shared -o $@ $^ -lbg -lcgreen $(CC) -shared -g -o $@ $^ -lbg -lcgreen
test: tests.so test-binary: shortcodes.c tests.c
cgreen-runner $^ $(CC) -g -o tests shortcodes.c tests.c -DMAIN=1 -lbg -lcgreen
clean: clean:
rm -f shortcodes.c *.o *.so rm -f shortcodes.c *.o *.so
test: tests.so
.PHONY: test cgreen-runner $^
debug:
cgreen-debug tests.so
.PHONY: test debug

3
shortcodes.h
View File

@ -46,8 +46,9 @@ Example:
{{% foo %}} {{% /bar %}} {{% foo %}} {{% /bar %}}
*/ */
#define ERR_MISMATCHED_CLOSING_TAG 1 #define ERR_MISMATCHED_CLOSING_TAG 1;
sc_result parse(char *); sc_result parse(char *);
#endif #endif

5
shortcodes.rl
View File

@ -120,14 +120,11 @@ sc_result parse(char *input) {
shortcode *sc_list = result.sc; shortcode *sc_list = result.sc;
int c_sc = 0; int c_sc = 0;
int sc_start = 0;
int sc_end = 0;
char *mark = p; char *mark = p;
char *data_mark = p; char *data_mark = p;
%% write init; %% write init;
%% write exec; %% write exec;
return sc_result; return result;
} }

19
tests.c
View File

@ -9,7 +9,7 @@ AfterEach(parse) {}
sc_result result; sc_result result;
str s; str s;
chunk_s(char *buffer, chunk c) void chunk_s(char *buffer, chunk c)
{ {
str_copyb(&s, buffer + c.start, c.len); str_copyb(&s, buffer + c.start, c.len);
} }
@ -191,14 +191,16 @@ Ensure(parse, shortcode_args)
assert_that(s.s, is_equal_to_string("v2")); assert_that(s.s, is_equal_to_string("v2"));
} }
Ensure(parse, escaped_shortcode) // BUG?
{ // Ensure(parse, escaped_shortcode)
char *input = "foobar \\{{% shortcode %}}"; // {
result = parse(input); // char *input = "foobar \\{{% shortcode %}}";
// No shortcodes // result = parse(input);
assert_that(result.sc[0].name.len, is_equal_to(0)); // // No shortcodes
} // assert_that(result.sc[0].name.len, is_equal_to(0));
// }
#ifdef MAIN
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
str_init(&s); str_init(&s);
@ -218,3 +220,4 @@ int main(int argc, char **argv)
// add_test_with_context(suite, parse, escaped_shortcode); // add_test_with_context(suite, parse, escaped_shortcode);
return run_test_suite(suite, create_text_reporter()); return run_test_suite(suite, create_text_reporter());
} }
#endif