fastcsv 0.0.5 → 0.0.7

data/ext/fastcsv/fastcsv.c

@@ -38,19 +38,19 @@ typedef struct {
 } Data;
 
 
-#line 169 "ext/fastcsv/fastcsv.rl"
+#line 172 "ext/fastcsv/fastcsv.rl"
 
 
 
 #line 46 "ext/fastcsv/fastcsv.c"
-static const int raw_parse_start = 5;
-static const int raw_parse_first_final = 5;
+static const int raw_parse_start = 4;
+static const int raw_parse_first_final = 4;
 static const int raw_parse_error = 0;
 
-static const int raw_parse_en_main = 5;
+static const int raw_parse_en_main = 4;
 
 
-#line 172 "ext/fastcsv/fastcsv.rl"
+#line 175 "ext/fastcsv/fastcsv.rl"
 
 // 16 kB
 #define BUFSIZE 16384
@@ -132,7 +132,7 @@ static VALUE raw_parse(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, ":col_sep has to be a single character String");
   }
 
-  // @see rb_io_extract_modeenc
+  // @see rb_io_extract_modeenc parse_mode_enc
   /* Set to defaults */
   rb_io_ext_int_to_encs(NULL, NULL, &enc, &enc2, 0);
 
@@ -270,7 +270,7 @@ static VALUE raw_parse(int argc, VALUE *argv, VALUE self) {
 	act = 0;
 	}
 
-#line 383 "ext/fastcsv/fastcsv.rl"
+#line 386 "ext/fastcsv/fastcsv.rl"
 
   while (!done) {
     VALUE str;
@@ -350,7 +350,7 @@ tr0:
 	break;
 	}
 	}
-	goto st5;
+	goto st4;
 tr5:
 #line 49 "ext/fastcsv/fastcsv.rl"
 	{
@@ -363,7 +363,7 @@ tr5:
       ENCODE;
     }
   }
-#line 137 "ext/fastcsv/fastcsv.rl"
+#line 138 "ext/fastcsv/fastcsv.rl"
 	{
     if (d->start == 0 || p == d->start) { // same as new_row
       rb_ivar_set(self, s_row, rb_str_new2(""));
@@ -380,9 +380,9 @@ tr5:
       rb_yield(row);
     }
   }
-#line 167 "ext/fastcsv/fastcsv.rl"
+#line 170 "ext/fastcsv/fastcsv.rl"
 	{te = p+1;}
-	goto st5;
+	goto st4;
 tr6:
 #line 49 "ext/fastcsv/fastcsv.rl"
 	{
@@ -400,9 +400,9 @@ tr6:
     rb_ary_push(row, field);
     field = Qnil;
   }
-#line 165 "ext/fastcsv/fastcsv.rl"
+#line 168 "ext/fastcsv/fastcsv.rl"
 	{te = p+1;}
-	goto st5;
+	goto st4;
 tr7:
 #line 49 "ext/fastcsv/fastcsv.rl"
 	{
@@ -420,9 +420,9 @@ tr7:
     rb_ary_push(row, field);
     field = Qnil;
   }
-#line 165 "ext/fastcsv/fastcsv.rl"
+#line 168 "ext/fastcsv/fastcsv.rl"
 	{te = p+1;}
-#line 137 "ext/fastcsv/fastcsv.rl"
+#line 138 "ext/fastcsv/fastcsv.rl"
 	{
     if (d->start == 0 || p == d->start) { // same as new_row
       rb_ivar_set(self, s_row, rb_str_new2(""));
@@ -439,9 +439,9 @@ tr7:
       rb_yield(row);
     }
   }
-	goto st5;
-tr13:
-#line 137 "ext/fastcsv/fastcsv.rl"
+	goto st4;
+tr12:
+#line 138 "ext/fastcsv/fastcsv.rl"
 	{
     if (d->start == 0 || p == d->start) { // same as new_row
       rb_ivar_set(self, s_row, rb_str_new2(""));
@@ -458,27 +458,27 @@ tr13:
       rb_yield(row);
     }
   }
-#line 167 "ext/fastcsv/fastcsv.rl"
+#line 170 "ext/fastcsv/fastcsv.rl"
 	{te = p+1;}
-	goto st5;
-tr19:
+	goto st4;
+tr18:
 #line 95 "ext/fastcsv/fastcsv.rl"
 	{
     rb_ary_push(row, field);
     field = Qnil;
   }
-#line 165 "ext/fastcsv/fastcsv.rl"
+#line 168 "ext/fastcsv/fastcsv.rl"
 	{te = p+1;}
-	goto st5;
-tr20:
+	goto st4;
+tr19:
 #line 95 "ext/fastcsv/fastcsv.rl"
 	{
     rb_ary_push(row, field);
     field = Qnil;
   }
-#line 165 "ext/fastcsv/fastcsv.rl"
+#line 168 "ext/fastcsv/fastcsv.rl"
 	{te = p+1;}
-#line 137 "ext/fastcsv/fastcsv.rl"
+#line 138 "ext/fastcsv/fastcsv.rl"
 	{
     if (d->start == 0 || p == d->start) { // same as new_row
       rb_ivar_set(self, s_row, rb_str_new2(""));
@@ -495,12 +495,12 @@ tr20:
       rb_yield(row);
     }
   }
-	goto st5;
-tr42:
-#line 167 "ext/fastcsv/fastcsv.rl"
+	goto st4;
+tr36:
+#line 170 "ext/fastcsv/fastcsv.rl"
 	{te = p;p--;}
-	goto st5;
-tr43:
+	goto st4;
+tr37:
 #line 100 "ext/fastcsv/fastcsv.rl"
 	{
     d->start = p;
@@ -509,7 +509,7 @@ tr43:
       if (p - mark_row_sep != len_row_sep || row_sep[0] != *mark_row_sep || (len_row_sep == 2 && row_sep[1] != *(mark_row_sep + 1))) {
         FREE;
 
-        rb_raise(eError, "Unquoted fields do not allow \\r or \\n (line %d).", curline - 1);
+        rb_raise(eError, "Unquoted fields do not allow \\r or \\n (line %d).", curline);
       }
     }
     else {
@@ -517,6 +517,8 @@ tr43:
       row_sep = ALLOC_N(char, len_row_sep);
       memcpy(row_sep, mark_row_sep, len_row_sep);
     }
+
+    curline++;
   }
 #line 1 "NONE"
 	{	switch( act ) {
@@ -528,8 +530,35 @@ tr43:
 	break;
 	}
 	}
-	goto st5;
-tr50:
+	goto st4;
+tr43:
+#line 100 "ext/fastcsv/fastcsv.rl"
+	{
+    d->start = p;
+
+    if (len_row_sep) {
+      if (p - mark_row_sep != len_row_sep || row_sep[0] != *mark_row_sep || (len_row_sep == 2 && row_sep[1] != *(mark_row_sep + 1))) {
+        FREE;
+
+        rb_raise(eError, "Unquoted fields do not allow \\r or \\n (line %d).", curline);
+      }
+    }
+    else {
+      len_row_sep = p - mark_row_sep;
+      row_sep = ALLOC_N(char, len_row_sep);
+      memcpy(row_sep, mark_row_sep, len_row_sep);
+    }
+
+    curline++;
+  }
+#line 169 "ext/fastcsv/fastcsv.rl"
+	{te = p;p--;}
+	goto st4;
+tr44:
+#line 169 "ext/fastcsv/fastcsv.rl"
+	{te = p;p--;}
+	goto st4;
+tr45:
 #line 100 "ext/fastcsv/fastcsv.rl"
 	{
     d->start = p;
@@ -538,7 +567,7 @@ tr50:
       if (p - mark_row_sep != len_row_sep || row_sep[0] != *mark_row_sep || (len_row_sep == 2 && row_sep[1] != *(mark_row_sep + 1))) {
         FREE;
 
-        rb_raise(eError, "Unquoted fields do not allow \\r or \\n (line %d).", curline - 1);
+        rb_raise(eError, "Unquoted fields do not allow \\r or \\n (line %d).", curline);
       }
     }
     else {
@@ -546,8 +575,10 @@ tr50:
       row_sep = ALLOC_N(char, len_row_sep);
       memcpy(row_sep, mark_row_sep, len_row_sep);
     }
+
+    curline++;
   }
-#line 137 "ext/fastcsv/fastcsv.rl"
+#line 138 "ext/fastcsv/fastcsv.rl"
 	{
     if (d->start == 0 || p == d->start) { // same as new_row
       rb_ivar_set(self, s_row, rb_str_new2(""));
@@ -564,16 +595,44 @@ tr50:
       rb_yield(row);
     }
   }
-#line 167 "ext/fastcsv/fastcsv.rl"
+#line 170 "ext/fastcsv/fastcsv.rl"
 	{te = p+1;}
-	goto st5;
-tr56:
+	goto st4;
+tr51:
+#line 95 "ext/fastcsv/fastcsv.rl"
+	{
+    rb_ary_push(row, field);
+    field = Qnil;
+  }
+#line 168 "ext/fastcsv/fastcsv.rl"
+	{te = p+1;}
+#line 100 "ext/fastcsv/fastcsv.rl"
+	{
+    d->start = p;
+
+    if (len_row_sep) {
+      if (p - mark_row_sep != len_row_sep || row_sep[0] != *mark_row_sep || (len_row_sep == 2 && row_sep[1] != *(mark_row_sep + 1))) {
+        FREE;
+
+        rb_raise(eError, "Unquoted fields do not allow \\r or \\n (line %d).", curline);
+      }
+    }
+    else {
+      len_row_sep = p - mark_row_sep;
+      row_sep = ALLOC_N(char, len_row_sep);
+      memcpy(row_sep, mark_row_sep, len_row_sep);
+    }
+
+    curline++;
+  }
+	goto st4;
+tr52:
 #line 95 "ext/fastcsv/fastcsv.rl"
 	{
     rb_ary_push(row, field);
     field = Qnil;
   }
-#line 165 "ext/fastcsv/fastcsv.rl"
+#line 168 "ext/fastcsv/fastcsv.rl"
 	{te = p+1;}
 #line 100 "ext/fastcsv/fastcsv.rl"
 	{
@@ -583,7 +642,7 @@ tr56:
       if (p - mark_row_sep != len_row_sep || row_sep[0] != *mark_row_sep || (len_row_sep == 2 && row_sep[1] != *(mark_row_sep + 1))) {
         FREE;
 
-        rb_raise(eError, "Unquoted fields do not allow \\r or \\n (line %d).", curline - 1);
+        rb_raise(eError, "Unquoted fields do not allow \\r or \\n (line %d).", curline);
       }
     }
     else {
@@ -591,8 +650,10 @@ tr56:
       row_sep = ALLOC_N(char, len_row_sep);
       memcpy(row_sep, mark_row_sep, len_row_sep);
     }
+
+    curline++;
   }
-#line 137 "ext/fastcsv/fastcsv.rl"
+#line 138 "ext/fastcsv/fastcsv.rl"
 	{
     if (d->start == 0 || p == d->start) { // same as new_row
       rb_ivar_set(self, s_row, rb_str_new2(""));
@@ -609,39 +670,39 @@ tr56:
       rb_yield(row);
     }
   }
-	goto st5;
-st5:
+	goto st4;
+st4:
 #line 1 "NONE"
 	{ts = 0;}
 #line 1 "NONE"
 	{act = 0;}
 	if ( ++p == pe )
-		goto _test_eof5;
-case 5:
+		goto _test_eof4;
+case 4:
 #line 1 "NONE"
 	{ts = p;}
-#line 624 "ext/fastcsv/fastcsv.c"
+#line 685 "ext/fastcsv/fastcsv.c"
 	_widec = (*p);
 	_widec = (short)(1152 + ((*p) - -128));
 	if ( 
-#line 155 "ext/fastcsv/fastcsv.rl"
+#line 156 "ext/fastcsv/fastcsv.rl"
  (*p) == quote_char  ) _widec += 256;
 	if ( 
-#line 156 "ext/fastcsv/fastcsv.rl"
+#line 157 "ext/fastcsv/fastcsv.rl"
  (*p) == col_sep  ) _widec += 512;
 	switch( _widec ) {
-		case 1280: goto tr33;
+		case 1280: goto tr27;
 		case 1290: goto tr3;
 		case 1293: goto tr4;
-		case 1536: goto tr35;
-		case 1546: goto tr36;
-		case 1549: goto tr37;
+		case 1536: goto tr29;
+		case 1546: goto tr30;
+		case 1549: goto tr31;
 		case 1792: goto tr7;
 		case 1802: goto tr8;
 		case 1805: goto tr9;
-		case 2048: goto tr39;
-		case 2058: goto tr40;
-		case 2061: goto tr41;
+		case 2048: goto tr33;
+		case 2058: goto tr34;
+		case 2061: goto tr35;
 	}
 	if ( _widec < 1408 ) {
 		if ( 1152 <= _widec && _widec <= 1407 )
@@ -649,11 +710,11 @@ case 5:
 	} else if ( _widec > 1663 ) {
 		if ( _widec > 1919 ) {
 			if ( 1920 <= _widec && _widec <= 2175 )
-				goto tr38;
+				goto tr32;
 		} else if ( _widec >= 1664 )
 			goto tr6;
 	} else
-		goto tr34;
+		goto tr28;
 	goto st0;
 st0:
 cs = 0;
@@ -665,10 +726,10 @@ case 1:
 	_widec = (*p);
 	_widec = (short)(1152 + ((*p) - -128));
 	if ( 
-#line 155 "ext/fastcsv/fastcsv.rl"
+#line 156 "ext/fastcsv/fastcsv.rl"
  (*p) == quote_char  ) _widec += 256;
 	if ( 
-#line 156 "ext/fastcsv/fastcsv.rl"
+#line 157 "ext/fastcsv/fastcsv.rl"
  (*p) == col_sep  ) _widec += 512;
 	switch( _widec ) {
 		case 1280: goto tr2;
@@ -704,7 +765,7 @@ tr2:
       ENCODE;
     }
   }
-#line 137 "ext/fastcsv/fastcsv.rl"
+#line 138 "ext/fastcsv/fastcsv.rl"
 	{
     if (d->start == 0 || p == d->start) { // same as new_row
       rb_ivar_set(self, s_row, rb_str_new2(""));
@@ -721,21 +782,21 @@ tr2:
       rb_yield(row);
     }
   }
-#line 167 "ext/fastcsv/fastcsv.rl"
+#line 170 "ext/fastcsv/fastcsv.rl"
 	{act = 3;}
-	goto st6;
-st6:
+	goto st5;
+st5:
 	if ( ++p == pe )
-		goto _test_eof6;
-case 6:
-#line 732 "ext/fastcsv/fastcsv.c"
+		goto _test_eof5;
+case 5:
+#line 793 "ext/fastcsv/fastcsv.c"
 	_widec = (*p);
 	_widec = (short)(1152 + ((*p) - -128));
 	if ( 
-#line 155 "ext/fastcsv/fastcsv.rl"
+#line 156 "ext/fastcsv/fastcsv.rl"
  (*p) == quote_char  ) _widec += 256;
 	if ( 
-#line 156 "ext/fastcsv/fastcsv.rl"
+#line 157 "ext/fastcsv/fastcsv.rl"
  (*p) == col_sep  ) _widec += 512;
 	switch( _widec ) {
 		case 1280: goto tr2;
@@ -756,7 +817,7 @@ case 6:
 			goto tr6;
 	} else if ( _widec >= 1152 )
 		goto st1;
-	goto tr42;
+	goto tr36;
 tr3:
 #line 1 "NONE"
 	{te = p+1;}
@@ -771,10 +832,9 @@ tr3:
       ENCODE;
     }
   }
-#line 117 "ext/fastcsv/fastcsv.rl"
+#line 119 "ext/fastcsv/fastcsv.rl"
 	{
     mark_row_sep = p;
-    curline++;
 
     if (d->start == 0 || p == d->start) {
       rb_ivar_set(self, s_row, rb_str_new2(""));
@@ -791,9 +851,9 @@ tr3:
     rb_yield(row);
     row = rb_ary_new();
   }
-#line 166 "ext/fastcsv/fastcsv.rl"
+#line 169 "ext/fastcsv/fastcsv.rl"
 	{act = 2;}
-	goto st7;
+	goto st6;
 tr8:
 #line 1 "NONE"
 	{te = p+1;}
@@ -813,12 +873,11 @@ tr8:
     rb_ary_push(row, field);
     field = Qnil;
   }
-#line 165 "ext/fastcsv/fastcsv.rl"
+#line 168 "ext/fastcsv/fastcsv.rl"
 	{act = 1;}
-#line 117 "ext/fastcsv/fastcsv.rl"
+#line 119 "ext/fastcsv/fastcsv.rl"
 	{
     mark_row_sep = p;
-    curline++;
 
     if (d->start == 0 || p == d->start) {
       rb_ivar_set(self, s_row, rb_str_new2(""));
@@ -835,14 +894,13 @@ tr8:
     rb_yield(row);
     row = rb_ary_new();
   }
-	goto st7;
-tr14:
+	goto st6;
+tr13:
 #line 1 "NONE"
 	{te = p+1;}
-#line 117 "ext/fastcsv/fastcsv.rl"
+#line 119 "ext/fastcsv/fastcsv.rl"
 	{
     mark_row_sep = p;
-    curline++;
 
     if (d->start == 0 || p == d->start) {
       rb_ivar_set(self, s_row, rb_str_new2(""));
@@ -859,10 +917,10 @@ tr14:
     rb_yield(row);
     row = rb_ary_new();
   }
-#line 166 "ext/fastcsv/fastcsv.rl"
+#line 169 "ext/fastcsv/fastcsv.rl"
 	{act = 2;}
-	goto st7;
-tr21:
+	goto st6;
+tr20:
 #line 1 "NONE"
 	{te = p+1;}
 #line 95 "ext/fastcsv/fastcsv.rl"
@@ -870,12 +928,11 @@ tr21:
     rb_ary_push(row, field);
     field = Qnil;
   }
-#line 165 "ext/fastcsv/fastcsv.rl"
+#line 168 "ext/fastcsv/fastcsv.rl"
 	{act = 1;}
-#line 117 "ext/fastcsv/fastcsv.rl"
+#line 119 "ext/fastcsv/fastcsv.rl"
 	{
     mark_row_sep = p;
-    curline++;
 
     if (d->start == 0 || p == d->start) {
       rb_ivar_set(self, s_row, rb_str_new2(""));
@@ -892,19 +949,112 @@ tr21:
     rb_yield(row);
     row = rb_ary_new();
   }
-	goto st7;
-tr44:
+	goto st6;
+tr38:
 #line 1 "NONE"
 	{te = p+1;}
-#line 166 "ext/fastcsv/fastcsv.rl"
+#line 169 "ext/fastcsv/fastcsv.rl"
 	{act = 2;}
-	goto st7;
-st7:
+	goto st6;
+tr46:
+#line 1 "NONE"
+	{te = p+1;}
+#line 119 "ext/fastcsv/fastcsv.rl"
+	{
+    mark_row_sep = p;
+
+    if (d->start == 0 || p == d->start) {
+      rb_ivar_set(self, s_row, rb_str_new2(""));
+    }
+    else if (p > d->start) {
+      rb_ivar_set(self, s_row, rb_str_new(d->start, p - d->start));
+    }
+
+    if (!NIL_P(field) || RARRAY_LEN(row)) { // same as new_field
+      rb_ary_push(row, field);
+      field = Qnil;
+    }
+
+    rb_yield(row);
+    row = rb_ary_new();
+  }
+#line 100 "ext/fastcsv/fastcsv.rl"
+	{
+    d->start = p;
+
+    if (len_row_sep) {
+      if (p - mark_row_sep != len_row_sep || row_sep[0] != *mark_row_sep || (len_row_sep == 2 && row_sep[1] != *(mark_row_sep + 1))) {
+        FREE;
+
+        rb_raise(eError, "Unquoted fields do not allow \\r or \\n (line %d).", curline);
+      }
+    }
+    else {
+      len_row_sep = p - mark_row_sep;
+      row_sep = ALLOC_N(char, len_row_sep);
+      memcpy(row_sep, mark_row_sep, len_row_sep);
+    }
+
+    curline++;
+  }
+#line 169 "ext/fastcsv/fastcsv.rl"
+	{act = 2;}
+	goto st6;
+tr53:
+#line 1 "NONE"
+	{te = p+1;}
+#line 95 "ext/fastcsv/fastcsv.rl"
+	{
+    rb_ary_push(row, field);
+    field = Qnil;
+  }
+#line 168 "ext/fastcsv/fastcsv.rl"
+	{act = 1;}
+#line 119 "ext/fastcsv/fastcsv.rl"
+	{
+    mark_row_sep = p;
+
+    if (d->start == 0 || p == d->start) {
+      rb_ivar_set(self, s_row, rb_str_new2(""));
+    }
+    else if (p > d->start) {
+      rb_ivar_set(self, s_row, rb_str_new(d->start, p - d->start));
+    }
+
+    if (!NIL_P(field) || RARRAY_LEN(row)) { // same as new_field
+      rb_ary_push(row, field);
+      field = Qnil;
+    }
+
+    rb_yield(row);
+    row = rb_ary_new();
+  }
+#line 100 "ext/fastcsv/fastcsv.rl"
+	{
+    d->start = p;
+
+    if (len_row_sep) {
+      if (p - mark_row_sep != len_row_sep || row_sep[0] != *mark_row_sep || (len_row_sep == 2 && row_sep[1] != *(mark_row_sep + 1))) {
+        FREE;
+
+        rb_raise(eError, "Unquoted fields do not allow \\r or \\n (line %d).", curline);
+      }
+    }
+    else {
+      len_row_sep = p - mark_row_sep;
+      row_sep = ALLOC_N(char, len_row_sep);
+      memcpy(row_sep, mark_row_sep, len_row_sep);
+    }
+
+    curline++;
+  }
+	goto st6;
+st6:
 	if ( ++p == pe )
-		goto _test_eof7;
-case 7:
-#line 907 "ext/fastcsv/fastcsv.c"
-	goto tr43;
+		goto _test_eof6;
+case 6:
+#line 1057 "ext/fastcsv/fastcsv.c"
+	goto tr37;
 tr4:
 #line 1 "NONE"
 	{te = p+1;}
@@ -919,10 +1069,9 @@ tr4:
       ENCODE;
     }
   }
-#line 117 "ext/fastcsv/fastcsv.rl"
+#line 119 "ext/fastcsv/fastcsv.rl"
 	{
     mark_row_sep = p;
-    curline++;
 
     if (d->start == 0 || p == d->start) {
       rb_ivar_set(self, s_row, rb_str_new2(""));
@@ -939,9 +1088,9 @@ tr4:
     rb_yield(row);
     row = rb_ary_new();
   }
-#line 166 "ext/fastcsv/fastcsv.rl"
+#line 169 "ext/fastcsv/fastcsv.rl"
 	{act = 2;}
-	goto st8;
+	goto st7;
 tr9:
 #line 1 "NONE"
 	{te = p+1;}
@@ -961,12 +1110,11 @@ tr9:
     rb_ary_push(row, field);
     field = Qnil;
   }
-#line 165 "ext/fastcsv/fastcsv.rl"
+#line 168 "ext/fastcsv/fastcsv.rl"
 	{act = 1;}
-#line 117 "ext/fastcsv/fastcsv.rl"
+#line 119 "ext/fastcsv/fastcsv.rl"
 	{
     mark_row_sep = p;
-    curline++;
 
     if (d->start == 0 || p == d->start) {
       rb_ivar_set(self, s_row, rb_str_new2(""));
@@ -983,14 +1131,13 @@ tr9:
     rb_yield(row);
     row = rb_ary_new();
   }
-	goto st8;
-tr15:
+	goto st7;
+tr14:
 #line 1 "NONE"
 	{te = p+1;}
-#line 117 "ext/fastcsv/fastcsv.rl"
+#line 119 "ext/fastcsv/fastcsv.rl"
 	{
     mark_row_sep = p;
-    curline++;
 
     if (d->start == 0 || p == d->start) {
       rb_ivar_set(self, s_row, rb_str_new2(""));
@@ -1007,10 +1154,10 @@ tr15:
     rb_yield(row);
     row = rb_ary_new();
   }
-#line 166 "ext/fastcsv/fastcsv.rl"
+#line 169 "ext/fastcsv/fastcsv.rl"
 	{act = 2;}
-	goto st8;
-tr22:
+	goto st7;
+tr21:
 #line 1 "NONE"
 	{te = p+1;}
 #line 95 "ext/fastcsv/fastcsv.rl"
@@ -1018,12 +1165,11 @@ tr22:
     rb_ary_push(row, field);
     field = Qnil;
   }
-#line 165 "ext/fastcsv/fastcsv.rl"
+#line 168 "ext/fastcsv/fastcsv.rl"
 	{act = 1;}
-#line 117 "ext/fastcsv/fastcsv.rl"
+#line 119 "ext/fastcsv/fastcsv.rl"
 	{
     mark_row_sep = p;
-    curline++;
 
     if (d->start == 0 || p == d->start) {
       rb_ivar_set(self, s_row, rb_str_new2(""));
@@ -1040,16 +1186,109 @@ tr22:
     rb_yield(row);
     row = rb_ary_new();
   }
-	goto st8;
-st8:
-	if ( ++p == pe )
-		goto _test_eof8;
-case 8:
-#line 1049 "ext/fastcsv/fastcsv.c"
-	if ( (*p) == 10 )
-		goto tr44;
-	goto tr43;
-tr33:
+	goto st7;
+tr47:
+#line 1 "NONE"
+	{te = p+1;}
+#line 119 "ext/fastcsv/fastcsv.rl"
+	{
+    mark_row_sep = p;
+
+    if (d->start == 0 || p == d->start) {
+      rb_ivar_set(self, s_row, rb_str_new2(""));
+    }
+    else if (p > d->start) {
+      rb_ivar_set(self, s_row, rb_str_new(d->start, p - d->start));
+    }
+
+    if (!NIL_P(field) || RARRAY_LEN(row)) { // same as new_field
+      rb_ary_push(row, field);
+      field = Qnil;
+    }
+
+    rb_yield(row);
+    row = rb_ary_new();
+  }
+#line 100 "ext/fastcsv/fastcsv.rl"
+	{
+    d->start = p;
+
+    if (len_row_sep) {
+      if (p - mark_row_sep != len_row_sep || row_sep[0] != *mark_row_sep || (len_row_sep == 2 && row_sep[1] != *(mark_row_sep + 1))) {
+        FREE;
+
+        rb_raise(eError, "Unquoted fields do not allow \\r or \\n (line %d).", curline);
+      }
+    }
+    else {
+      len_row_sep = p - mark_row_sep;
+      row_sep = ALLOC_N(char, len_row_sep);
+      memcpy(row_sep, mark_row_sep, len_row_sep);
+    }
+
+    curline++;
+  }
+#line 169 "ext/fastcsv/fastcsv.rl"
+	{act = 2;}
+	goto st7;
+tr54:
+#line 1 "NONE"
+	{te = p+1;}
+#line 95 "ext/fastcsv/fastcsv.rl"
+	{
+    rb_ary_push(row, field);
+    field = Qnil;
+  }
+#line 168 "ext/fastcsv/fastcsv.rl"
+	{act = 1;}
+#line 119 "ext/fastcsv/fastcsv.rl"
+	{
+    mark_row_sep = p;
+
+    if (d->start == 0 || p == d->start) {
+      rb_ivar_set(self, s_row, rb_str_new2(""));
+    }
+    else if (p > d->start) {
+      rb_ivar_set(self, s_row, rb_str_new(d->start, p - d->start));
+    }
+
+    if (!NIL_P(field) || RARRAY_LEN(row)) { // same as new_field
+      rb_ary_push(row, field);
+      field = Qnil;
+    }
+
+    rb_yield(row);
+    row = rb_ary_new();
+  }
+#line 100 "ext/fastcsv/fastcsv.rl"
+	{
+    d->start = p;
+
+    if (len_row_sep) {
+      if (p - mark_row_sep != len_row_sep || row_sep[0] != *mark_row_sep || (len_row_sep == 2 && row_sep[1] != *(mark_row_sep + 1))) {
+        FREE;
+
+        rb_raise(eError, "Unquoted fields do not allow \\r or \\n (line %d).", curline);
+      }
+    }
+    else {
+      len_row_sep = p - mark_row_sep;
+      row_sep = ALLOC_N(char, len_row_sep);
+      memcpy(row_sep, mark_row_sep, len_row_sep);
+    }
+
+    curline++;
+  }
+	goto st7;
+st7:
+	if ( ++p == pe )
+		goto _test_eof7;
+case 7:
+#line 1288 "ext/fastcsv/fastcsv.c"
+	if ( (*p) == 10 )
+		goto tr38;
+	goto tr37;
+tr27:
 #line 1 "NONE"
 	{te = p+1;}
 #line 49 "ext/fastcsv/fastcsv.rl"
@@ -1063,7 +1302,7 @@ tr33:
       ENCODE;
     }
   }
-#line 137 "ext/fastcsv/fastcsv.rl"
+#line 138 "ext/fastcsv/fastcsv.rl"
 	{
     if (d->start == 0 || p == d->start) { // same as new_row
       rb_ivar_set(self, s_row, rb_str_new2(""));
@@ -1080,21 +1319,21 @@ tr33:
       rb_yield(row);
     }
   }
-#line 167 "ext/fastcsv/fastcsv.rl"
+#line 170 "ext/fastcsv/fastcsv.rl"
 	{act = 3;}
-	goto st9;
-st9:
+	goto st8;
+st8:
 	if ( ++p == pe )
-		goto _test_eof9;
-case 9:
-#line 1091 "ext/fastcsv/fastcsv.c"
+		goto _test_eof8;
+case 8:
+#line 1330 "ext/fastcsv/fastcsv.c"
 	_widec = (*p);
 	_widec = (short)(1152 + ((*p) - -128));
 	if ( 
-#line 155 "ext/fastcsv/fastcsv.rl"
+#line 156 "ext/fastcsv/fastcsv.rl"
  (*p) == quote_char  ) _widec += 256;
 	if ( 
-#line 156 "ext/fastcsv/fastcsv.rl"
+#line 157 "ext/fastcsv/fastcsv.rl"
  (*p) == col_sep  ) _widec += 512;
 	if ( _widec < 1291 ) {
 		if ( 1152 <= _widec && _widec <= 1289 )
@@ -1104,14 +1343,14 @@ case 9:
 			goto st1;
 	} else
 		goto st1;
-	goto tr42;
-tr34:
+	goto tr36;
+tr28:
 #line 41 "ext/fastcsv/fastcsv.rl"
 	{
     unclosed_line = curline;
   }
 	goto st2;
-tr45:
+tr39:
 #line 100 "ext/fastcsv/fastcsv.rl"
 	{
     d->start = p;
@@ -1120,7 +1359,7 @@ tr45:
       if (p - mark_row_sep != len_row_sep || row_sep[0] != *mark_row_sep || (len_row_sep == 2 && row_sep[1] != *(mark_row_sep + 1))) {
         FREE;
 
-        rb_raise(eError, "Unquoted fields do not allow \\r or \\n (line %d).", curline - 1);
+        rb_raise(eError, "Unquoted fields do not allow \\r or \\n (line %d).", curline);
       }
     }
     else {
@@ -1128,22 +1367,20 @@ tr45:
       row_sep = ALLOC_N(char, len_row_sep);
       memcpy(row_sep, mark_row_sep, len_row_sep);
     }
+
+    curline++;
   }
 	goto st2;
 st2:
 	if ( ++p == pe )
 		goto _test_eof2;
 case 2:
-#line 1138 "ext/fastcsv/fastcsv.c"
+#line 1379 "ext/fastcsv/fastcsv.c"
 	_widec = (*p);
 	_widec = (short)(128 + ((*p) - -128));
 	if ( 
-#line 155 "ext/fastcsv/fastcsv.rl"
+#line 156 "ext/fastcsv/fastcsv.rl"
  (*p) == quote_char  ) _widec += 256;
-	switch( _widec ) {
-		case 522: goto tr12;
-		case 525: goto tr12;
-	}
 	if ( _widec < 257 ) {
 		if ( 128 <= _widec && _widec <= 255 )
 			goto st2;
@@ -1194,7 +1431,7 @@ tr11:
     unclosed_line = 0;
   }
 	goto st3;
-tr46:
+tr40:
 #line 60 "ext/fastcsv/fastcsv.rl"
 	{
     if (p == ts) {
@@ -1242,7 +1479,7 @@ tr46:
       if (p - mark_row_sep != len_row_sep || row_sep[0] != *mark_row_sep || (len_row_sep == 2 && row_sep[1] != *(mark_row_sep + 1))) {
         FREE;
 
-        rb_raise(eError, "Unquoted fields do not allow \\r or \\n (line %d).", curline - 1);
+        rb_raise(eError, "Unquoted fields do not allow \\r or \\n (line %d).", curline);
       }
     }
     else {
@@ -1250,48 +1487,50 @@ tr46:
       row_sep = ALLOC_N(char, len_row_sep);
       memcpy(row_sep, mark_row_sep, len_row_sep);
     }
+
+    curline++;
   }
 	goto st3;
 st3:
 	if ( ++p == pe )
 		goto _test_eof3;
 case 3:
-#line 1260 "ext/fastcsv/fastcsv.c"
+#line 1499 "ext/fastcsv/fastcsv.c"
 	_widec = (*p);
 	_widec = (short)(1152 + ((*p) - -128));
 	if ( 
-#line 155 "ext/fastcsv/fastcsv.rl"
+#line 156 "ext/fastcsv/fastcsv.rl"
  (*p) == quote_char  ) _widec += 256;
 	if ( 
-#line 156 "ext/fastcsv/fastcsv.rl"
+#line 157 "ext/fastcsv/fastcsv.rl"
  (*p) == col_sep  ) _widec += 512;
 	switch( _widec ) {
-		case 1280: goto tr13;
-		case 1290: goto tr14;
-		case 1293: goto tr15;
-		case 1536: goto tr16;
-		case 1546: goto tr17;
-		case 1549: goto tr18;
-		case 1792: goto tr20;
-		case 1802: goto tr21;
-		case 1805: goto tr22;
-		case 2048: goto tr24;
-		case 2058: goto tr25;
-		case 2061: goto tr26;
+		case 1280: goto tr12;
+		case 1290: goto tr13;
+		case 1293: goto tr14;
+		case 1536: goto tr15;
+		case 1546: goto tr16;
+		case 1549: goto tr17;
+		case 1792: goto tr19;
+		case 1802: goto tr20;
+		case 1805: goto tr21;
+		case 2048: goto tr23;
+		case 2058: goto tr24;
+		case 2061: goto tr25;
 	}
 	if ( _widec < 1664 ) {
 		if ( 1408 <= _widec && _widec <= 1663 )
 			goto st2;
 	} else if ( _widec > 1919 ) {
 		if ( 1920 <= _widec && _widec <= 2175 )
-			goto tr23;
+			goto tr22;
 	} else
-		goto tr19;
+		goto tr18;
 	goto tr0;
-tr16:
+tr15:
 #line 1 "NONE"
 	{te = p+1;}
-#line 137 "ext/fastcsv/fastcsv.rl"
+#line 138 "ext/fastcsv/fastcsv.rl"
 	{
     if (d->start == 0 || p == d->start) { // same as new_row
       rb_ivar_set(self, s_row, rb_str_new2(""));
@@ -1308,10 +1547,10 @@ tr16:
       rb_yield(row);
     }
   }
-#line 167 "ext/fastcsv/fastcsv.rl"
+#line 170 "ext/fastcsv/fastcsv.rl"
 	{act = 3;}
-	goto st10;
-tr23:
+	goto st9;
+tr22:
 #line 1 "NONE"
 	{te = p+1;}
 #line 95 "ext/fastcsv/fastcsv.rl"
@@ -1319,10 +1558,10 @@ tr23:
     rb_ary_push(row, field);
     field = Qnil;
   }
-#line 165 "ext/fastcsv/fastcsv.rl"
+#line 168 "ext/fastcsv/fastcsv.rl"
 	{act = 1;}
-	goto st10;
-tr24:
+	goto st9;
+tr23:
 #line 1 "NONE"
 	{te = p+1;}
 #line 95 "ext/fastcsv/fastcsv.rl"
@@ -1330,9 +1569,9 @@ tr24:
     rb_ary_push(row, field);
     field = Qnil;
   }
-#line 165 "ext/fastcsv/fastcsv.rl"
+#line 168 "ext/fastcsv/fastcsv.rl"
 	{act = 1;}
-#line 137 "ext/fastcsv/fastcsv.rl"
+#line 138 "ext/fastcsv/fastcsv.rl"
 	{
     if (d->start == 0 || p == d->start) { // same as new_row
       rb_ivar_set(self, s_row, rb_str_new2(""));
@@ -1349,8 +1588,8 @@ tr24:
       rb_yield(row);
     }
   }
-	goto st10;
-tr35:
+	goto st9;
+tr29:
 #line 1 "NONE"
 	{te = p+1;}
 #line 41 "ext/fastcsv/fastcsv.rl"
@@ -1368,7 +1607,7 @@ tr35:
       ENCODE;
     }
   }
-#line 137 "ext/fastcsv/fastcsv.rl"
+#line 138 "ext/fastcsv/fastcsv.rl"
 	{
     if (d->start == 0 || p == d->start) { // same as new_row
       rb_ivar_set(self, s_row, rb_str_new2(""));
@@ -1385,10 +1624,10 @@ tr35:
       rb_yield(row);
     }
   }
-#line 167 "ext/fastcsv/fastcsv.rl"
+#line 170 "ext/fastcsv/fastcsv.rl"
 	{act = 3;}
-	goto st10;
-tr38:
+	goto st9;
+tr32:
 #line 1 "NONE"
 	{te = p+1;}
 #line 49 "ext/fastcsv/fastcsv.rl"
@@ -1411,10 +1650,10 @@ tr38:
     rb_ary_push(row, field);
     field = Qnil;
   }
-#line 165 "ext/fastcsv/fastcsv.rl"
+#line 168 "ext/fastcsv/fastcsv.rl"
 	{act = 1;}
-	goto st10;
-tr39:
+	goto st9;
+tr33:
 #line 1 "NONE"
 	{te = p+1;}
 #line 49 "ext/fastcsv/fastcsv.rl"
@@ -1437,9 +1676,9 @@ tr39:
     rb_ary_push(row, field);
     field = Qnil;
   }
-#line 165 "ext/fastcsv/fastcsv.rl"
+#line 168 "ext/fastcsv/fastcsv.rl"
 	{act = 1;}
-#line 137 "ext/fastcsv/fastcsv.rl"
+#line 138 "ext/fastcsv/fastcsv.rl"
 	{
     if (d->start == 0 || p == d->start) { // same as new_row
       rb_ivar_set(self, s_row, rb_str_new2(""));
@@ -1456,7 +1695,49 @@ tr39:
       rb_yield(row);
     }
   }
-	goto st10;
+	goto st9;
+tr48:
+#line 1 "NONE"
+	{te = p+1;}
+#line 100 "ext/fastcsv/fastcsv.rl"
+	{
+    d->start = p;
+
+    if (len_row_sep) {
+      if (p - mark_row_sep != len_row_sep || row_sep[0] != *mark_row_sep || (len_row_sep == 2 && row_sep[1] != *(mark_row_sep + 1))) {
+        FREE;
+
+        rb_raise(eError, "Unquoted fields do not allow \\r or \\n (line %d).", curline);
+      }
+    }
+    else {
+      len_row_sep = p - mark_row_sep;
+      row_sep = ALLOC_N(char, len_row_sep);
+      memcpy(row_sep, mark_row_sep, len_row_sep);
+    }
+
+    curline++;
+  }
+#line 138 "ext/fastcsv/fastcsv.rl"
+	{
+    if (d->start == 0 || p == d->start) { // same as new_row
+      rb_ivar_set(self, s_row, rb_str_new2(""));
+    }
+    else if (p > d->start) {
+      rb_ivar_set(self, s_row, rb_str_new(d->start, p - d->start));
+    }
+
+    if (!NIL_P(field) || RARRAY_LEN(row)) {
+      rb_ary_push(row, field);
+    }
+
+    if (RARRAY_LEN(row)) {
+      rb_yield(row);
+    }
+  }
+#line 170 "ext/fastcsv/fastcsv.rl"
+	{act = 3;}
+	goto st9;
 tr55:
 #line 1 "NONE"
 	{te = p+1;}
@@ -1465,7 +1746,7 @@ tr55:
     rb_ary_push(row, field);
     field = Qnil;
   }
-#line 165 "ext/fastcsv/fastcsv.rl"
+#line 168 "ext/fastcsv/fastcsv.rl"
 	{act = 1;}
 #line 100 "ext/fastcsv/fastcsv.rl"
 	{
@@ -1475,7 +1756,7 @@ tr55:
       if (p - mark_row_sep != len_row_sep || row_sep[0] != *mark_row_sep || (len_row_sep == 2 && row_sep[1] != *(mark_row_sep + 1))) {
         FREE;
 
-        rb_raise(eError, "Unquoted fields do not allow \\r or \\n (line %d).", curline - 1);
+        rb_raise(eError, "Unquoted fields do not allow \\r or \\n (line %d).", curline);
       }
     }
     else {
@@ -1483,22 +1764,67 @@ tr55:
       row_sep = ALLOC_N(char, len_row_sep);
       memcpy(row_sep, mark_row_sep, len_row_sep);
     }
+
+    curline++;
   }
-	goto st10;
-st10:
+	goto st9;
+tr56:
+#line 1 "NONE"
+	{te = p+1;}
+#line 95 "ext/fastcsv/fastcsv.rl"
+	{
+    rb_ary_push(row, field);
+    field = Qnil;
+  }
+#line 168 "ext/fastcsv/fastcsv.rl"
+	{act = 1;}
+#line 100 "ext/fastcsv/fastcsv.rl"
+	{
+    d->start = p;
+
+    if (len_row_sep) {
+      if (p - mark_row_sep != len_row_sep || row_sep[0] != *mark_row_sep || (len_row_sep == 2 && row_sep[1] != *(mark_row_sep + 1))) {
+        FREE;
+
+        rb_raise(eError, "Unquoted fields do not allow \\r or \\n (line %d).", curline);
+      }
+    }
+    else {
+      len_row_sep = p - mark_row_sep;
+      row_sep = ALLOC_N(char, len_row_sep);
+      memcpy(row_sep, mark_row_sep, len_row_sep);
+    }
+
+    curline++;
+  }
+#line 138 "ext/fastcsv/fastcsv.rl"
+	{
+    if (d->start == 0 || p == d->start) { // same as new_row
+      rb_ivar_set(self, s_row, rb_str_new2(""));
+    }
+    else if (p > d->start) {
+      rb_ivar_set(self, s_row, rb_str_new(d->start, p - d->start));
+    }
+
+    if (!NIL_P(field) || RARRAY_LEN(row)) {
+      rb_ary_push(row, field);
+    }
+
+    if (RARRAY_LEN(row)) {
+      rb_yield(row);
+    }
+  }
+	goto st9;
+st9:
 	if ( ++p == pe )
-		goto _test_eof10;
-case 10:
-#line 1493 "ext/fastcsv/fastcsv.c"
+		goto _test_eof9;
+case 9:
+#line 1823 "ext/fastcsv/fastcsv.c"
 	_widec = (*p);
 	_widec = (short)(128 + ((*p) - -128));
 	if ( 
-#line 155 "ext/fastcsv/fastcsv.rl"
+#line 156 "ext/fastcsv/fastcsv.rl"
  (*p) == quote_char  ) _widec += 256;
-	switch( _widec ) {
-		case 522: goto tr12;
-		case 525: goto tr12;
-	}
 	if ( _widec < 257 ) {
 		if ( 128 <= _widec && _widec <= 255 )
 			goto st2;
@@ -1508,151 +1834,12 @@ case 10:
 	} else
 		goto st2;
 	goto tr0;
-tr12:
-#line 60 "ext/fastcsv/fastcsv.rl"
+tr16:
+#line 1 "NONE"
+	{te = p+1;}
+#line 119 "ext/fastcsv/fastcsv.rl"
 	{
-    if (p == ts) {
-      field = rb_enc_str_new("", 0, encoding);
-      ENCODE;
-    }
-    // @note If we add an action on '""', we can skip some steps if no '""' is found.
-    else if (p > ts) {
-      // Operating on ts in-place produces odd behavior, FYI.
-      char *copy = ALLOC_N(char, p - ts);
-      memcpy(copy, ts, p - ts);
-
-      char *reader = ts, *writer = copy;
-      int escaped = 0;
-
-      while (p > reader) {
-        if (*reader == quote_char && !escaped) {
-          // Skip the escaping character.
-          escaped = 1;
-        }
-        else {
-          escaped = 0;
-          *writer++ = *reader;
-        }
-        reader++;
-      }
-
-      field = rb_enc_str_new(copy, writer - copy, encoding);
-      ENCODE;
-
-      if (copy != NULL) {
-        free(copy);
-      }
-    }
-  }
-#line 45 "ext/fastcsv/fastcsv.rl"
-	{
-    unclosed_line = 0;
-  }
-	goto st4;
-tr47:
-#line 60 "ext/fastcsv/fastcsv.rl"
-	{
-    if (p == ts) {
-      field = rb_enc_str_new("", 0, encoding);
-      ENCODE;
-    }
-    // @note If we add an action on '""', we can skip some steps if no '""' is found.
-    else if (p > ts) {
-      // Operating on ts in-place produces odd behavior, FYI.
-      char *copy = ALLOC_N(char, p - ts);
-      memcpy(copy, ts, p - ts);
-
-      char *reader = ts, *writer = copy;
-      int escaped = 0;
-
-      while (p > reader) {
-        if (*reader == quote_char && !escaped) {
-          // Skip the escaping character.
-          escaped = 1;
-        }
-        else {
-          escaped = 0;
-          *writer++ = *reader;
-        }
-        reader++;
-      }
-
-      field = rb_enc_str_new(copy, writer - copy, encoding);
-      ENCODE;
-
-      if (copy != NULL) {
-        free(copy);
-      }
-    }
-  }
-#line 45 "ext/fastcsv/fastcsv.rl"
-	{
-    unclosed_line = 0;
-  }
-#line 100 "ext/fastcsv/fastcsv.rl"
-	{
-    d->start = p;
-
-    if (len_row_sep) {
-      if (p - mark_row_sep != len_row_sep || row_sep[0] != *mark_row_sep || (len_row_sep == 2 && row_sep[1] != *(mark_row_sep + 1))) {
-        FREE;
-
-        rb_raise(eError, "Unquoted fields do not allow \\r or \\n (line %d).", curline - 1);
-      }
-    }
-    else {
-      len_row_sep = p - mark_row_sep;
-      row_sep = ALLOC_N(char, len_row_sep);
-      memcpy(row_sep, mark_row_sep, len_row_sep);
-    }
-  }
-	goto st4;
-st4:
-	if ( ++p == pe )
-		goto _test_eof4;
-case 4:
-#line 1615 "ext/fastcsv/fastcsv.c"
-	_widec = (*p);
-	_widec = (short)(1152 + ((*p) - -128));
-	if ( 
-#line 155 "ext/fastcsv/fastcsv.rl"
- (*p) == quote_char  ) _widec += 256;
-	if ( 
-#line 156 "ext/fastcsv/fastcsv.rl"
- (*p) == col_sep  ) _widec += 512;
-	switch( _widec ) {
-		case 1280: goto tr13;
-		case 1290: goto tr17;
-		case 1293: goto tr18;
-		case 1536: goto tr27;
-		case 1546: goto tr28;
-		case 1549: goto tr28;
-		case 1792: goto tr20;
-		case 1802: goto tr25;
-		case 1805: goto tr26;
-		case 2048: goto tr30;
-		case 2058: goto tr31;
-		case 2061: goto tr31;
-	}
-	if ( _widec < 1408 ) {
-		if ( 1152 <= _widec && _widec <= 1407 )
-			goto st2;
-	} else if ( _widec > 1663 ) {
-		if ( _widec > 1919 ) {
-			if ( 1920 <= _widec && _widec <= 2175 )
-				goto tr29;
-		} else if ( _widec >= 1664 )
-			goto tr23;
-	} else
-		goto tr12;
-	goto tr0;
-tr17:
-#line 1 "NONE"
-	{te = p+1;}
-#line 117 "ext/fastcsv/fastcsv.rl"
-	{
-    mark_row_sep = p;
-    curline++;
+    mark_row_sep = p;
 
     if (d->start == 0 || p == d->start) {
       rb_ivar_set(self, s_row, rb_str_new2(""));
@@ -1669,10 +1856,10 @@ tr17:
     rb_yield(row);
     row = rb_ary_new();
   }
-#line 166 "ext/fastcsv/fastcsv.rl"
+#line 169 "ext/fastcsv/fastcsv.rl"
 	{act = 2;}
-	goto st11;
-tr25:
+	goto st10;
+tr24:
 #line 1 "NONE"
 	{te = p+1;}
 #line 95 "ext/fastcsv/fastcsv.rl"
@@ -1680,12 +1867,11 @@ tr25:
     rb_ary_push(row, field);
     field = Qnil;
   }
-#line 165 "ext/fastcsv/fastcsv.rl"
+#line 168 "ext/fastcsv/fastcsv.rl"
 	{act = 1;}
-#line 117 "ext/fastcsv/fastcsv.rl"
+#line 119 "ext/fastcsv/fastcsv.rl"
 	{
     mark_row_sep = p;
-    curline++;
 
     if (d->start == 0 || p == d->start) {
       rb_ivar_set(self, s_row, rb_str_new2(""));
@@ -1702,8 +1888,8 @@ tr25:
     rb_yield(row);
     row = rb_ary_new();
   }
-	goto st11;
-tr36:
+	goto st10;
+tr30:
 #line 1 "NONE"
 	{te = p+1;}
 #line 41 "ext/fastcsv/fastcsv.rl"
@@ -1721,10 +1907,9 @@ tr36:
       ENCODE;
     }
   }
-#line 117 "ext/fastcsv/fastcsv.rl"
+#line 119 "ext/fastcsv/fastcsv.rl"
 	{
     mark_row_sep = p;
-    curline++;
 
     if (d->start == 0 || p == d->start) {
       rb_ivar_set(self, s_row, rb_str_new2(""));
@@ -1741,10 +1926,10 @@ tr36:
     rb_yield(row);
     row = rb_ary_new();
   }
-#line 166 "ext/fastcsv/fastcsv.rl"
+#line 169 "ext/fastcsv/fastcsv.rl"
 	{act = 2;}
-	goto st11;
-tr40:
+	goto st10;
+tr34:
 #line 1 "NONE"
 	{te = p+1;}
 #line 49 "ext/fastcsv/fastcsv.rl"
@@ -1767,12 +1952,11 @@ tr40:
     rb_ary_push(row, field);
     field = Qnil;
   }
-#line 165 "ext/fastcsv/fastcsv.rl"
+#line 168 "ext/fastcsv/fastcsv.rl"
 	{act = 1;}
-#line 117 "ext/fastcsv/fastcsv.rl"
+#line 119 "ext/fastcsv/fastcsv.rl"
 	{
     mark_row_sep = p;
-    curline++;
 
     if (d->start == 0 || p == d->start) {
       rb_ivar_set(self, s_row, rb_str_new2(""));
@@ -1789,8 +1973,8 @@ tr40:
     rb_yield(row);
     row = rb_ary_new();
   }
-	goto st11;
-tr48:
+	goto st10;
+tr41:
 #line 1 "NONE"
 	{te = p+1;}
 #line 100 "ext/fastcsv/fastcsv.rl"
@@ -1801,7 +1985,7 @@ tr48:
       if (p - mark_row_sep != len_row_sep || row_sep[0] != *mark_row_sep || (len_row_sep == 2 && row_sep[1] != *(mark_row_sep + 1))) {
         FREE;
 
-        rb_raise(eError, "Unquoted fields do not allow \\r or \\n (line %d).", curline - 1);
+        rb_raise(eError, "Unquoted fields do not allow \\r or \\n (line %d).", curline);
       }
     }
     else {
@@ -1809,17 +1993,18 @@ tr48:
       row_sep = ALLOC_N(char, len_row_sep);
       memcpy(row_sep, mark_row_sep, len_row_sep);
     }
+
+    curline++;
   }
-#line 166 "ext/fastcsv/fastcsv.rl"
+#line 169 "ext/fastcsv/fastcsv.rl"
 	{act = 2;}
-	goto st11;
-tr51:
+	goto st10;
+tr49:
 #line 1 "NONE"
 	{te = p+1;}
-#line 117 "ext/fastcsv/fastcsv.rl"
+#line 119 "ext/fastcsv/fastcsv.rl"
 	{
     mark_row_sep = p;
-    curline++;
 
     if (d->start == 0 || p == d->start) {
       rb_ivar_set(self, s_row, rb_str_new2(""));
@@ -1844,7 +2029,7 @@ tr51:
       if (p - mark_row_sep != len_row_sep || row_sep[0] != *mark_row_sep || (len_row_sep == 2 && row_sep[1] != *(mark_row_sep + 1))) {
         FREE;
 
-        rb_raise(eError, "Unquoted fields do not allow \\r or \\n (line %d).", curline - 1);
+        rb_raise(eError, "Unquoted fields do not allow \\r or \\n (line %d).", curline);
       }
     }
     else {
@@ -1852,10 +2037,12 @@ tr51:
       row_sep = ALLOC_N(char, len_row_sep);
       memcpy(row_sep, mark_row_sep, len_row_sep);
     }
+
+    curline++;
   }
-#line 166 "ext/fastcsv/fastcsv.rl"
+#line 169 "ext/fastcsv/fastcsv.rl"
 	{act = 2;}
-	goto st11;
+	goto st10;
 tr57:
 #line 1 "NONE"
 	{te = p+1;}
@@ -1864,12 +2051,11 @@ tr57:
     rb_ary_push(row, field);
     field = Qnil;
   }
-#line 165 "ext/fastcsv/fastcsv.rl"
+#line 168 "ext/fastcsv/fastcsv.rl"
 	{act = 1;}
-#line 117 "ext/fastcsv/fastcsv.rl"
+#line 119 "ext/fastcsv/fastcsv.rl"
 	{
     mark_row_sep = p;
-    curline++;
 
     if (d->start == 0 || p == d->start) {
       rb_ivar_set(self, s_row, rb_str_new2(""));
@@ -1894,7 +2080,7 @@ tr57:
       if (p - mark_row_sep != len_row_sep || row_sep[0] != *mark_row_sep || (len_row_sep == 2 && row_sep[1] != *(mark_row_sep + 1))) {
         FREE;
 
-        rb_raise(eError, "Unquoted fields do not allow \\r or \\n (line %d).", curline - 1);
+        rb_raise(eError, "Unquoted fields do not allow \\r or \\n (line %d).", curline);
       }
     }
     else {
@@ -1902,36 +2088,34 @@ tr57:
       row_sep = ALLOC_N(char, len_row_sep);
       memcpy(row_sep, mark_row_sep, len_row_sep);
     }
+
+    curline++;
   }
-	goto st11;
-st11:
+	goto st10;
+st10:
 	if ( ++p == pe )
-		goto _test_eof11;
-case 11:
-#line 1912 "ext/fastcsv/fastcsv.c"
+		goto _test_eof10;
+case 10:
+#line 2100 "ext/fastcsv/fastcsv.c"
 	_widec = (*p);
 	_widec = (short)(128 + ((*p) - -128));
 	if ( 
-#line 155 "ext/fastcsv/fastcsv.rl"
+#line 156 "ext/fastcsv/fastcsv.rl"
  (*p) == quote_char  ) _widec += 256;
-	switch( _widec ) {
-		case 256: goto tr43;
-		case 522: goto tr47;
-		case 525: goto tr47;
-	}
+	if ( _widec == 256 )
+		goto tr37;
 	if ( _widec > 383 ) {
 		if ( 384 <= _widec && _widec <= 639 )
-			goto tr46;
+			goto tr40;
 	} else if ( _widec >= 128 )
-		goto tr45;
+		goto tr39;
 	goto tr0;
-tr18:
+tr17:
 #line 1 "NONE"
 	{te = p+1;}
-#line 117 "ext/fastcsv/fastcsv.rl"
+#line 119 "ext/fastcsv/fastcsv.rl"
 	{
     mark_row_sep = p;
-    curline++;
 
     if (d->start == 0 || p == d->start) {
       rb_ivar_set(self, s_row, rb_str_new2(""));
@@ -1948,10 +2132,10 @@ tr18:
     rb_yield(row);
     row = rb_ary_new();
   }
-#line 166 "ext/fastcsv/fastcsv.rl"
+#line 169 "ext/fastcsv/fastcsv.rl"
 	{act = 2;}
-	goto st12;
-tr26:
+	goto st11;
+tr25:
 #line 1 "NONE"
 	{te = p+1;}
 #line 95 "ext/fastcsv/fastcsv.rl"
@@ -1959,12 +2143,11 @@ tr26:
     rb_ary_push(row, field);
     field = Qnil;
   }
-#line 165 "ext/fastcsv/fastcsv.rl"
+#line 168 "ext/fastcsv/fastcsv.rl"
 	{act = 1;}
-#line 117 "ext/fastcsv/fastcsv.rl"
+#line 119 "ext/fastcsv/fastcsv.rl"
 	{
     mark_row_sep = p;
-    curline++;
 
     if (d->start == 0 || p == d->start) {
       rb_ivar_set(self, s_row, rb_str_new2(""));
@@ -1981,8 +2164,8 @@ tr26:
     rb_yield(row);
     row = rb_ary_new();
   }
-	goto st12;
-tr37:
+	goto st11;
+tr31:
 #line 1 "NONE"
 	{te = p+1;}
 #line 41 "ext/fastcsv/fastcsv.rl"
@@ -2000,10 +2183,9 @@ tr37:
       ENCODE;
     }
   }
-#line 117 "ext/fastcsv/fastcsv.rl"
+#line 119 "ext/fastcsv/fastcsv.rl"
 	{
     mark_row_sep = p;
-    curline++;
 
     if (d->start == 0 || p == d->start) {
       rb_ivar_set(self, s_row, rb_str_new2(""));
@@ -2020,10 +2202,10 @@ tr37:
     rb_yield(row);
     row = rb_ary_new();
   }
-#line 166 "ext/fastcsv/fastcsv.rl"
+#line 169 "ext/fastcsv/fastcsv.rl"
 	{act = 2;}
-	goto st12;
-tr41:
+	goto st11;
+tr35:
 #line 1 "NONE"
 	{te = p+1;}
 #line 49 "ext/fastcsv/fastcsv.rl"
@@ -2046,12 +2228,11 @@ tr41:
     rb_ary_push(row, field);
     field = Qnil;
   }
-#line 165 "ext/fastcsv/fastcsv.rl"
+#line 168 "ext/fastcsv/fastcsv.rl"
 	{act = 1;}
-#line 117 "ext/fastcsv/fastcsv.rl"
+#line 119 "ext/fastcsv/fastcsv.rl"
 	{
     mark_row_sep = p;
-    curline++;
 
     if (d->start == 0 || p == d->start) {
       rb_ivar_set(self, s_row, rb_str_new2(""));
@@ -2068,14 +2249,13 @@ tr41:
     rb_yield(row);
     row = rb_ary_new();
   }
-	goto st12;
-tr52:
+	goto st11;
+tr50:
 #line 1 "NONE"
 	{te = p+1;}
-#line 117 "ext/fastcsv/fastcsv.rl"
+#line 119 "ext/fastcsv/fastcsv.rl"
 	{
     mark_row_sep = p;
-    curline++;
 
     if (d->start == 0 || p == d->start) {
       rb_ivar_set(self, s_row, rb_str_new2(""));
@@ -2100,7 +2280,7 @@ tr52:
       if (p - mark_row_sep != len_row_sep || row_sep[0] != *mark_row_sep || (len_row_sep == 2 && row_sep[1] != *(mark_row_sep + 1))) {
         FREE;
 
-        rb_raise(eError, "Unquoted fields do not allow \\r or \\n (line %d).", curline - 1);
+        rb_raise(eError, "Unquoted fields do not allow \\r or \\n (line %d).", curline);
       }
     }
     else {
@@ -2108,10 +2288,12 @@ tr52:
       row_sep = ALLOC_N(char, len_row_sep);
       memcpy(row_sep, mark_row_sep, len_row_sep);
     }
+
+    curline++;
   }
-#line 166 "ext/fastcsv/fastcsv.rl"
+#line 169 "ext/fastcsv/fastcsv.rl"
 	{act = 2;}
-	goto st12;
+	goto st11;
 tr58:
 #line 1 "NONE"
 	{te = p+1;}
@@ -2120,12 +2302,11 @@ tr58:
     rb_ary_push(row, field);
     field = Qnil;
   }
-#line 165 "ext/fastcsv/fastcsv.rl"
+#line 168 "ext/fastcsv/fastcsv.rl"
 	{act = 1;}
-#line 117 "ext/fastcsv/fastcsv.rl"
+#line 119 "ext/fastcsv/fastcsv.rl"
 	{
     mark_row_sep = p;
-    curline++;
 
     if (d->start == 0 || p == d->start) {
       rb_ivar_set(self, s_row, rb_str_new2(""));
@@ -2150,7 +2331,7 @@ tr58:
       if (p - mark_row_sep != len_row_sep || row_sep[0] != *mark_row_sep || (len_row_sep == 2 && row_sep[1] != *(mark_row_sep + 1))) {
         FREE;
 
-        rb_raise(eError, "Unquoted fields do not allow \\r or \\n (line %d).", curline - 1);
+        rb_raise(eError, "Unquoted fields do not allow \\r or \\n (line %d).", curline);
       }
     }
     else {
@@ -2158,31 +2339,32 @@ tr58:
       row_sep = ALLOC_N(char, len_row_sep);
       memcpy(row_sep, mark_row_sep, len_row_sep);
     }
+
+    curline++;
   }
-	goto st12;
-st12:
+	goto st11;
+st11:
 	if ( ++p == pe )
-		goto _test_eof12;
-case 12:
-#line 2168 "ext/fastcsv/fastcsv.c"
+		goto _test_eof11;
+case 11:
+#line 2351 "ext/fastcsv/fastcsv.c"
 	_widec = (*p);
 	_widec = (short)(128 + ((*p) - -128));
 	if ( 
-#line 155 "ext/fastcsv/fastcsv.rl"
+#line 156 "ext/fastcsv/fastcsv.rl"
  (*p) == quote_char  ) _widec += 256;
 	switch( _widec ) {
-		case 256: goto tr43;
-		case 266: goto tr48;
-		case 522: goto tr49;
-		case 525: goto tr47;
+		case 256: goto tr37;
+		case 266: goto tr41;
+		case 522: goto tr42;
 	}
 	if ( _widec > 383 ) {
 		if ( 384 <= _widec && _widec <= 639 )
-			goto tr46;
+			goto tr40;
 	} else if ( _widec >= 128 )
-		goto tr45;
+		goto tr39;
 	goto tr0;
-tr28:
+tr42:
 #line 1 "NONE"
 	{te = p+1;}
 #line 60 "ext/fastcsv/fastcsv.rl"
@@ -2224,857 +2406,103 @@ tr28:
 	{
     unclosed_line = 0;
   }
-#line 117 "ext/fastcsv/fastcsv.rl"
+#line 100 "ext/fastcsv/fastcsv.rl"
 	{
-    mark_row_sep = p;
-    curline++;
+    d->start = p;
 
-    if (d->start == 0 || p == d->start) {
-      rb_ivar_set(self, s_row, rb_str_new2(""));
-    }
-    else if (p > d->start) {
-      rb_ivar_set(self, s_row, rb_str_new(d->start, p - d->start));
-    }
+    if (len_row_sep) {
+      if (p - mark_row_sep != len_row_sep || row_sep[0] != *mark_row_sep || (len_row_sep == 2 && row_sep[1] != *(mark_row_sep + 1))) {
+        FREE;
 
-    if (!NIL_P(field) || RARRAY_LEN(row)) { // same as new_field
-      rb_ary_push(row, field);
-      field = Qnil;
+        rb_raise(eError, "Unquoted fields do not allow \\r or \\n (line %d).", curline);
+      }
+    }
+    else {
+      len_row_sep = p - mark_row_sep;
+      row_sep = ALLOC_N(char, len_row_sep);
+      memcpy(row_sep, mark_row_sep, len_row_sep);
     }
 
-    rb_yield(row);
-    row = rb_ary_new();
+    curline++;
   }
-#line 166 "ext/fastcsv/fastcsv.rl"
+#line 169 "ext/fastcsv/fastcsv.rl"
 	{act = 2;}
-	goto st13;
-tr31:
-#line 1 "NONE"
-	{te = p+1;}
-#line 60 "ext/fastcsv/fastcsv.rl"
-	{
-    if (p == ts) {
-      field = rb_enc_str_new("", 0, encoding);
-      ENCODE;
-    }
-    // @note If we add an action on '""', we can skip some steps if no '""' is found.
-    else if (p > ts) {
-      // Operating on ts in-place produces odd behavior, FYI.
-      char *copy = ALLOC_N(char, p - ts);
-      memcpy(copy, ts, p - ts);
-
-      char *reader = ts, *writer = copy;
-      int escaped = 0;
-
-      while (p > reader) {
-        if (*reader == quote_char && !escaped) {
-          // Skip the escaping character.
-          escaped = 1;
-        }
-        else {
-          escaped = 0;
-          *writer++ = *reader;
-        }
-        reader++;
-      }
-
-      field = rb_enc_str_new(copy, writer - copy, encoding);
-      ENCODE;
-
-      if (copy != NULL) {
-        free(copy);
-      }
-    }
-  }
-#line 45 "ext/fastcsv/fastcsv.rl"
-	{
-    unclosed_line = 0;
-  }
-#line 95 "ext/fastcsv/fastcsv.rl"
-	{
-    rb_ary_push(row, field);
-    field = Qnil;
-  }
-#line 165 "ext/fastcsv/fastcsv.rl"
-	{act = 1;}
-#line 117 "ext/fastcsv/fastcsv.rl"
-	{
-    mark_row_sep = p;
-    curline++;
-
-    if (d->start == 0 || p == d->start) {
-      rb_ivar_set(self, s_row, rb_str_new2(""));
-    }
-    else if (p > d->start) {
-      rb_ivar_set(self, s_row, rb_str_new(d->start, p - d->start));
-    }
-
-    if (!NIL_P(field) || RARRAY_LEN(row)) { // same as new_field
-      rb_ary_push(row, field);
-      field = Qnil;
-    }
-
-    rb_yield(row);
-    row = rb_ary_new();
-  }
-	goto st13;
-tr49:
-#line 1 "NONE"
-	{te = p+1;}
-#line 60 "ext/fastcsv/fastcsv.rl"
-	{
-    if (p == ts) {
-      field = rb_enc_str_new("", 0, encoding);
-      ENCODE;
-    }
-    // @note If we add an action on '""', we can skip some steps if no '""' is found.
-    else if (p > ts) {
-      // Operating on ts in-place produces odd behavior, FYI.
-      char *copy = ALLOC_N(char, p - ts);
-      memcpy(copy, ts, p - ts);
-
-      char *reader = ts, *writer = copy;
-      int escaped = 0;
-
-      while (p > reader) {
-        if (*reader == quote_char && !escaped) {
-          // Skip the escaping character.
-          escaped = 1;
-        }
-        else {
-          escaped = 0;
-          *writer++ = *reader;
-        }
-        reader++;
-      }
-
-      field = rb_enc_str_new(copy, writer - copy, encoding);
-      ENCODE;
-
-      if (copy != NULL) {
-        free(copy);
-      }
-    }
-  }
-#line 45 "ext/fastcsv/fastcsv.rl"
-	{
-    unclosed_line = 0;
-  }
-#line 100 "ext/fastcsv/fastcsv.rl"
-	{
-    d->start = p;
-
-    if (len_row_sep) {
-      if (p - mark_row_sep != len_row_sep || row_sep[0] != *mark_row_sep || (len_row_sep == 2 && row_sep[1] != *(mark_row_sep + 1))) {
-        FREE;
-
-        rb_raise(eError, "Unquoted fields do not allow \\r or \\n (line %d).", curline - 1);
-      }
-    }
-    else {
-      len_row_sep = p - mark_row_sep;
-      row_sep = ALLOC_N(char, len_row_sep);
-      memcpy(row_sep, mark_row_sep, len_row_sep);
-    }
-  }
-#line 166 "ext/fastcsv/fastcsv.rl"
-	{act = 2;}
-	goto st13;
-tr54:
-#line 1 "NONE"
-	{te = p+1;}
-#line 60 "ext/fastcsv/fastcsv.rl"
-	{
-    if (p == ts) {
-      field = rb_enc_str_new("", 0, encoding);
-      ENCODE;
-    }
-    // @note If we add an action on '""', we can skip some steps if no '""' is found.
-    else if (p > ts) {
-      // Operating on ts in-place produces odd behavior, FYI.
-      char *copy = ALLOC_N(char, p - ts);
-      memcpy(copy, ts, p - ts);
-
-      char *reader = ts, *writer = copy;
-      int escaped = 0;
-
-      while (p > reader) {
-        if (*reader == quote_char && !escaped) {
-          // Skip the escaping character.
-          escaped = 1;
-        }
-        else {
-          escaped = 0;
-          *writer++ = *reader;
-        }
-        reader++;
-      }
-
-      field = rb_enc_str_new(copy, writer - copy, encoding);
-      ENCODE;
-
-      if (copy != NULL) {
-        free(copy);
-      }
-    }
-  }
-#line 45 "ext/fastcsv/fastcsv.rl"
-	{
-    unclosed_line = 0;
-  }
-#line 117 "ext/fastcsv/fastcsv.rl"
-	{
-    mark_row_sep = p;
-    curline++;
-
-    if (d->start == 0 || p == d->start) {
-      rb_ivar_set(self, s_row, rb_str_new2(""));
-    }
-    else if (p > d->start) {
-      rb_ivar_set(self, s_row, rb_str_new(d->start, p - d->start));
-    }
-
-    if (!NIL_P(field) || RARRAY_LEN(row)) { // same as new_field
-      rb_ary_push(row, field);
-      field = Qnil;
-    }
-
-    rb_yield(row);
-    row = rb_ary_new();
-  }
-#line 100 "ext/fastcsv/fastcsv.rl"
-	{
-    d->start = p;
-
-    if (len_row_sep) {
-      if (p - mark_row_sep != len_row_sep || row_sep[0] != *mark_row_sep || (len_row_sep == 2 && row_sep[1] != *(mark_row_sep + 1))) {
-        FREE;
-
-        rb_raise(eError, "Unquoted fields do not allow \\r or \\n (line %d).", curline - 1);
-      }
-    }
-    else {
-      len_row_sep = p - mark_row_sep;
-      row_sep = ALLOC_N(char, len_row_sep);
-      memcpy(row_sep, mark_row_sep, len_row_sep);
-    }
-  }
-#line 166 "ext/fastcsv/fastcsv.rl"
-	{act = 2;}
-	goto st13;
-tr61:
-#line 1 "NONE"
-	{te = p+1;}
-#line 60 "ext/fastcsv/fastcsv.rl"
-	{
-    if (p == ts) {
-      field = rb_enc_str_new("", 0, encoding);
-      ENCODE;
-    }
-    // @note If we add an action on '""', we can skip some steps if no '""' is found.
-    else if (p > ts) {
-      // Operating on ts in-place produces odd behavior, FYI.
-      char *copy = ALLOC_N(char, p - ts);
-      memcpy(copy, ts, p - ts);
-
-      char *reader = ts, *writer = copy;
-      int escaped = 0;
-
-      while (p > reader) {
-        if (*reader == quote_char && !escaped) {
-          // Skip the escaping character.
-          escaped = 1;
-        }
-        else {
-          escaped = 0;
-          *writer++ = *reader;
-        }
-        reader++;
-      }
-
-      field = rb_enc_str_new(copy, writer - copy, encoding);
-      ENCODE;
-
-      if (copy != NULL) {
-        free(copy);
-      }
-    }
-  }
-#line 45 "ext/fastcsv/fastcsv.rl"
-	{
-    unclosed_line = 0;
-  }
-#line 95 "ext/fastcsv/fastcsv.rl"
-	{
-    rb_ary_push(row, field);
-    field = Qnil;
-  }
-#line 165 "ext/fastcsv/fastcsv.rl"
-	{act = 1;}
-#line 117 "ext/fastcsv/fastcsv.rl"
-	{
-    mark_row_sep = p;
-    curline++;
-
-    if (d->start == 0 || p == d->start) {
-      rb_ivar_set(self, s_row, rb_str_new2(""));
-    }
-    else if (p > d->start) {
-      rb_ivar_set(self, s_row, rb_str_new(d->start, p - d->start));
-    }
-
-    if (!NIL_P(field) || RARRAY_LEN(row)) { // same as new_field
-      rb_ary_push(row, field);
-      field = Qnil;
-    }
-
-    rb_yield(row);
-    row = rb_ary_new();
-  }
-#line 100 "ext/fastcsv/fastcsv.rl"
-	{
-    d->start = p;
-
-    if (len_row_sep) {
-      if (p - mark_row_sep != len_row_sep || row_sep[0] != *mark_row_sep || (len_row_sep == 2 && row_sep[1] != *(mark_row_sep + 1))) {
-        FREE;
-
-        rb_raise(eError, "Unquoted fields do not allow \\r or \\n (line %d).", curline - 1);
-      }
-    }
-    else {
-      len_row_sep = p - mark_row_sep;
-      row_sep = ALLOC_N(char, len_row_sep);
-      memcpy(row_sep, mark_row_sep, len_row_sep);
-    }
-  }
-	goto st13;
-st13:
-	if ( ++p == pe )
-		goto _test_eof13;
-case 13:
-#line 2556 "ext/fastcsv/fastcsv.c"
-	_widec = (*p);
-	_widec = (short)(1152 + ((*p) - -128));
-	if ( 
-#line 155 "ext/fastcsv/fastcsv.rl"
- (*p) == quote_char  ) _widec += 256;
-	if ( 
-#line 156 "ext/fastcsv/fastcsv.rl"
- (*p) == col_sep  ) _widec += 512;
-	switch( _widec ) {
-		case 1280: goto tr50;
-		case 1290: goto tr51;
-		case 1293: goto tr52;
-		case 1536: goto tr53;
-		case 1546: goto tr54;
-		case 1549: goto tr54;
-		case 1792: goto tr56;
-		case 1802: goto tr57;
-		case 1805: goto tr58;
-		case 2048: goto tr60;
-		case 2058: goto tr61;
-		case 2061: goto tr61;
-	}
-	if ( _widec < 1408 ) {
-		if ( 1152 <= _widec && _widec <= 1407 )
-			goto tr45;
-	} else if ( _widec > 1663 ) {
-		if ( _widec > 1919 ) {
-			if ( 1920 <= _widec && _widec <= 2175 )
-				goto tr59;
-		} else if ( _widec >= 1664 )
-			goto tr55;
-	} else
-		goto tr47;
-	goto tr0;
-tr27:
-#line 1 "NONE"
-	{te = p+1;}
-#line 60 "ext/fastcsv/fastcsv.rl"
-	{
-    if (p == ts) {
-      field = rb_enc_str_new("", 0, encoding);
-      ENCODE;
-    }
-    // @note If we add an action on '""', we can skip some steps if no '""' is found.
-    else if (p > ts) {
-      // Operating on ts in-place produces odd behavior, FYI.
-      char *copy = ALLOC_N(char, p - ts);
-      memcpy(copy, ts, p - ts);
-
-      char *reader = ts, *writer = copy;
-      int escaped = 0;
-
-      while (p > reader) {
-        if (*reader == quote_char && !escaped) {
-          // Skip the escaping character.
-          escaped = 1;
-        }
-        else {
-          escaped = 0;
-          *writer++ = *reader;
-        }
-        reader++;
-      }
-
-      field = rb_enc_str_new(copy, writer - copy, encoding);
-      ENCODE;
-
-      if (copy != NULL) {
-        free(copy);
-      }
-    }
-  }
-#line 45 "ext/fastcsv/fastcsv.rl"
-	{
-    unclosed_line = 0;
-  }
-#line 137 "ext/fastcsv/fastcsv.rl"
-	{
-    if (d->start == 0 || p == d->start) { // same as new_row
-      rb_ivar_set(self, s_row, rb_str_new2(""));
-    }
-    else if (p > d->start) {
-      rb_ivar_set(self, s_row, rb_str_new(d->start, p - d->start));
-    }
-
-    if (!NIL_P(field) || RARRAY_LEN(row)) {
-      rb_ary_push(row, field);
-    }
-
-    if (RARRAY_LEN(row)) {
-      rb_yield(row);
-    }
-  }
-#line 167 "ext/fastcsv/fastcsv.rl"
-	{act = 3;}
-	goto st14;
-tr29:
-#line 1 "NONE"
-	{te = p+1;}
-#line 60 "ext/fastcsv/fastcsv.rl"
-	{
-    if (p == ts) {
-      field = rb_enc_str_new("", 0, encoding);
-      ENCODE;
-    }
-    // @note If we add an action on '""', we can skip some steps if no '""' is found.
-    else if (p > ts) {
-      // Operating on ts in-place produces odd behavior, FYI.
-      char *copy = ALLOC_N(char, p - ts);
-      memcpy(copy, ts, p - ts);
-
-      char *reader = ts, *writer = copy;
-      int escaped = 0;
-
-      while (p > reader) {
-        if (*reader == quote_char && !escaped) {
-          // Skip the escaping character.
-          escaped = 1;
-        }
-        else {
-          escaped = 0;
-          *writer++ = *reader;
-        }
-        reader++;
-      }
-
-      field = rb_enc_str_new(copy, writer - copy, encoding);
-      ENCODE;
-
-      if (copy != NULL) {
-        free(copy);
-      }
-    }
-  }
-#line 45 "ext/fastcsv/fastcsv.rl"
-	{
-    unclosed_line = 0;
-  }
-#line 95 "ext/fastcsv/fastcsv.rl"
-	{
-    rb_ary_push(row, field);
-    field = Qnil;
-  }
-#line 165 "ext/fastcsv/fastcsv.rl"
-	{act = 1;}
-	goto st14;
-tr30:
-#line 1 "NONE"
-	{te = p+1;}
-#line 60 "ext/fastcsv/fastcsv.rl"
-	{
-    if (p == ts) {
-      field = rb_enc_str_new("", 0, encoding);
-      ENCODE;
-    }
-    // @note If we add an action on '""', we can skip some steps if no '""' is found.
-    else if (p > ts) {
-      // Operating on ts in-place produces odd behavior, FYI.
-      char *copy = ALLOC_N(char, p - ts);
-      memcpy(copy, ts, p - ts);
-
-      char *reader = ts, *writer = copy;
-      int escaped = 0;
-
-      while (p > reader) {
-        if (*reader == quote_char && !escaped) {
-          // Skip the escaping character.
-          escaped = 1;
-        }
-        else {
-          escaped = 0;
-          *writer++ = *reader;
-        }
-        reader++;
-      }
-
-      field = rb_enc_str_new(copy, writer - copy, encoding);
-      ENCODE;
-
-      if (copy != NULL) {
-        free(copy);
-      }
-    }
-  }
-#line 45 "ext/fastcsv/fastcsv.rl"
-	{
-    unclosed_line = 0;
-  }
-#line 95 "ext/fastcsv/fastcsv.rl"
-	{
-    rb_ary_push(row, field);
-    field = Qnil;
-  }
-#line 165 "ext/fastcsv/fastcsv.rl"
-	{act = 1;}
-#line 137 "ext/fastcsv/fastcsv.rl"
-	{
-    if (d->start == 0 || p == d->start) { // same as new_row
-      rb_ivar_set(self, s_row, rb_str_new2(""));
-    }
-    else if (p > d->start) {
-      rb_ivar_set(self, s_row, rb_str_new(d->start, p - d->start));
-    }
-
-    if (!NIL_P(field) || RARRAY_LEN(row)) {
-      rb_ary_push(row, field);
-    }
-
-    if (RARRAY_LEN(row)) {
-      rb_yield(row);
-    }
-  }
-	goto st14;
-tr53:
-#line 1 "NONE"
-	{te = p+1;}
-#line 60 "ext/fastcsv/fastcsv.rl"
-	{
-    if (p == ts) {
-      field = rb_enc_str_new("", 0, encoding);
-      ENCODE;
-    }
-    // @note If we add an action on '""', we can skip some steps if no '""' is found.
-    else if (p > ts) {
-      // Operating on ts in-place produces odd behavior, FYI.
-      char *copy = ALLOC_N(char, p - ts);
-      memcpy(copy, ts, p - ts);
-
-      char *reader = ts, *writer = copy;
-      int escaped = 0;
-
-      while (p > reader) {
-        if (*reader == quote_char && !escaped) {
-          // Skip the escaping character.
-          escaped = 1;
-        }
-        else {
-          escaped = 0;
-          *writer++ = *reader;
-        }
-        reader++;
-      }
-
-      field = rb_enc_str_new(copy, writer - copy, encoding);
-      ENCODE;
-
-      if (copy != NULL) {
-        free(copy);
-      }
-    }
-  }
-#line 45 "ext/fastcsv/fastcsv.rl"
-	{
-    unclosed_line = 0;
-  }
-#line 100 "ext/fastcsv/fastcsv.rl"
-	{
-    d->start = p;
-
-    if (len_row_sep) {
-      if (p - mark_row_sep != len_row_sep || row_sep[0] != *mark_row_sep || (len_row_sep == 2 && row_sep[1] != *(mark_row_sep + 1))) {
-        FREE;
-
-        rb_raise(eError, "Unquoted fields do not allow \\r or \\n (line %d).", curline - 1);
-      }
-    }
-    else {
-      len_row_sep = p - mark_row_sep;
-      row_sep = ALLOC_N(char, len_row_sep);
-      memcpy(row_sep, mark_row_sep, len_row_sep);
-    }
-  }
-#line 137 "ext/fastcsv/fastcsv.rl"
-	{
-    if (d->start == 0 || p == d->start) { // same as new_row
-      rb_ivar_set(self, s_row, rb_str_new2(""));
-    }
-    else if (p > d->start) {
-      rb_ivar_set(self, s_row, rb_str_new(d->start, p - d->start));
-    }
-
-    if (!NIL_P(field) || RARRAY_LEN(row)) {
-      rb_ary_push(row, field);
-    }
-
-    if (RARRAY_LEN(row)) {
-      rb_yield(row);
-    }
-  }
-#line 167 "ext/fastcsv/fastcsv.rl"
-	{act = 3;}
-	goto st14;
-tr59:
-#line 1 "NONE"
-	{te = p+1;}
-#line 60 "ext/fastcsv/fastcsv.rl"
-	{
-    if (p == ts) {
-      field = rb_enc_str_new("", 0, encoding);
-      ENCODE;
-    }
-    // @note If we add an action on '""', we can skip some steps if no '""' is found.
-    else if (p > ts) {
-      // Operating on ts in-place produces odd behavior, FYI.
-      char *copy = ALLOC_N(char, p - ts);
-      memcpy(copy, ts, p - ts);
-
-      char *reader = ts, *writer = copy;
-      int escaped = 0;
-
-      while (p > reader) {
-        if (*reader == quote_char && !escaped) {
-          // Skip the escaping character.
-          escaped = 1;
-        }
-        else {
-          escaped = 0;
-          *writer++ = *reader;
-        }
-        reader++;
-      }
-
-      field = rb_enc_str_new(copy, writer - copy, encoding);
-      ENCODE;
-
-      if (copy != NULL) {
-        free(copy);
-      }
-    }
-  }
-#line 45 "ext/fastcsv/fastcsv.rl"
-	{
-    unclosed_line = 0;
-  }
-#line 95 "ext/fastcsv/fastcsv.rl"
-	{
-    rb_ary_push(row, field);
-    field = Qnil;
-  }
-#line 165 "ext/fastcsv/fastcsv.rl"
-	{act = 1;}
-#line 100 "ext/fastcsv/fastcsv.rl"
-	{
-    d->start = p;
-
-    if (len_row_sep) {
-      if (p - mark_row_sep != len_row_sep || row_sep[0] != *mark_row_sep || (len_row_sep == 2 && row_sep[1] != *(mark_row_sep + 1))) {
-        FREE;
-
-        rb_raise(eError, "Unquoted fields do not allow \\r or \\n (line %d).", curline - 1);
-      }
-    }
-    else {
-      len_row_sep = p - mark_row_sep;
-      row_sep = ALLOC_N(char, len_row_sep);
-      memcpy(row_sep, mark_row_sep, len_row_sep);
-    }
-  }
-	goto st14;
-tr60:
-#line 1 "NONE"
-	{te = p+1;}
-#line 60 "ext/fastcsv/fastcsv.rl"
-	{
-    if (p == ts) {
-      field = rb_enc_str_new("", 0, encoding);
-      ENCODE;
-    }
-    // @note If we add an action on '""', we can skip some steps if no '""' is found.
-    else if (p > ts) {
-      // Operating on ts in-place produces odd behavior, FYI.
-      char *copy = ALLOC_N(char, p - ts);
-      memcpy(copy, ts, p - ts);
-
-      char *reader = ts, *writer = copy;
-      int escaped = 0;
-
-      while (p > reader) {
-        if (*reader == quote_char && !escaped) {
-          // Skip the escaping character.
-          escaped = 1;
-        }
-        else {
-          escaped = 0;
-          *writer++ = *reader;
-        }
-        reader++;
-      }
-
-      field = rb_enc_str_new(copy, writer - copy, encoding);
-      ENCODE;
-
-      if (copy != NULL) {
-        free(copy);
-      }
-    }
-  }
-#line 45 "ext/fastcsv/fastcsv.rl"
-	{
-    unclosed_line = 0;
-  }
-#line 95 "ext/fastcsv/fastcsv.rl"
-	{
-    rb_ary_push(row, field);
-    field = Qnil;
-  }
-#line 165 "ext/fastcsv/fastcsv.rl"
-	{act = 1;}
-#line 100 "ext/fastcsv/fastcsv.rl"
-	{
-    d->start = p;
-
-    if (len_row_sep) {
-      if (p - mark_row_sep != len_row_sep || row_sep[0] != *mark_row_sep || (len_row_sep == 2 && row_sep[1] != *(mark_row_sep + 1))) {
-        FREE;
-
-        rb_raise(eError, "Unquoted fields do not allow \\r or \\n (line %d).", curline - 1);
-      }
-    }
-    else {
-      len_row_sep = p - mark_row_sep;
-      row_sep = ALLOC_N(char, len_row_sep);
-      memcpy(row_sep, mark_row_sep, len_row_sep);
-    }
-  }
-#line 137 "ext/fastcsv/fastcsv.rl"
-	{
-    if (d->start == 0 || p == d->start) { // same as new_row
-      rb_ivar_set(self, s_row, rb_str_new2(""));
-    }
-    else if (p > d->start) {
-      rb_ivar_set(self, s_row, rb_str_new(d->start, p - d->start));
-    }
-
-    if (!NIL_P(field) || RARRAY_LEN(row)) {
-      rb_ary_push(row, field);
-    }
-
-    if (RARRAY_LEN(row)) {
-      rb_yield(row);
-    }
-  }
-	goto st14;
-st14:
+	goto st12;
+st12:
 	if ( ++p == pe )
-		goto _test_eof14;
-case 14:
-#line 3004 "ext/fastcsv/fastcsv.c"
+		goto _test_eof12;
+case 12:
+#line 2436 "ext/fastcsv/fastcsv.c"
 	_widec = (*p);
 	_widec = (short)(1152 + ((*p) - -128));
 	if ( 
-#line 155 "ext/fastcsv/fastcsv.rl"
+#line 156 "ext/fastcsv/fastcsv.rl"
  (*p) == quote_char  ) _widec += 256;
 	if ( 
-#line 156 "ext/fastcsv/fastcsv.rl"
+#line 157 "ext/fastcsv/fastcsv.rl"
  (*p) == col_sep  ) _widec += 512;
 	switch( _widec ) {
-		case 1280: goto tr13;
-		case 1290: goto tr17;
-		case 1293: goto tr18;
-		case 1536: goto tr27;
-		case 1546: goto tr28;
-		case 1549: goto tr28;
-		case 1792: goto tr20;
-		case 1802: goto tr25;
-		case 1805: goto tr26;
-		case 2048: goto tr30;
-		case 2058: goto tr31;
-		case 2061: goto tr31;
+		case 1280: goto tr45;
+		case 1290: goto tr46;
+		case 1293: goto tr47;
+		case 1536: goto tr48;
+		case 1546: goto tr49;
+		case 1549: goto tr50;
+		case 1792: goto tr52;
+		case 1802: goto tr53;
+		case 1805: goto tr54;
+		case 2048: goto tr56;
+		case 2058: goto tr57;
+		case 2061: goto tr58;
 	}
 	if ( _widec < 1408 ) {
 		if ( 1152 <= _widec && _widec <= 1407 )
-			goto st2;
+			goto tr43;
 	} else if ( _widec > 1663 ) {
 		if ( _widec > 1919 ) {
 			if ( 1920 <= _widec && _widec <= 2175 )
-				goto tr29;
+				goto tr55;
 		} else if ( _widec >= 1664 )
-			goto tr23;
+			goto tr51;
 	} else
-		goto tr12;
-	goto tr0;
+		goto tr39;
+	goto tr44;
 	}
-	_test_eof5: cs = 5; goto _test_eof; 
+	_test_eof4: cs = 4; goto _test_eof; 
 	_test_eof1: cs = 1; goto _test_eof; 
+	_test_eof5: cs = 5; goto _test_eof; 
 	_test_eof6: cs = 6; goto _test_eof; 
 	_test_eof7: cs = 7; goto _test_eof; 
 	_test_eof8: cs = 8; goto _test_eof; 
-	_test_eof9: cs = 9; goto _test_eof; 
 	_test_eof2: cs = 2; goto _test_eof; 
 	_test_eof3: cs = 3; goto _test_eof; 
+	_test_eof9: cs = 9; goto _test_eof; 
 	_test_eof10: cs = 10; goto _test_eof; 
-	_test_eof4: cs = 4; goto _test_eof; 
 	_test_eof11: cs = 11; goto _test_eof; 
 	_test_eof12: cs = 12; goto _test_eof; 
-	_test_eof13: cs = 13; goto _test_eof; 
-	_test_eof14: cs = 14; goto _test_eof; 
 
 	_test_eof: {}
 	if ( p == eof )
 	{
 	switch ( cs ) {
 	case 1: goto tr0;
-	case 6: goto tr42;
-	case 7: goto tr43;
-	case 8: goto tr43;
-	case 9: goto tr42;
+	case 5: goto tr36;
+	case 6: goto tr37;
+	case 7: goto tr37;
+	case 8: goto tr36;
 	case 2: goto tr0;
 	case 3: goto tr0;
-	case 10: goto tr0;
-	case 4: goto tr0;
-	case 11: goto tr43;
+	case 9: goto tr0;
+	case 10: goto tr37;
+	case 11: goto tr37;
 	case 12: goto tr43;
-	case 13: goto tr43;
-	case 14: goto tr0;
 	}
 	}
 
 	_out: {}
 	}
 
-#line 444 "ext/fastcsv/fastcsv.rl"
+#line 447 "ext/fastcsv/fastcsv.rl"
 
     if (done && cs < raw_parse_first_final) {
       if (d->start == 0 || p == d->start) { // same as new_row
@@ -3100,6 +2528,13 @@ case 14:
     else if (io) {
       have = pe - ts;
       memmove(buf, ts, have);
+      // @see https://github.com/hpricot/hpricot/blob/master/ext/hpricot_scan/hpricot_scan.rl#L92
+      if (d->start > ts) {
+        d->start = buf + (d->start - ts);
+      }
+      if (mark_row_sep >= ts) {
+        mark_row_sep = buf + (mark_row_sep - ts);
+      }
       te = buf + (te - ts);
       ts = buf;
     }