dtext_rb 1.0.9 → 1.0.10

data/ext/dtext/dtext.rl

@@ -34,6 +34,7 @@ typedef struct StateMachine {
   int list_nest;
   int d;
   int b;
+  int quote;
 } StateMachine;
 
 static const size_t MAX_STACK_DEPTH = 512;
@@ -318,7 +319,10 @@ inline := |*
     append(sm, true, "<a href=\"");
     append_segment_html_escaped(sm, sm->b1, sm->b2 - sm->d);
     append(sm, true, "\">");
-    append_segment_html_escaped(sm, sm->a1, sm->a2 - 1);
+    link_content_sm = parse_helper(sm->a1, sm->a2 - sm->a1, false, true);
+    append(sm, true, link_content_sm->output->str);
+    free_machine(link_content_sm);
+    link_content_sm = NULL;
     append(sm, true, "</a>");
 
     if (sm->b) {
@@ -1072,7 +1076,7 @@ static inline void append_segment_html_escaped(StateMachine * sm, const char * a
 
 static inline void append_block(StateMachine * sm, const char * s) {
   if (sm->f_inline) {
-    sm->output = g_string_append_c(sm->output, ' ');
+    // sm->output = g_string_append_c(sm->output, ' ');
   } else if (sm->f_strip) {
     // do nothing
   } else {
@@ -1244,18 +1248,18 @@ static bool print_machine(StateMachine * sm) {
   return true;
 }
 
-static void init_machine(StateMachine * sm, VALUE input) {
+static void init_machine(StateMachine * sm, const char * src, size_t len) {
   size_t output_length = 0;
-  sm->p = RSTRING_PTR(input);
+  sm->p = src;
   sm->pb = sm->p;
-  sm->pe = sm->p + RSTRING_LEN(input);
+  sm->pe = sm->p + len;
   sm->eof = sm->pe;
   sm->ts = NULL;
   sm->te = NULL;
   sm->cs = 0;
   sm->act = 0;
   sm->top = 0;
-  output_length = RSTRING_LEN(input);
+  output_length = len;
   if (output_length < (INT16_MAX / 2)) {
     output_length *= 2;
   }
@@ -1273,6 +1277,7 @@ static void init_machine(StateMachine * sm, VALUE input) {
   sm->header_mode = false;
   sm->d = 0;
   sm->b = 0;
+  sm->quote = 0;
 }
 
 static void free_machine(StateMachine * sm) {
@@ -1282,6 +1287,23 @@ static void free_machine(StateMachine * sm) {
   g_free(sm);
 }
 
+static StateMachine * parse_helper(const char * src, size_t len, bool f_strip, bool f_inline) {
+  StateMachine * sm = NULL;
+  StateMachine * link_content_sm = NULL;
+
+  sm = (StateMachine *)g_malloc0(sizeof(StateMachine));
+  init_machine(sm, src, len);
+  sm->f_strip = f_strip;
+  sm->f_inline = f_inline;
+
+  %% write init;
+  %% write exec;
+
+  dstack_close(sm);
+
+  return sm;
+}
+
 static VALUE parse(int argc, VALUE * argv, VALUE self) {
   VALUE input;
   VALUE input0;
@@ -1291,6 +1313,8 @@ static VALUE parse(int argc, VALUE * argv, VALUE self) {
   VALUE ret;
   rb_encoding * encoding = NULL;
   StateMachine * sm = NULL;
+  bool f_strip = false;
+  bool f_inline = false;
 
   g_debug("start\n");
 
@@ -1305,31 +1329,25 @@ static VALUE parse(int argc, VALUE * argv, VALUE self) {
   }
 
   input0 = rb_str_dup(input);
-  
-  sm = (StateMachine *)g_malloc0(sizeof(StateMachine));
   input0 = rb_str_cat(input0, "\0", 1);
-  init_machine(sm, input0);
-
+  
   if (argc > 1) {
     options = argv[1];
 
     if (!NIL_P(options)) {
       opt_strip  = rb_hash_aref(options, ID2SYM(rb_intern("strip")));
       if (RTEST(opt_strip)) {
-        sm->f_strip = true;
+        f_strip = true;
       }
 
       opt_inline = rb_hash_aref(options, ID2SYM(rb_intern("inline")));
       if (RTEST(opt_inline)) {
-        sm->f_inline = true;
+        f_inline = true;
       }
     }
   }
 
-  %% write init;
-  %% write exec;
-
-  dstack_close(sm);
+  sm = parse_helper(RSTRING_PTR(input0), RSTRING_LEN(input0), f_strip, f_inline);
 
   encoding = rb_enc_find("utf-8");
   ret = rb_enc_str_new(sm->output->str, sm->output->len, encoding);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtext_rb
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - r888888888
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2016-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest