Changeset 274

Timestamp:

03/17/2008 12:03:39 (8 months ago)

Author:

why

Message:

Further name changes, to get tests all working.

Location:

trunk

Files:

• ext/redcloth_scan/extconf.rb (modified) (1 diff)
• ext/redcloth_scan/redcloth.h (moved) (moved from trunk/ext/redcloth_scan/superredcloth.h) (3 diffs)
• ext/redcloth_scan/redcloth_common.rl (moved) (moved from trunk/ext/redcloth_scan/superredcloth_common.rl) (1 diff)
• ext/redcloth_scan/redcloth_inline.rl (moved) (moved from trunk/ext/redcloth_scan/superredcloth_inline.rl) (6 diffs)
• ext/redcloth_scan/redcloth_scan.rl (moved) (moved from trunk/ext/redcloth_scan/superredcloth_scan.rl) (9 diffs)
• lib/redcloth/html.rb (modified) (1 diff)
• lib/redcloth/latex.rb (modified) (1 diff)
• test/helper.rb (modified) (1 diff)

trunk/ext/redcloth_scan/extconf.rb

@@ -3 +3 @@
 $CFLAGS << " -O0 " # do not optimize (takes too much memory and performance gain is negligeable)
 
-dir_config("superredcloth_scan")
+dir_config("redcloth_scan")
 have_library("c", "main")
 
-create_makefile("superredcloth_scan")
+create_makefile("redcloth_scan")

trunk/ext/redcloth_scan/redcloth.h

@@ -1 @@
-#ifndef superredcloth_h
-#define superredcloth_h
+#ifndef redcloth_h
+#define redcloth_h
 
 /* variable defs */
-#ifndef superredcloth_scan_c
+#ifndef redcloth_scan_c
 extern VALUE super_ParseError, super_RedCloth;
 extern int SYM_html_escape_entities;
@@ -11 +11 @@
 void rb_str_cat_escaped(VALUE str, char *ts, char *te, unsigned int opts);
 void rb_str_cat_escaped_for_preformatted(VALUE str, char *ts, char *te, unsigned int opts);
-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);
+VALUE redcloth_inline(VALUE, char *, char *, VALUE);
+VALUE redcloth_inline2(VALUE, VALUE, VALUE);
+VALUE redcloth_transform(VALUE, char *, char *, VALUE);
+VALUE redcloth_transform2(VALUE, VALUE);
 void red_inc(VALUE, VALUE);
 VALUE red_block(VALUE, VALUE, ID, VALUE);
@@ -50 +50 @@
   } \
   if (p > reg && reg >= ts) { \
-    VALUE str = superredcloth_transform(rb_formatter, reg, p, refs); \
+    VALUE str = redcloth_transform(rb_formatter, reg, p, refs); \
     rb_hash_aset(regs, ID2SYM(rb_intern(#T)), str); \
   /*  printf("TRANSFORM(" #T ") '%s' (p:'%d' reg:'%d')\n", RSTRING(str)->ptr, p, reg);*/  \

trunk/ext/redcloth_scan/redcloth_common.rl

@@ -1 +1 @@
 %%{
 
-  machine superredcloth_common;
+  machine redcloth_common;
 
   action A { reg = p; }

trunk/ext/redcloth_scan/redcloth_inline.rl

@@ -1 +1 @@
 /*
- * superredcloth_inline.rl
+ * redcloth_inline.rl
  *
  * $Author: why $
@@ -8 +8 @@
  */
 #include <ruby.h>
-#include "superredcloth.h"
+#include "redcloth.h"
 
 %%{
 
-  machine superredcloth_inline;
-  include superredcloth_common "ext/superredcloth_scan/superredcloth_common.rl";
+  machine redcloth_inline;
+  include redcloth_common "ext/redcloth_scan/redcloth_common.rl";
 
   # common
@@ -135 +135 @@
 {
   VALUE txt = rb_hash_aref(regs, ref);
-  if (!NIL_P(txt)) rb_hash_aset(regs, ref, superredcloth_inline2(rb_formatter, txt, refs));
+  if (!NIL_P(txt)) rb_hash_aset(regs, ref, redcloth_inline2(rb_formatter, txt, refs));
   return rb_funcall(rb_formatter, meth, 1, regs);
 }
@@ -166 +166 @@
   if ((RSTRING(block)->len > 0) && !NIL_P(btype))
   {
-    rb_hash_aset(regs, ID2SYM(rb_intern("text")), superredcloth_inline2(rb_formatter, block, refs));
+    rb_hash_aset(regs, ID2SYM(rb_intern("text")), redcloth_inline2(rb_formatter, block, refs));
     block = rb_funcall(rb_formatter, rb_intern(RSTRING(btype)->ptr), 1, regs);
   }
@@ -195 +195 @@
 
 VALUE
-superredcloth_inline(rb_formatter, p, pe, refs)
+redcloth_inline(rb_formatter, p, pe, refs)
   VALUE rb_formatter;
   char *p, *pe;
@@ -303 +303 @@
 
 VALUE
-superredcloth_inline2(formatter, str, refs)
+redcloth_inline2(formatter, str, refs)
   VALUE formatter, str, refs;
 {
   StringValue(str);
-  return superredcloth_inline(formatter, RSTRING(str)->ptr, RSTRING(str)->ptr + RSTRING(str)->len + 1, refs);
-}
+  return redcloth_inline(formatter, RSTRING(str)->ptr, RSTRING(str)->ptr + RSTRING(str)->len + 1, refs);
+}

trunk/ext/redcloth_scan/redcloth_scan.rl

@@ -1 +1 @@
 /*
- * superredcloth_scan.rl
+ * redcloth_scan.rl
  *
  * $Author: why $
@@ -7 +7 @@
  * Copyright (C) 2007 why the lucky stiff
  */
-#define superredcloth_scan_c
+#define redcloth_scan_c
 
 #include <ruby.h>
-#include "superredcloth.h"
+#include "redcloth.h"
 
 VALUE super_ParseError, super_RedCloth, super_HTML, super_LATEX;
@@ -17 +17 @@
 %%{
 
-  machine superredcloth_scan;
-  include superredcloth_common "ext/superredcloth_scan/superredcloth_common.rl";
+  machine redcloth_scan;
+  include redcloth_common "ext/redcloth_scan/redcloth_common.rl";
 
   action extend { extend = rb_hash_aref(regs, ID2SYM(rb_intern("type"))); }
@@ -174 +174 @@
 
 VALUE
-superredcloth_transform(rb_formatter, p, pe, refs)
+redcloth_transform(rb_formatter, p, pe, refs)
   VALUE rb_formatter;
   char *p, *pe;
@@ -210 +210 @@
 
   if ( NIL_P(refs) && rb_funcall(refs_found, rb_intern("empty?"), 0) == Qfalse ) {
-    return superredcloth_transform(rb_formatter, orig_p, orig_pe, refs_found);
+    return redcloth_transform(rb_formatter, orig_p, orig_pe, refs_found);
   } else {
     rb_funcall(rb_formatter, rb_intern("after_transform"), 1, html);
@@ -218 +218 @@
 
 VALUE
-superredcloth_transform2(formatter, str)
+redcloth_transform2(formatter, str)
   VALUE formatter, str;
 {
   rb_str_cat2(str, "\n");
   StringValue(str);
-  return superredcloth_transform(formatter, RSTRING(str)->ptr, RSTRING(str)->ptr + RSTRING(str)->len + 1, Qnil);
+  return redcloth_transform(formatter, RSTRING(str)->ptr, RSTRING(str)->ptr + RSTRING(str)->len + 1, Qnil);
 }
 
 static VALUE
-superredcloth_to_html(self)
+redcloth_to_html(self)
   VALUE self;
 {
@@ -233 +233 @@
   int len = 0;
 
-  return superredcloth_transform2(super_HTML, self);
+  return redcloth_transform2(super_HTML, self);
 }
 
 static VALUE
-superredcloth_to_latex(self)
+redcloth_to_latex(self)
   VALUE self;
 {
@@ -243 +243 @@
   int len = 0;
 
-  return superredcloth_transform2(super_LATEX, self);
+  return redcloth_transform2(super_LATEX, self);
 }
 
 static VALUE
-superredcloth_to(self, formatter)
+redcloth_to(self, formatter)
   VALUE self, formatter;
 {
@@ -253 +253 @@
   int len = 0;
 
-  return superredcloth_transform2(formatter, self);
-}
-
-void Init_superredcloth_scan()
-{
-  super_RedCloth = rb_define_class("SuperRedCloth", rb_cString);
-  rb_define_method(super_RedCloth, "to_html", superredcloth_to_html, 0);
-  rb_define_method(super_RedCloth, "to_latex", superredcloth_to_latex, 0);
-  rb_define_method(super_RedCloth, "to", superredcloth_to, 1);
+  return redcloth_transform2(formatter, self);
+}
+
+void Init_redcloth_scan()
+{
+  super_RedCloth = rb_define_class("RedCloth", rb_cString);
+  rb_define_method(super_RedCloth, "to_html", redcloth_to_html, 0);
+  rb_define_method(super_RedCloth, "to_latex", redcloth_to_latex, 0);
+  rb_define_method(super_RedCloth, "to", redcloth_to, 1);
   super_ParseError = rb_define_class_under(super_RedCloth, "ParseError", rb_eException);
   super_HTML  = rb_define_module_under(super_RedCloth, "HTML");

trunk/lib/redcloth/html.rb

@@ -1 @@
-class << SuperRedCloth::HTML
+class << RedCloth::HTML
   def options
     {:html_escape_entities => true}

trunk/lib/redcloth/latex.rb

@@ -1 @@
-class << SuperRedCloth::LATEX
+class << RedCloth::LATEX
   def options
     {:html_escape_entities => false}

trunk/test/helper.rb

@@ -1 +1 @@
 require 'test/unit'
 $:.unshift File.dirname(__FILE__) + "/../lib"
-require 'superredcloth'
+require 'redcloth'
 require 'yaml'
 
 def red(formatter, str)
-  SuperRedCloth.new(str).send("to_#{formatter}")
+  RedCloth.new(str).send("to_#{formatter}")
 end