Changeset 247

Timestamp:

02/27/2008 11:27:58 (9 months ago)

Author:

jgarber

Message:

Scan for link aliases and insert the href where the aliases are used.

Location:

branches/superredcloth/ext/superredcloth_scan

Files:

• superredcloth.h (modified) (3 diffs)
• superredcloth_common.rl (modified) (1 diff)
• superredcloth_inline.rl (modified) (6 diffs)
• superredcloth_scan.rl (modified) (6 diffs)

branches/superredcloth/ext/superredcloth_scan/superredcloth.h

@@ -10 +10 @@
 void rb_str_cat_escaped(VALUE str, char *ts, char *te);
 void rb_str_cat_escaped_for_preformatted(VALUE str, char *ts, char *te);
-VALUE superredcloth_inline(VALUE, char *, char *);
-VALUE superredcloth_inline2(VALUE, VALUE);
-VALUE superredcloth_transform(VALUE, char *, char *);
+VALUE superredcloth_inline(VALUE, char *, char *, VALUE);
+VALUE superredcloth_inline2(VALUE, VALUE, VALUE);
+VALUE superredcloth_transform(VALUE, char *, char *, VALUE);
 VALUE superredcloth_transform2(VALUE, VALUE);
 void red_inc(VALUE, VALUE);
-VALUE red_block(VALUE, VALUE, ID);
-VALUE red_pass2(VALUE, VALUE, VALUE, VALUE);
-VALUE red_pass(VALUE, VALUE, VALUE, ID);
+VALUE red_block(VALUE, VALUE, ID, VALUE);
+VALUE red_blockcode(VALUE, VALUE, VALUE);
+VALUE red_pass2(VALUE, VALUE, VALUE, VALUE, VALUE);
+VALUE red_pass(VALUE, VALUE, VALUE, ID, VALUE);
 VALUE red_pass_code(VALUE, VALUE, VALUE, ID);
 
@@ -25 +26 @@
 #define INLINE(H, T)   rb_str_append(H, rb_funcall(rb_formatter, rb_intern(#T), 1, regs))
 #define DONE(H)        rb_str_append(html, H); CLEAR(H); regs = rb_hash_new()
-#define PASS(H, A, T)  rb_str_append(H, red_pass(rb_formatter, regs, ID2SYM(rb_intern(#A)), rb_intern(#T)))
-#define PASS2(H, A, T) rb_str_append(H, red_pass2(rb_formatter, regs, ID2SYM(rb_intern(#A)), ID2SYM(rb_intern(#T))))
+#define PASS(H, A, T)  rb_str_append(H, red_pass(rb_formatter, regs, ID2SYM(rb_intern(#A)), rb_intern(#T), refs))
+#define PASS2(H, A, T) rb_str_append(H, red_pass2(rb_formatter, regs, ID2SYM(rb_intern(#A)), ID2SYM(rb_intern(#T)), refs))
 #define PASS_CODE(H, A, T) rb_str_append(H, red_pass_code(rb_formatter, regs, ID2SYM(rb_intern(#A)), rb_intern(#T)))
 #define ADD_BLOCK() \
-  rb_str_append(html, red_block(rb_formatter, regs, block)); \
+  rb_str_append(html, red_block(rb_formatter, regs, block, refs)); \
   extend = Qnil; \
   CLEAR(block); \
   regs = rb_hash_new()
-#define ADD_EXTENDED_BLOCK()    rb_str_append(html, red_block(rb_formatter, regs, block)); CLEAR(block);
+#define ADD_EXTENDED_BLOCK()    rb_str_append(html, red_block(rb_formatter, regs, block, refs)); CLEAR(block);
 #define ADD_BLOCKCODE()    rb_str_append(html, red_blockcode(rb_formatter, regs, block)); CLEAR(block); regs = rb_hash_new()
 #define ADD_EXTENDED_BLOCKCODE()    rb_str_append(html, red_blockcode(rb_formatter, regs, block)); CLEAR(block);
@@ -66 +67 @@
   } \
   STORE(T); \
-  p--;
+  p--; \
+  if ( !NIL_P(refs) && rb_funcall(refs, rb_intern("has_key?"), 1, rb_hash_aref(regs, ID2SYM(rb_intern(#T)))) ) { \
+    rb_hash_aset(regs, ID2SYM(rb_intern(#T)), rb_hash_aref(refs, rb_hash_aref(regs, ID2SYM(rb_intern(#T))))); \
+  }
 #define LIST_ITEM() \
     int aint = 0; \

branches/superredcloth/ext/superredcloth_scan/superredcloth_common.rl

@@ -65 +65 @@
   html_comment = "<!--" (default+) :> "-->";
 
+  # URI tokens (lifted from Mongrel)
+  CTL = (cntrl | 127);
+  safe = ("$" | "-" | "_" | ".");
+  extra = ("!" | "*" | "'" | "(" | ")" | "," | "#");
+  reserved = (";" | "/" | "?" | ":" | "@" | "&" | "=" | "+");
+  unsafe = (CTL | " " | "\"" | "%" | "<" | ">");
+  national = any -- (alpha | digit | reserved | extra | safe | unsafe);
+  unreserved = (alpha | digit | safe | extra | national);
+  escape = ("%" xdigit xdigit);
+  uchar = (unreserved | escape);
+  pchar = (uchar | ":" | "@" | "&" | "=" | "+");
+  scheme = ( alpha | digit | "+" | "-" | "." )+ ;
+  absolute_uri = (scheme ":" (uchar | reserved )*);
+  safepath = (pchar* (alpha | digit | safe) pchar*) ;
+  path = (safepath ( "/" pchar* )*) ;
+  query = ( uchar | reserved )* ;
+  param = ( pchar | "/" )* ;
+  params = (param ( ";" param )*) ;
+  rel_path = (path (";" params)?) ("?" query)?;
+  absolute_path = ("/"+ rel_path?);
+  target = ("#" pchar*) ;
+  uri = (target | absolute_uri | absolute_path | rel_path) ;
+
 }%%;

branches/superredcloth/ext/superredcloth_scan/superredcloth_inline.rl

@@ -14 +14 @@
   machine superredcloth_inline;
   include superredcloth_common "ext/superredcloth_scan/superredcloth_common.rl";
-
-  # URI tokens (lifted from Mongrel)
-  CTL = (cntrl | 127);
-  safe = ("$" | "-" | "_" | ".");
-  extra = ("!" | "*" | "'" | "(" | ")" | "," | "#");
-  reserved = (";" | "/" | "?" | ":" | "@" | "&" | "=" | "+");
-  unsafe = (CTL | " " | "\"" | "%" | "<" | ">");
-  national = any -- (alpha | digit | reserved | extra | safe | unsafe);
-  unreserved = (alpha | digit | safe | extra | national);
-  escape = ("%" xdigit xdigit);
-  uchar = (unreserved | escape);
-  pchar = (uchar | ":" | "@" | "&" | "=" | "+");
-  scheme = ( alpha | digit | "+" | "-" | "." )+ ;
-  absolute_uri = (scheme ":" (uchar | reserved )*);
-  safepath = (pchar* (alpha | digit | safe) pchar*) ;
-  path = (safepath ( "/" pchar* )*) ;
-  query = ( uchar | reserved )* ;
-  param = ( pchar | "/" )* ;
-  params = (param ( ";" param )*) ;
-  rel_path = (path (";" params)?) ("?" query)?;
-  absolute_path = ("/"+ rel_path?);
-  target = ("#" pchar*) ;
-  uri = (target | absolute_uri | absolute_path | rel_path) ;
 
   # common
@@ -150 +127 @@
 
 VALUE
-red_pass(VALUE rb_formatter, VALUE regs, VALUE ref, ID meth)
+red_pass(VALUE rb_formatter, VALUE regs, VALUE ref, ID meth, VALUE refs)
 {
   VALUE txt = rb_hash_aref(regs, ref);
-  if (!NIL_P(txt)) rb_hash_aset(regs, ref, superredcloth_inline2(rb_formatter, txt));
+  if (!NIL_P(txt)) rb_hash_aset(regs, ref, superredcloth_inline2(rb_formatter, txt, refs));
   return rb_funcall(rb_formatter, meth, 1, regs);
 }
@@ -170 +147 @@
 
 VALUE
-red_pass2(VALUE rb_formatter, VALUE regs, VALUE ref, VALUE btype)
+red_pass2(VALUE rb_formatter, VALUE regs, VALUE ref, VALUE btype, VALUE refs)
 {
   btype = rb_hash_aref(regs, btype);
   StringValue(btype);
-  return red_pass(rb_formatter, regs, ref, rb_intern(RSTRING(btype)->ptr));
-}
-
-VALUE
-red_block(VALUE rb_formatter, VALUE regs, VALUE block)
+  return red_pass(rb_formatter, regs, ref, rb_intern(RSTRING(btype)->ptr), refs);
+}
+
+VALUE
+red_block(VALUE rb_formatter, VALUE regs, VALUE block, VALUE refs)
 {
   VALUE btype = rb_hash_aref(regs, ID2SYM(rb_intern("type")));
@@ -184 +161 @@
   if ((RSTRING(block)->len > 0) && !NIL_P(btype))
   {
-    rb_hash_aset(regs, ID2SYM(rb_intern("text")), superredcloth_inline2(rb_formatter, block));
+    rb_hash_aset(regs, ID2SYM(rb_intern("text")), superredcloth_inline2(rb_formatter, block, refs));
     block = rb_funcall(rb_formatter, rb_intern(RSTRING(btype)->ptr), 1, regs);
   }
@@ -213 +190 @@
 
 VALUE
-superredcloth_inline(rb_formatter, p, pe)
+superredcloth_inline(rb_formatter, p, pe, refs)
   VALUE rb_formatter;
   char *p, *pe;
+  VALUE refs;
 {
   int cs, act;
@@ -295 +273 @@
 
 VALUE
-superredcloth_inline2(formatter, str)
-  VALUE formatter, str;
+superredcloth_inline2(formatter, str, refs)
+  VALUE formatter, str, refs;
 {
   StringValue(str);
-  return superredcloth_inline(formatter, RSTRING(str)->ptr, RSTRING(str)->ptr + RSTRING(str)->len + 1);
-}
+  return superredcloth_inline(formatter, RSTRING(str)->ptr, RSTRING(str)->ptr + RSTRING(str)->len + 1, refs);
+}

branches/superredcloth/ext/superredcloth_scan/superredcloth_scan.rl

@@ -43 +43 @@
   list_start  = ( ( ul | ol )+ N A C :> " "+ ) >{nest = 0;} ;
   blank_line = CRLF;
+  link_alias = ( "[" >{ ASET(type, ignore) } %A phrase %T "]" %A uri ) ;
   
   # html blocks
@@ -139 +140 @@
     list_start      { list_layout = rb_ary_new(); LIST_ITEM(); fgoto list; };
     table           { INLINE(table, table_close); DONE(table); fgoto block; };
+    link_alias      { STORE_URL(href); rb_hash_aset(refs_found, rb_hash_aref(regs, ID2SYM(rb_intern("text"))), rb_hash_aref(regs, ID2SYM(rb_intern("href")))); DONE(block); };
     blank_line => cat;
     default
@@ -155 +157 @@
 
 VALUE
-superredcloth_transform(rb_formatter, p, pe)
+superredcloth_transform(rb_formatter, p, pe, refs)
   VALUE rb_formatter;
   char *p, *pe;
-{
+  VALUE refs;
+{
+  char *orig_p = p, *orig_pe = pe;
   int cs, act, nest;
   char *ts = NULL, *te = NULL, *reg = NULL, *eof = NULL;
@@ -172 +176 @@
   VALUE extend = Qnil;
   char listm[10] = "";
+  VALUE refs_found = rb_hash_new();
 
   %% write init;
@@ -182 +187 @@
   }
 
-  return html;
+  if ( NIL_P(refs) && rb_funcall(refs_found, rb_intern("empty?"), 0) == Qfalse ) {
+    return superredcloth_transform(rb_formatter, orig_p, orig_pe, refs_found);
+  } else {
+    return html;
+  }
 }
 
@@ -191 +200 @@
   rb_str_cat2(str, "\n");
   StringValue(str);
-  return superredcloth_transform(formatter, RSTRING(str)->ptr, RSTRING(str)->ptr + RSTRING(str)->len + 1);
+  return superredcloth_transform(formatter, RSTRING(str)->ptr, RSTRING(str)->ptr + RSTRING(str)->len + 1, Qnil);
 }