[Bast-commits] r4816 - trunk/Devel-Declare
matthewt at dev.catalyst.perl.org
matthewt at dev.catalyst.perl.org
Wed Sep 17 07:57:36 BST 2008
Author: matthewt
Date: 2008-09-17 07:57:36 +0100 (Wed, 17 Sep 2008)
New Revision: 4816
Modified:
trunk/Devel-Declare/Declare.xs
Log:
extract move_past_token, add XS wraps for toke chunks
Modified: trunk/Devel-Declare/Declare.xs
===================================================================
--- trunk/Devel-Declare/Declare.xs 2008-09-17 05:16:04 UTC (rev 4815)
+++ trunk/Devel-Declare/Declare.xs 2008-09-17 06:57:36 UTC (rev 4816)
@@ -135,6 +135,40 @@
PL_bufend = SvPVX(PL_linestr) + new_len;
}
+char* dd_move_past_token (pTHX_ char* s) {
+
+ /*
+ * buffer will be at the beginning of the declarator, -unless- the
+ * declarator is at EOL in which case it'll be the next useful line
+ * so we don't short-circuit out if we don't find the declarator
+ */
+
+ while (s < PL_bufend && isSPACE(*s)) s++;
+ if (memEQ(s, PL_tokenbuf, strlen(PL_tokenbuf)))
+ s += strlen(PL_tokenbuf);
+ return s;
+}
+
+int dd_toke_scan_word(pTHX_ int offset, int handle_package) {
+ char tmpbuf[sizeof PL_tokenbuf];
+ char* base_s = SvPVX(PL_linestr) + offset;
+ STRLEN len;
+ char* s = scan_word(base_s, tmpbuf, sizeof tmpbuf, handle_package, &len);
+ return s - base_s;
+}
+
+int dd_toke_scan_str(pTHX_ int offset) {
+ char* base_s = SvPVX(PL_linestr) + offset;
+ char* s = scan_str(base_s, FALSE, FALSE);
+ return s - base_s;
+}
+
+int dd_toke_skipspace(pTHX_ int offset) {
+ char* base_s = SvPVX(PL_linestr) + offset;
+ char* s = skipspace(base_s);
+ return s - base_s;
+}
+
/* replacement PL_check rv2cv entry */
STATIC OP *(*dd_old_ck_rv2cv)(pTHX_ OP *op);
@@ -208,16 +242,8 @@
printf("PL_tokenbuf: %s\n", PL_tokenbuf);
#endif
- /*
- * buffer will be at the beginning of the declarator, -unless- the
- * declarator is at EOL in which case it'll be the next useful line
- * so we don't short-circuit out if we don't find the declarator
- */
+ s = dd_move_past_token(aTHX_ s);
- while (s < PL_bufend && isSPACE(*s)) s++;
- if (memEQ(s, PL_tokenbuf, strlen(PL_tokenbuf)))
- s += strlen(PL_tokenbuf);
-
DD_DEBUG_S
if (dd_flags & DD_HANDLE_NAME) {
@@ -426,9 +452,7 @@
s = PL_bufptr;
- while (s < PL_bufend && isSPACE(*s)) s++;
- if (memEQ(s, PL_tokenbuf, strlen(PL_tokenbuf)))
- s += strlen(PL_tokenbuf);
+ s = dd_move_past_token(aTHX_ s);
/* dd_linestr_callback(aTHX_ "const", SvPVX(cSVOPo->op_sv), s); */
@@ -496,3 +520,29 @@
RETVAL = dd_get_linestr(aTHX);
OUTPUT:
RETVAL
+
+void
+set_linestr(char* new_value)
+ CODE:
+ dd_set_linestr(aTHX_ new_value);
+
+int
+toke_scan_word(int offset, int handle_package)
+ CODE:
+ RETVAL = dd_toke_scan_word(aTHX_ offset, handle_package);
+ OUTPUT:
+ RETVAL
+
+int
+toke_scan_str(int offset);
+ CODE:
+ RETVAL = dd_toke_scan_str(aTHX_ offset);
+ OUTPUT:
+ RETVAL
+
+int
+toke_skipspace(int offset)
+ CODE:
+ RETVAL = dd_toke_skipspace(aTHX_ offset);
+ OUTPUT:
+ RETVAL
More information about the Bast-commits
mailing list