erbal 1.2.rc3 → 1.2.rc4

data/README.rdoc

@@ -67,7 +67,7 @@ Erubis: 2.6.6
 
 Erbal: 1.1
 
-  => Parsing Benchmark
+<b>Parsing Benchmark</b>
 
   => Erb
   0.851 0.853 0.848 0.847 0.849 0.847
@@ -85,7 +85,7 @@ Erbal: 1.1
   0.036 0.039 0.066 0.038 0.067 0.039
   => Average: 0.047
 
-  => eval() Benchmark
+<b>eval() Benchmark</b>
 
   => Erb
   0.203 0.192 0.180 0.180 0.179 0.191

data/ext/erbal/erbal.c

@@ -10,6 +10,7 @@ void rb_erbal_free(erbal_parser *parser) {
 void rb_erbal_mark(erbal_parser *parser) {
   rb_gc_mark_maybe(parser->str);
   rb_gc_mark_maybe(parser->src);
+  rb_gc_mark_maybe(parser->initial_src);
   rb_gc_mark_maybe(parser->buffer_name);
   rb_gc_mark_maybe(parser->options);
   rb_gc_mark_maybe(parser->safe_concat_method);
@@ -65,6 +66,25 @@ VALUE rb_erbal_initialize(int argc, VALUE *argv, VALUE self) {
   rb_erbal_setup_option(self, parser, &parser->unsafe_concat_method, "unsafe_concat_method", "concat");
   rb_erbal_setup_option(self, parser, &parser->safe_concat_keyword, "safe_concat_keyword", "");
 
+	if (strcmp(RSTRING(parser->safe_concat_method)->ptr, RSTRING(parser->unsafe_concat_method)->ptr) == 0) {
+    parser->concat_methods_identical = 1;
+	} else {
+	  parser->concat_methods_identical = 0;
+	}
+
+  parser->initial_src = rb_str_dup(parser->buffer_name);
+
+  VALUE buffer_init_val = rb_hash_aref(parser->options, ID2SYM(rb_intern("buffer_initial_value")));
+  
+  if (!NIL_P(buffer_init_val)) {
+    Check_Type(buffer_init_val, T_STRING);
+    rb_str_buf_cat(parser->initial_src, " = ", 3);
+    rb_str_concat(parser->initial_src, buffer_init_val);
+    rb_str_buf_cat(parser->initial_src, ";", 1);
+  } else {
+    rb_str_buf_cat(parser->initial_src, " = '';", 6);
+  }
+
   return self;
 }
 

data/ext/erbal/parser.c

@@ -218,28 +218,10 @@ void erbal_parser_init(VALUE self, erbal_parser *parser) {
   parser->state->chars_seen = 0;
   parser->state->concat = OUTSIDE_CONCAT;
 	parser->state->tag = OUTSIDE_TAG;
-
-	if (strcmp(RSTRING(parser->safe_concat_method)->ptr, RSTRING(parser->unsafe_concat_method)->ptr) == 0) {
-    parser->concat_methods_identical = 1;
-	} else {
-	  parser->concat_methods_identical = 0;
-	}
-
-  parser->src = rb_str_dup(parser->buffer_name);
-
-  VALUE buffer_init_val = rb_hash_aref(parser->options, ID2SYM(rb_intern("buffer_initial_value")));
-
-  if (!NIL_P(buffer_init_val)) {
-    Check_Type(buffer_init_val, T_STRING);
-    rb_str_buf_cat(parser->src, " = ", 3);
-    rb_str_concat(parser->src, buffer_init_val);
-    rb_str_buf_cat(parser->src, ";", 1);
-  } else {
-    rb_str_buf_cat(parser->src, " = '';", 6);
-  }
+  parser->src = rb_str_dup(parser->initial_src);
 
   
-#line 243 "parser.c"
+#line 225 "parser.c"
 	{
 	cs = erbal_parser_start;
 	ts = 0;
@@ -247,14 +229,14 @@ void erbal_parser_init(VALUE self, erbal_parser *parser) {
 	act = 0;
 	}
 
-#line 256 "parser.rl"
+#line 238 "parser.rl"
 }
 
 void erbal_parser_exec(erbal_parser *parser) {
   p = RSTRING(parser->str)->ptr;
   pe = p + strlen(p);
   
-#line 258 "parser.c"
+#line 240 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -314,7 +296,7 @@ st4:
 case 4:
 #line 1 "NONE"
 	{ts = p;}
-#line 318 "parser.c"
+#line 300 "parser.c"
 	switch( (*p) ) {
 		case 37: goto st5;
 		case 45: goto tr10;
@@ -336,7 +318,7 @@ st6:
 	if ( ++p == pe )
 		goto _test_eof6;
 case 6:
-#line 340 "parser.c"
+#line 322 "parser.c"
 	if ( (*p) == 37 )
 		goto st0;
 	goto tr12;
@@ -372,7 +354,7 @@ st9:
 	if ( ++p == pe )
 		goto _test_eof9;
 case 9:
-#line 376 "parser.c"
+#line 358 "parser.c"
 	switch( (*p) ) {
 		case 32: goto tr21;
 		case 33: goto tr22;
@@ -396,7 +378,7 @@ st1:
 	if ( ++p == pe )
 		goto _test_eof1;
 case 1:
-#line 400 "parser.c"
+#line 382 "parser.c"
 	switch( (*p) ) {
 		case 32: goto st1;
 		case 33: goto tr4;
@@ -426,7 +408,7 @@ st2:
 	if ( ++p == pe )
 		goto _test_eof2;
 case 2:
-#line 430 "parser.c"
+#line 412 "parser.c"
 	if ( (*p) == 32 )
 		goto tr6;
 	goto tr2;
@@ -441,7 +423,7 @@ st10:
 	if ( ++p == pe )
 		goto _test_eof10;
 case 10:
-#line 445 "parser.c"
+#line 427 "parser.c"
 	if ( (*p) == 32 )
 		goto st10;
 	goto tr24;
@@ -459,7 +441,7 @@ st3:
 	if ( ++p == pe )
 		goto _test_eof3;
 case 3:
-#line 463 "parser.c"
+#line 445 "parser.c"
 	if ( (*p) == 32 )
 		goto tr6;
 	if ( 97 <= (*p) && (*p) <= 122 )
@@ -497,6 +479,6 @@ case 3:
 
 	}
 
-#line 262 "parser.rl"
+#line 244 "parser.rl"
   erbal_parser_finish(parser);
 }

data/ext/erbal/parser.h

@@ -13,7 +13,7 @@ typedef struct parser_state {
 typedef struct erbal_parser {
   parser_state *state;
   unsigned int debug, concat_methods_identical;
-  VALUE str, src, buffer_name, options, safe_concat_method, unsafe_concat_method, keyword, safe_concat_keyword;
+  VALUE str, src, initial_src, buffer_name, options, safe_concat_method, unsafe_concat_method, keyword, safe_concat_keyword;
   char *keyword_start, *keyword_end, *keyword_trailing_whitespace, *keyword_preceding_whitespace;
 } erbal_parser;
 

data/ext/erbal/parser.rl

@@ -232,25 +232,7 @@ void erbal_parser_init(VALUE self, erbal_parser *parser) {
   parser->state->chars_seen = 0;
   parser->state->concat = OUTSIDE_CONCAT;
 	parser->state->tag = OUTSIDE_TAG;
-
-	if (strcmp(RSTRING(parser->safe_concat_method)->ptr, RSTRING(parser->unsafe_concat_method)->ptr) == 0) {
-    parser->concat_methods_identical = 1;
-	} else {
-	  parser->concat_methods_identical = 0;
-	}
-
-  parser->src = rb_str_dup(parser->buffer_name);
-
-  VALUE buffer_init_val = rb_hash_aref(parser->options, ID2SYM(rb_intern("buffer_initial_value")));
-
-  if (!NIL_P(buffer_init_val)) {
-    Check_Type(buffer_init_val, T_STRING);
-    rb_str_buf_cat(parser->src, " = ", 3);
-    rb_str_concat(parser->src, buffer_init_val);
-    rb_str_buf_cat(parser->src, ";", 1);
-  } else {
-    rb_str_buf_cat(parser->src, " = '';", 6);
-  }
+  parser->src = rb_str_dup(parser->initial_src);
 
   %% write init;
 }

data/tasks/gem.rake

@@ -2,7 +2,7 @@ require 'rake/gempackagetask'
 require 'yaml'
 
 WIN_SUFFIX = ENV['WIN_SUFFIX'] || 'i386-mswin32'
-ERBAL_VERSION = '1.2.rc3'
+ERBAL_VERSION = '1.2.rc4'
 
 task :clean => :clobber_package
 

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: erbal
 version: !ruby/object:Gem::Version 
-  hash: 977940508
-  prerelease: true
+  hash: 15424237
+  prerelease: 4
   segments: 
   - 1
   - 2
-  - rc3
-  version: 1.2.rc3
+  - rc
+  - 4
+  version: 1.2.rc4
 platform: ruby
 authors: 
 - Ian Leitch
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-08 00:00:00 +11:00
+date: 2011-01-10 00:00:00 +11:00
 default_executable: 
 dependencies: []
 
@@ -78,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Very small, very fast Ragel/C based ERB parser