You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by ma...@apache.org on 2012/11/15 05:16:26 UTC

[lucy-commits] [2/8] git commit: refs/heads/kill_clownfish_host - Streamline away unnecessary arguments.

Streamline away unnecessary arguments.


Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/5be4007c
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/5be4007c
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/5be4007c

Branch: refs/heads/kill_clownfish_host
Commit: 5be4007c6ca835ae4280f7dbf9c69fd535de62e7
Parents: 0a44f38
Author: Marvin Humphrey <ma...@rectangular.com>
Authored: Wed Nov 14 20:14:15 2012 -0800
Committer: Marvin Humphrey <ma...@rectangular.com>
Committed: Wed Nov 14 20:14:54 2012 -0800

----------------------------------------------------------------------
 perl/lib/Lucy.pm                       |    4 ++--
 perl/xs/Lucy/Analysis/RegexTokenizer.c |    5 ++---
 perl/xs/Lucy/Store/FSFolder.c          |    3 +--
 3 files changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy/blob/5be4007c/perl/lib/Lucy.pm
----------------------------------------------------------------------
diff --git a/perl/lib/Lucy.pm b/perl/lib/Lucy.pm
index 537572e..bb6b6ba 100644
--- a/perl/lib/Lucy.pm
+++ b/perl/lib/Lucy.pm
@@ -93,7 +93,7 @@ sub error {$Clownfish::Err::error}
     our $VERSION = '0.003000';
     $VERSION = eval $VERSION;
 
-    sub compile_token_re { return qr/$_[1]/ }
+    sub _compile_token_re {qr/$_[0]/}
 
     sub new {
         my ( $either, %args ) = @_;
@@ -435,7 +435,7 @@ sub error {$Clownfish::Err::error}
     our $VERSION = '0.003000';
     $VERSION = eval $VERSION;
     use File::Spec::Functions qw( rel2abs );
-    sub absolutify { return rel2abs( $_[1] ) }
+    sub _absolutify {rel2abs(shift)}
 }
 
 {

http://git-wip-us.apache.org/repos/asf/lucy/blob/5be4007c/perl/xs/Lucy/Analysis/RegexTokenizer.c
----------------------------------------------------------------------
diff --git a/perl/xs/Lucy/Analysis/RegexTokenizer.c b/perl/xs/Lucy/Analysis/RegexTokenizer.c
index 274b347..a1dd905 100644
--- a/perl/xs/Lucy/Analysis/RegexTokenizer.c
+++ b/perl/xs/Lucy/Analysis/RegexTokenizer.c
@@ -65,12 +65,11 @@ S_compile_token_re(const cfish_CharBuf *pattern) {
     dSP;
     ENTER;
     SAVETMPS;
-    EXTEND(SP, 2);
+    EXTEND(SP, 1);
     PUSHMARK(SP);
-    PUSHmortal;
     XPUSHs(XSBind_cb_to_sv(pattern));
     PUTBACK;
-    call_pv("Lucy::Analysis::RegexTokenizer::compile_token_re", G_SCALAR);
+    call_pv("Lucy::Analysis::RegexTokenizer::_compile_token_re", G_SCALAR);
     SPAGAIN;
     SV *token_re_sv = POPs;
     SvREFCNT_inc(token_re_sv);

http://git-wip-us.apache.org/repos/asf/lucy/blob/5be4007c/perl/xs/Lucy/Store/FSFolder.c
----------------------------------------------------------------------
diff --git a/perl/xs/Lucy/Store/FSFolder.c b/perl/xs/Lucy/Store/FSFolder.c
index 433d6b7..10d581c 100644
--- a/perl/xs/Lucy/Store/FSFolder.c
+++ b/perl/xs/Lucy/Store/FSFolder.c
@@ -24,10 +24,9 @@ lucy_FSFolder_absolutify(const cfish_CharBuf *path) {
     SAVETMPS;
     EXTEND(SP, 2);
     PUSHMARK(SP);
-    PUSHmortal;
     mPUSHs(XSBind_cb_to_sv(path));
     PUTBACK;
-    call_pv("Lucy::Store::FSFolder::absolutify", G_SCALAR);
+    call_pv("Lucy::Store::FSFolder::_absolutify", G_SCALAR);
     SPAGAIN;
     cfish_CharBuf *absolutified
         = (cfish_CharBuf*)XSBind_perl_to_cfish(POPs);