Changeset 162

Timestamp:

04/08/2008 00:11:36 (4 months ago)

Author:

why

Message:

• Rakefile: use Ragel 6.1 or greater from now on.
  

Location:

trunk

Files:

• Rakefile (modified) (1 diff)
• ext/hpricot_scan/hpricot_scan.rl (modified) (6 diffs)

trunk/Rakefile

@@ -121 +121 @@
 desc "Generates the C scanner code with Ragel."
 task :ragel => [:ragel_version] do
-  sh %{ragel ext/hpricot_scan/hpricot_scan.rl | #{@ragel_v >= 5.18 ? 'rlgen-cd' : 'rlcodegen'} -G2 -o ext/hpricot_scan/hpricot_scan.c}
+  if @ragel_v >= 6.1
+    sh %{ragel ext/hpricot_scan/hpricot_scan.rl -G2 -o ext/hpricot_scan/hpricot_scan.c}
+  else
+    STDERR.puts "Ragel 6.1 or greater is required."
+    exit(1)
+  end
 end
 
 desc "Generates the Java scanner code with Ragel."
 task :ragel_java => [:ragel_version] do
-  sh %{ragel -J ext/hpricot_scan/hpricot_scan.java.rl | #{@ragel_v >= 5.18 ? 'rlgen-java' : 'rlcodegen'} -o  ext/hpricot_scan/HpricotScanService.java}
+  if @ragel_v >= 6.1
+    sh %{ragel -J ext/hpricot_scan/hpricot_scan.java.rl -G2 -o ext/hpricot_scan/HpricotScanService.java}
+  else
+    STDERR.puts "Ragel 6.1 or greater is required."
+    exit(1)
+  end
 end
 

trunk/ext/hpricot_scan/hpricot_scan.rl

@@ -23 +23 @@
 
 #define ELE(N) \
-  if (tokend > tokstart || text == 1) { \
+  if (te > ts || text == 1) { \
     VALUE raw_string = Qnil; \
     ele_open = 0; text = 0; \
-    if (tokstart != 0 && sym_##N != sym_cdata && sym_##N != sym_text && sym_##N != sym_procins && sym_##N != sym_comment) { \
-      raw_string = rb_str_new(tokstart, tokend-tokstart); \
+    if (ts != 0 && sym_##N != sym_cdata && sym_##N != sym_text && sym_##N != sym_procins && sym_##N != sym_comment) { \
+      raw_string = rb_str_new(ts, te-ts); \
     } \
     rb_yield_tokens(sym_##N, tag, attr, raw_string, taint); \
@@ -40 +40 @@
 #define CAT(N, E) if (NIL_P(N)) { SET(N, E); } else { rb_str_cat(N, mark_##N, E - mark_##N); }
 
-#define SLIDE(N) if ( mark_##N > tokstart ) mark_##N = buf + (mark_##N - tokstart);
+#define SLIDE(N) if ( mark_##N > ts ) mark_##N = buf + (mark_##N - ts);
 
 #define ATTR(K, V) \
@@ -53 +53 @@
       if (ele_open == 1) { \
         ele_open = 0; \
-        if (tokstart > 0) { \
-          mark_tag = tokstart; \
+        if (ts > 0) { \
+          mark_tag = ts; \
         } \
       } else { \
@@ -136 +136 @@
 {
   int cs, act, have = 0, nread = 0, curline = 1, text = 0;
-  char *tokstart = 0, *tokend = 0, *buf = NULL;
+  char *ts = 0, *te = 0, *buf = NULL, *eof = NULL;
 
   VALUE attr = Qnil, tag = Qnil, akey = Qnil, aval = Qnil, bufsize = Qnil;
@@ -217 +217 @@
     {
       ele_open = 0;
-      if (tokstart > 0) {
-        mark_tag = tokstart;
-        tokstart = 0;
+      if (ts > 0) {
+        mark_tag = ts;
+        ts = 0;
         text = 1;
       }
     }
 
-    if ( tokstart == 0 )
+    if ( ts == 0 )
     {
       have = 0;
-      /* text nodes have no tokstart because each byte is parsed alone */
+      /* text nodes have no ts because each byte is parsed alone */
       if ( mark_tag != NULL && text == 1 )
       {
@@ -247 +247 @@
     else
     {
-      have = pe - tokstart;
-      memmove( buf, tokstart, have );
+      have = pe - ts;
+      memmove( buf, ts, have );
       SLIDE(tag);
       SLIDE(akey);
       SLIDE(aval);
-      tokend = buf + (tokend - tokstart);
-      tokstart = buf;
+      te = buf + (te - ts);
+      ts = buf;
     }
   }