Changeset 244

Timestamp:

02/25/2008 16:37:27 (9 months ago)

Author:

jgarber

Message:

Make SRC work with Ragel >= 6.0. Due to Ragel interface changes, it is not backward-compatible with earlier versions of Ragel.

Location:

branches/superredcloth

Files:

• Rakefile (modified) (1 diff)
• ext/superredcloth_scan/superredcloth.h (modified) (5 diffs)
• ext/superredcloth_scan/superredcloth_common.rl (modified) (1 diff)
• ext/superredcloth_scan/superredcloth_inline.rl (modified) (3 diffs)
• ext/superredcloth_scan/superredcloth_scan.rl (modified) (1 diff)

branches/superredcloth/Rakefile

@@ -119 +119 @@
   source = name.sub(/\.c$/, '.rl')
   file name => [source, "#{ext}/superredcloth_common.rl", "#{ext}/superredcloth.h"] do
-    @ragel_v ||= `ragel -v`[/(version )(\S*)/,2].to_f
-    sh %{ragel #{source} | #{@ragel_v >= 5.18 ? 'rlgen-cd' : 'rlcodegen'} -G2 -o #{name}}
+    @ragel_v ||= `ragel -v`[/(version )(\S*)/,2].split('.').map{|s| s.to_i}
+    if @ragel_v[0] >= 6
+      sh %{ragel #{source} -G2 -o #{name}}
+    else
+      STDERR.puts "Ragel 6.0 or greater is required to generate #{name}."
+      exit(1)
+    end
   end
 end

branches/superredcloth/ext/superredcloth_scan/superredcloth.h

@@ -8 +8 @@
 
 /* function defs */
-void rb_str_cat_escaped(VALUE str, char *tokstart, char *tokend);
-void rb_str_cat_escaped_for_preformatted(VALUE str, char *tokstart, char *tokend);
+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);
@@ -21 +21 @@
 
 /* parser macros */
-#define CAT(H)         rb_str_cat(H, tokstart, tokend-tokstart)
+#define CAT(H)         rb_str_cat(H, ts, te-ts)
 #define CLEAR(H)       H = rb_str_new2("")
 #define INLINE(H, T)   rb_str_append(H, rb_funcall(rb_formatter, rb_intern(#T), 1, regs))
@@ -39 +39 @@
 #define AINC(T)        red_inc(regs, ID2SYM(rb_intern(#T)));
 #define STORE(T)  \
-  if (p > reg && reg >= tokstart) { \
+  if (p > reg && reg >= ts) { \
     while (reg < p && ( *reg == '\r' || *reg == '\n' ) ) { reg++; } \
     while (p > reg && ( *(p - 1) == '\r' || *(p - 1) == '\n' ) ) { p--; } \
   } \
-  if (p > reg && reg >= tokstart) { \
+  if (p > reg && reg >= ts) { \
     VALUE str = rb_str_new(reg, p-reg); \
     rb_hash_aset(regs, ID2SYM(rb_intern(#T)), str); \
@@ -51 +51 @@
   }
 #define STORE_URL(T) \
-  if (p > reg && reg >= tokstart) { \
+  if (p > reg && reg >= ts) { \
     p++; \
     char punct = 1; \
@@ -63 +63 @@
       } \
     } \
-    tokend = p; \
+    te = p; \
   } \
   STORE(T); \

branches/superredcloth/ext/superredcloth_scan/superredcloth_common.rl

@@ -7 +7 @@
   action X { regs = rb_hash_new(); reg = NULL; }
   action cat { CAT(block); }
-  action esc { rb_str_cat_escaped(block, tokstart, tokend); }
-  action esc_pre { rb_str_cat_escaped_for_preformatted(block, tokstart, tokend); }
+  action esc { rb_str_cat_escaped(block, ts, te); }
+  action esc_pre { rb_str_cat_escaped_for_preformatted(block, ts, te); }
   action ignore { rb_str_append(block, rb_funcall(rb_formatter, rb_intern("ignore"), 1, regs)); }
 

branches/superredcloth/ext/superredcloth_scan/superredcloth_inline.rl

@@ -218 +218 @@
 {
   int cs, act;
-  char *tokstart, *tokend, *reg;
+  char *ts, *te, *reg, *eof;
   VALUE block = rb_str_new2("");
   VALUE regs = Qnil;
@@ -230 +230 @@
 
 void
-rb_str_cat_escaped(str, tokstart, tokend)
+rb_str_cat_escaped(str, ts, te)
   VALUE str;
-  char *tokstart, *tokend;
-{
-  char *t = tokstart, *t2 = tokstart, *ch = NULL;
-  if (tokend <= tokstart) return;
-
-  while (t2 < tokend) {
+  char *ts, *te;
+{
+  char *t = ts, *t2 = ts, *ch = NULL;
+  if (te <= ts) return;
+
+  while (t2 < te) {
     ch = NULL;
     switch (*t2)
@@ -264 +264 @@
 
 void
-rb_str_cat_escaped_for_preformatted(str, tokstart, tokend)
+rb_str_cat_escaped_for_preformatted(str, ts, te)
   VALUE str;
-  char *tokstart, *tokend;
-{
-  char *t = tokstart, *t2 = tokstart, *ch = NULL;
-  if (tokend <= tokstart) return;
-
-  while (t2 < tokend) {
+  char *ts, *te;
+{
+  char *t = ts, *t2 = ts, *ch = NULL;
+  if (te <= ts) return;
+
+  while (t2 < te) {
     ch = NULL;
     switch (*t2)

branches/superredcloth/ext/superredcloth_scan/superredcloth_scan.rl

@@ -160 +160 @@
 {
   int cs, act, nest;
-  char *tokstart = NULL, *tokend = NULL, *reg = NULL;
+  char *ts = NULL, *te = NULL, *reg = NULL, *eof = NULL;
   VALUE html = rb_str_new2("");
   VALUE table = rb_str_new2("");