It builds again, test fails

.gitignore

@@ -51,6 +51,3 @@ Module.symvers
 Mkfile.old
 dkms.conf
 
-shortcodes.0
-tests
-.cgreen*

spec/shortcodes_spec.cr

@@ -5,11 +5,11 @@ describe "Shortcodes" do
   # TODO: Write tests
 
   it "works" do
-    parse("foo{{% bar %}}baz{{% /bar %}}qux")
+    result = parse("foo{{% bar %}}baz{{% /bar %}}qux")
-    # p! result.shortcodes
+    p! result.shortcodes
-    # result.shortcodes.size.should eq 1
+    result.shortcodes.size.should eq 1
-    # result.shortcodes[0].args.size.should eq 0
+    result.shortcodes[0].args.size.should eq 0
-    # result.shortcodes[0].name.should eq "bar"
+    result.shortcodes[0].name.should eq "bar"
   end
 end
 

src/shortcodes.cr

@@ -58,9 +58,7 @@ module Shortcodes
   end
 
   def parse(input : String)
-    p! 111
     r = LibShortcodes.parse(input.to_unsafe, input.bytesize)
-    p! 222
     result = Result.new
 
     r.shortcodes.each_with_index.map do |sc, i|
@@ -80,6 +78,6 @@ module Shortcodes
         args,
       )
     end
-    r
+    result
   end
 end

tests.c

@@ -1,226 +0,0 @@
-#include <cgreen/cgreen.h>
-#include <bglibs/str.h>
-#include "shortcodes.h"
-
-Describe(parse);
-BeforeEach(parse) {}
-AfterEach(parse) {}
-
-sc_result result;
-str s;
-
-void chunk_s(char *buffer, chunk c)
-{
-    str_copyb(&s, buffer + c.start, c.len);
-}
-
-Ensure(parse, empty_string)
-{
-    char *input = "";
-    result = parse(input);
-    // This means no shortcodes in it
-    assert_that(result.sccount, is_equal_to(0));
-    assert_that(result.errcount, is_equal_to(0));
-}
-
-Ensure(parse, simple_shortcode)
-{
-    char *input = "foobar {{% shortcode %}}blah";
-    result = parse(input);
-    // Only 1 shortcode
-    assert_that(result.sccount, is_equal_to(1));
-
-    // It's a simple one called shortcode, no args
-    chunk_s(input, result.sc[0].name);
-    assert_that(s.s, is_equal_to_string("shortcode"));
-    assert_that(result.sc[0].matching, is_equal_to(0));
-    assert_that(result.sc[0].argcount, is_equal_to(0));
-    // The whole shortcode is the whole thing
-    chunk_s(input, result.sc[0].whole);
-    assert_that(s.s, is_equal_to_string("{{% shortcode %}}"));
-    assert_that(result.errcount, is_equal_to(0));
-}
-
-Ensure(parse, mismatched_tags)
-{
-    char *input = "foobar {{% shortcode %}}blah{{% /foo %}}";
-    result = parse(input);
-    // One shortcode, one error
-    assert_that(result.sccount, is_equal_to(1));
-    assert_that(result.errcount, is_equal_to(1));
-    assert_that(result.errors[0].code, is_equal_to(ERR_MISMATCHED_CLOSING_TAG));
-    str_copyb(&s, input + result.errors[0].position, 8);
-    assert_that(s.s, is_equal_to_string("{{% /foo"));
-}
-
-Ensure(parse, mismatched_brackets)
-{
-    char *input = "foobar {{% shortcode >}}blah";
-    result = parse(input);
-    // No shortcodes, 1 error
-    assert_that(result.sccount, is_equal_to(0));
-    assert_that(result.errcount, is_equal_to(1));
-    assert_that(result.errors[0].code, is_equal_to(ERR_MISMATCHED_BRACKET));
-    str_copyb(&s, input + result.errors[0].position, 3);
-    assert_that(s.s, is_equal_to_string(">}}"));
-}
-
-Ensure(parse, mismatched_brackets_inside_data_are_ok)
-{
-    char *input = "foobar {{% sc %}} >}}blah {{% /sc %}} ";
-    result = parse(input);
-    // 1 shortcode
-    assert_that(result.sccount, is_equal_to(1));
-    chunk_s(input, result.sc[0].whole);
-    assert_that(s.s, is_equal_to_string("{{% sc %}} >}}blah {{% /sc %}}"));
-    chunk_s(input, result.sc[0].data);
-    assert_that(s.s, is_equal_to_string(" >}}blah "));
-    assert_that(result.errcount, is_equal_to(0));
-}
-
-Ensure(parse, mismatched_brackets_in_qval_are_ok)
-{
-    char *input = "foobar {{% sc  \">}}blah\" %}} {{% /sc %}}";
-    result = parse(input);
-    // 1 shortcode
-    assert_that(result.sccount, is_equal_to(1));
-    chunk_s(input, result.sc[0].whole);
-    assert_that(s.s, is_equal_to_string("{{% sc  \">}}blah\" %}} {{% /sc %}}"));
-    chunk_s(input, result.sc[0].argvals[0]);
-    assert_that(s.s, is_equal_to_string(">}}blah"));
-    assert_that(result.errcount, is_equal_to(0));
-}
-
-Ensure(parse, inner_spaces_optional)
-{
-    char *input = "foobar {{%    shortcode%}}blah";
-    result = parse(input);
-    // Only 1 shortcode
-    assert_that(result.sccount, is_equal_to(1));
-
-    // It's a simple one called shortcode, no args
-    chunk_s(input, result.sc[0].name);
-    assert_that(s.s, is_equal_to_string("shortcode"));
-    assert_that(result.sc[0].matching, is_equal_to(0));
-    assert_that(result.sc[0].argcount, is_equal_to(0));
-    // The whole shortcode is the whole thing
-    chunk_s(input, result.sc[0].whole);
-    assert_that(s.s, is_equal_to_string("{{%    shortcode%}}"));
-    assert_that(result.errcount, is_equal_to(0));
-}
-
-Ensure(parse, name_can_be_path)
-{
-    char *input = "foobar {{% shortcode/foo/bar %}}blah";
-    result = parse(input);
-    // Only 1 shortcode
-    assert_that(result.sccount, is_equal_to(1));
-
-    // It's a simple one called shortcode, no args
-    chunk_s(input, result.sc[0].name);
-    assert_that(s.s, is_equal_to_string("shortcode/foo/bar"));
-    assert_that(result.sc[0].matching, is_equal_to(0));
-    assert_that(result.sc[0].argcount, is_equal_to(0));
-    assert_that(result.errcount, is_equal_to(0));
-}
-
-Ensure(parse, multiple_shortcodes)
-{
-    char *input = "foobar {{% shortcode %}}blah {{<sc2 >}}blahblah";
-    result = parse(input);
-    // 2 shortcodes
-    assert_that(result.sccount, is_equal_to(2));
-
-    // It's a simple one called shortcode, no args
-    chunk_s(input, result.sc[0].name);
-    assert_that(s.s, is_equal_to_string("shortcode"));
-    assert_that(result.sc[0].matching, is_equal_to(0));
-    assert_that(result.sc[0].argcount, is_equal_to(0));
-    // The whole shortcode is the whole thing
-    chunk_s(input, result.sc[0].whole);
-    assert_that(s.s, is_equal_to_string("{{% shortcode %}}"));
-    // It's a simple one called sc2, no args
-    chunk_s(input, result.sc[1].name);
-    assert_that(s.s, is_equal_to_string("sc2"));
-    assert_that(result.sc[1].matching, is_equal_to(0));
-    assert_that(result.sc[1].argcount, is_equal_to(0));
-    // The whole shortcode is the whole thing
-    chunk_s(input, result.sc[1].whole);
-    assert_that(s.s, is_equal_to_string("{{<sc2 >}}"));
-    assert_that(result.errcount, is_equal_to(0));
-}
-
-Ensure(parse, matching_shortcode)
-{
-    char *input = "blah {{% shortcode %}}foo bar{{% /shortcode %}} blah";
-    result = parse(input);
-
-    // Only 1 shortcode
-    assert_that(result.sccount, is_equal_to(1));
-
-    // It's a matching one called shortcode, no args
-    chunk_s(input, result.sc[0].name);
-    assert_that(s.s, is_equal_to_string("shortcode"));
-    assert_that(result.sc[0].matching, is_equal_to(1));
-    assert_that(result.sc[0].argcount, is_equal_to(0));
-    // data is the stuff between the shortcode tags
-    chunk_s(input, result.sc[0].data);
-    assert_that(s.s, is_equal_to_string("foo bar"));
-    // The whole shortcode is the whole thing
-    chunk_s(input, result.sc[0].whole);
-    assert_that(s.s, is_equal_to_string("{{% shortcode %}}foo bar{{% /shortcode %}}"));
-    assert_that(result.errcount, is_equal_to(0));
-}
-
-Ensure(parse, shortcode_args)
-{
-    char *input = "foobar {{% shortcode foo \"bar\" 42 bat=v1 baz=\"v2\" %}}blah";
-    result = parse(input);
-    // Only 1 shortcode
-    assert_that(result.sccount, is_equal_to(1));
-
-    // The whole shortcode is the whole thing
-    chunk_s(input, result.sc[0].whole);
-    assert_that(s.s, is_equal_to_string("{{% shortcode foo \"bar\" 42 bat=v1 baz=\"v2\" %}}"));
-
-    // Name is shortcode
-    chunk_s(input, result.sc[0].name);
-    assert_that(s.s, is_equal_to_string("shortcode"));
-    assert_that(result.sc[0].matching, is_equal_to(0));
-
-    // Has 5 args
-    assert_that(result.sc[0].argcount, is_equal_to(5));
-
-    // Arg1 is foo, no name
-    assert_that(result.sc[0].argnames[0].len, is_equal_to(0));
-    chunk_s(input, result.sc[0].argvals[0]);
-    assert_that(s.s, is_equal_to_string("foo"));
-    // Arg2 is bar, no name
-    assert_that(result.sc[0].argnames[1].len, is_equal_to(0));
-    chunk_s(input, result.sc[0].argvals[1]);
-    assert_that(s.s, is_equal_to_string("bar"));
-    // Arg3 is 42, no name
-    assert_that(result.sc[0].argnames[2].len, is_equal_to(0));
-    chunk_s(input, result.sc[0].argvals[2]);
-    assert_that(s.s, is_equal_to_string("42"));
-    // Arg4 is bat=v1
-    chunk_s(input, result.sc[0].argnames[3]);
-    assert_that(s.s, is_equal_to_string("bat"));
-    chunk_s(input, result.sc[0].argvals[3]);
-    assert_that(s.s, is_equal_to_string("v1"));
-    // Arg5 is baz=v2
-    chunk_s(input, result.sc[0].argnames[4]);
-    assert_that(s.s, is_equal_to_string("baz"));
-    chunk_s(input, result.sc[0].argvals[4]);
-    assert_that(s.s, is_equal_to_string("v2"));
-    assert_that(result.errcount, is_equal_to(0));
-}
-
-// BUG?
-// Ensure(parse, escaped_shortcode)
-// {
-//     char *input = "foobar \\{{% shortcode %}}";
-//     result = parse(input);
-//     // No shortcodes
-//     assert_that(result.sc[0].name.len, is_equal_to(0));
-// }