[Bast-commits] r4815 - in trunk/Devel-Declare: . lib/Devel

[matthewt at dev.catalyst.perl.org]

Author: matthewt
Date: 2008-09-17 06:16:04 +0100 (Wed, 17 Sep 2008)
New Revision: 4815

Modified:
   trunk/Devel-Declare/Declare.xs
   trunk/Devel-Declare/lib/Devel/Declare.pm
Log:
get_linestr works, callback code works, set_linestr compiles but not tested

Modified: trunk/Devel-Declare/Declare.xs
===================================================================
--- trunk/Devel-Declare/Declare.xs	2008-09-17 00:39:44 UTC (rev 4814)
+++ trunk/Devel-Declare/Declare.xs	2008-09-17 05:16:04 UTC (rev 4815)
@@ -51,6 +51,8 @@
   if (!is_declarator)
     return -1;
 
+  /* $declarators{$current_package_name} */
+
   is_declarator_pack_ref = hv_fetch(is_declarator, HvNAME(PL_curstash),
                              strlen(HvNAME(PL_curstash)), FALSE);
 
@@ -59,6 +61,8 @@
 
   is_declarator_pack_hash = (HV*) SvRV(*is_declarator_pack_ref);
 
+  /* $declarators{$current_package_name}{$name} */
+
   is_declarator_flag_ref = hv_fetch(
     is_declarator_pack_hash, name,
     strlen(name), FALSE
@@ -76,6 +80,61 @@
   return dd_flags;
 }
 
+/* callback thingy */
+
+void dd_linestr_callback (pTHX_ char* type, char* name, char* s) {
+
+  char* linestr = SvPVX(PL_linestr);
+  int offset = s - linestr;
+
+  char* new_linestr;
+  int count;
+
+  dSP;
+
+  ENTER;
+  SAVETMPS;
+
+  PUSHMARK(SP);
+  XPUSHs(sv_2mortal(newSVpv(type, 0)));
+  XPUSHs(sv_2mortal(newSVpv(name, 0)));
+  XPUSHs(sv_2mortal(newSViv(offset)));
+  PUTBACK;
+
+  count = call_pv("Devel::Declare::linestr_callback", G_SCALAR);
+
+  SPAGAIN;
+
+  if (count != 1)
+    Perl_croak(aTHX_ "linestr_callback didn't return a value, bailing out");
+
+  printf("linestr_callback returned: %s\n", POPp);
+
+  PUTBACK;
+  FREETMPS;
+  LEAVE;
+}
+
+char* dd_get_linestr(pTHX) {
+  return SvPVX(PL_linestr);
+}
+
+void dd_set_linestr(pTHX_ char* new_value) {
+  int new_len = strlen(new_value);
+  char* old_linestr = SvPVX(PL_linestr);
+
+  SvGROW(PL_linestr, strlen(new_value));
+
+  if (SvPVX(PL_linestr) != old_linestr)
+    Perl_croak(aTHX_ "forced to realloc PL_linestr for line %s, bailing out before we crash harder", SvPVX(PL_linestr));
+
+  memcpy(SvPVX(PL_linestr), new_value, new_len+1);
+
+  SvCUR_set(PL_linestr, new_len);
+
+  PL_bufend = SvPVX(PL_linestr) + new_len;
+}
+
 /* replacement PL_check rv2cv entry */
 
 STATIC OP *(*dd_old_ck_rv2cv)(pTHX_ OP *op);
@@ -371,6 +430,8 @@
   if (memEQ(s, PL_tokenbuf, strlen(PL_tokenbuf)))
     s += strlen(PL_tokenbuf);
 
+  /* dd_linestr_callback(aTHX_ "const", SvPVX(cSVOPo->op_sv), s); */
+
   DD_DEBUG_S
 
   /* find next word */
@@ -428,3 +489,10 @@
     PL_check[OP_CONST] = dd_ck_const;
   }
   filter_add(dd_filter_realloc, NULL);
+
+char*
+get_linestr()
+  CODE:
+    RETVAL = dd_get_linestr(aTHX);
+  OUTPUT:
+    RETVAL

Modified: trunk/Devel-Declare/lib/Devel/Declare.pm
===================================================================
--- trunk/Devel-Declare/lib/Devel/Declare.pm	2008-09-17 00:39:44 UTC (rev 4814)
+++ trunk/Devel-Declare/lib/Devel/Declare.pm	2008-09-17 05:16:04 UTC (rev 4815)
@@ -196,6 +196,20 @@
   });
 }
 
+sub linestr_callback_const {
+  warn "Linestr_callback_const: @_\n";
+  my $l = get_linestr();
+  warn "linestr: ${l}\n";
+  warn "w/offset: ".substr($l, $_[1])."\n";
+}
+
+sub linestr_callback {
+  my $type = shift;
+  my $meth = "linestr_callback_${type}";
+  __PACKAGE__->can($meth)->(@_);
+  return 'foo';
+}
+
 =head1 NAME
 
 Devel::Declare -