X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Declare.xs;h=e36668dd67c01845e5ad955d5475b05ec1e03699;hb=78bb475dd0c334ce6f507f501d7b9e1d8cbd8b0b;hp=3f1728ab60d5c7a67dcfe2b50e998de9717a6d16;hpb=08c39634f810a05a7c2f578aa619c4da53906ac5;p=p5sagit%2FDevel-Declare.git

diff --git a/Declare.xs b/Declare.xs
index 3f1728a..e36668d 100644
--- a/Declare.xs
+++ b/Declare.xs
@@ -219,18 +219,16 @@ int dd_toke_scan_ident(pTHX_ int offset) {
 
 int dd_toke_scan_str(pTHX_ int offset) {
   char* old_pvx = SvPVX(PL_linestr);
-  STRLEN remaining = sv_len(PL_linestr) - offset;
   SV* line_copy = sv_2mortal(newSVsv(PL_linestr));
   char* base_s = SvPVX(PL_linestr) + offset;
   char* s = scan_str(base_s, FALSE, FALSE);
   if(SvPVX(PL_linestr) != old_pvx)
     croak("PL_linestr reallocated during scan_str, "
       "Devel::Declare can't continue");
-  if (s != base_s && sv_len(PL_lex_stuff) > remaining) {
-    int ret = (s - SvPVX(PL_linestr)) + remaining;
+  if (s <= base_s) {
+    s += SvCUR(line_copy);
     sv_catsv(line_copy, PL_linestr);
     dd_set_linestr(aTHX_ SvPV_nolen(line_copy));
-    return ret;
   }
   return s - base_s;
 }