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/07/22 17:59:40 UTC
[lucy-commits] svn commit: r1364340 - in /lucy/trunk: c/src/ core/ core/Clownfish/
core/Lucy/Object/ core/Lucy/Search/ core/Lucy/Store/ core/Lucy/Test/Object/
core/Lucy/Util/ core/Lucy/Util/Json/ example-lang/src/
perl/buildlib/Lucy/Build/Binding/ perl/lib/ perl/lib/...
Author: marvin
Date: Sun Jul 22 15:59:39 2012
New Revision: 1364340
URL: http://svn.apache.org/viewvc?rev=1364340&view=rev
Log:
LUCY-242 Move Err under Clownfish.
Added:
lucy/trunk/core/Clownfish/Err.c
- copied, changed from r1364327, lucy/trunk/core/Lucy/Object/Err.c
lucy/trunk/core/Clownfish/Err.cfh
- copied, changed from r1364277, lucy/trunk/core/Lucy/Object/Err.cfh
lucy/trunk/perl/lib/Clownfish/Err.pm
- copied, changed from r1364277, lucy/trunk/perl/lib/Lucy/Object/Err.pm
lucy/trunk/perl/xs/Clownfish/Err.c
- copied, changed from r1364284, lucy/trunk/perl/xs/Lucy/Object/Err.c
Removed:
lucy/trunk/core/Lucy/Object/Err.c
lucy/trunk/core/Lucy/Object/Err.cfh
lucy/trunk/perl/lib/Lucy/Object/Err.pm
lucy/trunk/perl/xs/Lucy/Object/Err.c
Modified:
lucy/trunk/c/src/CFBind.h
lucy/trunk/core/Clownfish/ByteBuf.c
lucy/trunk/core/Clownfish/CharBuf.c
lucy/trunk/core/Clownfish/Hash.c
lucy/trunk/core/Clownfish/LockFreeRegistry.c
lucy/trunk/core/Clownfish/Method.c
lucy/trunk/core/Clownfish/Num.c
lucy/trunk/core/Clownfish/VArray.c
lucy/trunk/core/Clownfish/VTable.c
lucy/trunk/core/Lucy.c
lucy/trunk/core/Lucy/Object/Obj.c
lucy/trunk/core/Lucy/Search/Matcher.c
lucy/trunk/core/Lucy/Store/FSDirHandle.c
lucy/trunk/core/Lucy/Store/Lock.cfh
lucy/trunk/core/Lucy/Test/Object/TestErr.c
lucy/trunk/core/Lucy/Util/Json/JsonParser.y
lucy/trunk/core/Lucy/Util/SortUtils.c
lucy/trunk/core/Lucy/Util/StringHelper.c
lucy/trunk/core/Lucy/Util/ToolSet.h
lucy/trunk/example-lang/src/CFBind.h
lucy/trunk/perl/buildlib/Lucy/Build/Binding/Object.pm
lucy/trunk/perl/lib/Lucy.pm
lucy/trunk/perl/lib/Lucy.pod
lucy/trunk/perl/t/binding/034-err.t
lucy/trunk/perl/xs/Clownfish/Host.c
lucy/trunk/perl/xs/Lucy/Object/Obj.c
lucy/trunk/perl/xs/XSBind.h
lucy/trunk/ruby/src/CFBind.h
Modified: lucy/trunk/c/src/CFBind.h
URL: http://svn.apache.org/viewvc/lucy/trunk/c/src/CFBind.h?rev=1364340&r1=1364339&r2=1364340&view=diff
==============================================================================
--- lucy/trunk/c/src/CFBind.h (original)
+++ lucy/trunk/c/src/CFBind.h Sun Jul 22 15:59:39 2012
@@ -28,7 +28,7 @@ extern "C" {
#include "Lucy/Object/Obj.h"
#include "Clownfish/ByteBuf.h"
#include "Clownfish/CharBuf.h"
-#include "Lucy/Object/Err.h"
+#include "Clownfish/Err.h"
#include "Clownfish/Hash.h"
#include "Clownfish/Num.h"
#include "Clownfish/VArray.h"
Modified: lucy/trunk/core/Clownfish/ByteBuf.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/ByteBuf.c?rev=1364340&r1=1364339&r2=1364340&view=diff
==============================================================================
--- lucy/trunk/core/Clownfish/ByteBuf.c (original)
+++ lucy/trunk/core/Clownfish/ByteBuf.c Sun Jul 22 15:59:39 2012
@@ -26,7 +26,7 @@
#include "Clownfish/VTable.h"
#include "Clownfish/ByteBuf.h"
-#include "Lucy/Object/Err.h"
+#include "Clownfish/Err.h"
#include "Lucy/Store/InStream.h"
#include "Lucy/Store/OutStream.h"
#include "Lucy/Util/Memory.h"
Modified: lucy/trunk/core/Clownfish/CharBuf.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/CharBuf.c?rev=1364340&r1=1364339&r2=1364340&view=diff
==============================================================================
--- lucy/trunk/core/Clownfish/CharBuf.c (original)
+++ lucy/trunk/core/Clownfish/CharBuf.c Sun Jul 22 15:59:39 2012
@@ -28,7 +28,7 @@
#include "Clownfish/VTable.h"
#include "Clownfish/CharBuf.h"
-#include "Lucy/Object/Err.h"
+#include "Clownfish/Err.h"
#include "Lucy/Store/InStream.h"
#include "Lucy/Store/OutStream.h"
#include "Lucy/Util/Memory.h"
Copied: lucy/trunk/core/Clownfish/Err.c (from r1364327, lucy/trunk/core/Lucy/Object/Err.c)
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/Err.c?p2=lucy/trunk/core/Clownfish/Err.c&p1=lucy/trunk/core/Lucy/Object/Err.c&r1=1364327&r2=1364340&rev=1364340&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Object/Err.c (original)
+++ lucy/trunk/core/Clownfish/Err.c Sun Jul 22 15:59:39 2012
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <ctype.h>
-#include "Lucy/Object/Err.h"
+#include "Clownfish/Err.h"
#include "Clownfish/CharBuf.h"
#include "Clownfish/VTable.h"
#include "Lucy/Util/Memory.h"
Copied: lucy/trunk/core/Clownfish/Err.cfh (from r1364277, lucy/trunk/core/Lucy/Object/Err.cfh)
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/Err.cfh?p2=lucy/trunk/core/Clownfish/Err.cfh&p1=lucy/trunk/core/Lucy/Object/Err.cfh&r1=1364277&r2=1364340&rev=1364340&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Object/Err.cfh (original)
+++ lucy/trunk/core/Clownfish/Err.cfh Sun Jul 22 15:59:39 2012
@@ -30,7 +30,7 @@ __END_C__
* Exception.
*
* Most of the time when Lucy encounters an error, it tries to raise a
- * Lucy::Object::Err exception with an error message and context
+ * Clownfish::Err exception with an error message and context
* information.
*
* At present, it is only safe to catch exceptions which are specifically
@@ -42,7 +42,7 @@ __END_C__
* temporarily, so that calling code may choose how to handle a particular
* error condition.
*/
-public class Lucy::Object::Err inherits Lucy::Object::Obj {
+public class Clownfish::Err inherits Lucy::Object::Obj {
CharBuf *mess;
Modified: lucy/trunk/core/Clownfish/Hash.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/Hash.c?rev=1364340&r1=1364339&r2=1364340&view=diff
==============================================================================
--- lucy/trunk/core/Clownfish/Hash.c (original)
+++ lucy/trunk/core/Clownfish/Hash.c Sun Jul 22 15:59:39 2012
@@ -26,7 +26,7 @@
#include "Clownfish/Hash.h"
#include "Clownfish/CharBuf.h"
-#include "Lucy/Object/Err.h"
+#include "Clownfish/Err.h"
#include "Clownfish/VArray.h"
#include "Lucy/Store/InStream.h"
#include "Lucy/Store/OutStream.h"
Modified: lucy/trunk/core/Clownfish/LockFreeRegistry.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/LockFreeRegistry.c?rev=1364340&r1=1364339&r2=1364340&view=diff
==============================================================================
--- lucy/trunk/core/Clownfish/LockFreeRegistry.c (original)
+++ lucy/trunk/core/Clownfish/LockFreeRegistry.c Sun Jul 22 15:59:39 2012
@@ -19,7 +19,7 @@
#define CHY_USE_SHORT_NAMES
#include "Clownfish/LockFreeRegistry.h"
-#include "Lucy/Object/Err.h"
+#include "Clownfish/Err.h"
#include "Clownfish/VTable.h"
#include "Lucy/Util/Atomic.h"
#include "Lucy/Util/Memory.h"
Modified: lucy/trunk/core/Clownfish/Method.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/Method.c?rev=1364340&r1=1364339&r2=1364340&view=diff
==============================================================================
--- lucy/trunk/core/Clownfish/Method.c (original)
+++ lucy/trunk/core/Clownfish/Method.c Sun Jul 22 15:59:39 2012
@@ -20,7 +20,7 @@
#include "Clownfish/Method.h"
#include "Clownfish/CharBuf.h"
-#include "Lucy/Object/Err.h"
+#include "Clownfish/Err.h"
#include "Clownfish/VTable.h"
Method*
Modified: lucy/trunk/core/Clownfish/Num.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/Num.c?rev=1364340&r1=1364339&r2=1364340&view=diff
==============================================================================
--- lucy/trunk/core/Clownfish/Num.c (original)
+++ lucy/trunk/core/Clownfish/Num.c Sun Jul 22 15:59:39 2012
@@ -28,7 +28,7 @@
#include "Clownfish/Num.h"
#include "Clownfish/CharBuf.h"
-#include "Lucy/Object/Err.h"
+#include "Clownfish/Err.h"
#include "Clownfish/VTable.h"
#include "Lucy/Store/InStream.h"
#include "Lucy/Store/OutStream.h"
Modified: lucy/trunk/core/Clownfish/VArray.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/VArray.c?rev=1364340&r1=1364339&r2=1364340&view=diff
==============================================================================
--- lucy/trunk/core/Clownfish/VArray.c (original)
+++ lucy/trunk/core/Clownfish/VArray.c Sun Jul 22 15:59:39 2012
@@ -23,7 +23,7 @@
#include "Clownfish/VTable.h"
#include "Clownfish/VArray.h"
-#include "Lucy/Object/Err.h"
+#include "Clownfish/Err.h"
#include "Lucy/Util/Memory.h"
#include "Lucy/Util/Freezer.h"
#include "Lucy/Util/SortUtils.h"
Modified: lucy/trunk/core/Clownfish/VTable.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/VTable.c?rev=1364340&r1=1364339&r2=1364340&view=diff
==============================================================================
--- lucy/trunk/core/Clownfish/VTable.c (original)
+++ lucy/trunk/core/Clownfish/VTable.c Sun Jul 22 15:59:39 2012
@@ -26,7 +26,7 @@
#include "Clownfish/VTable.h"
#include "Clownfish/CharBuf.h"
-#include "Lucy/Object/Err.h"
+#include "Clownfish/Err.h"
#include "Clownfish/Hash.h"
#include "Clownfish/LockFreeRegistry.h"
#include "Clownfish/Method.h"
Modified: lucy/trunk/core/Lucy.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy.c?rev=1364340&r1=1364339&r2=1364340&view=diff
==============================================================================
--- lucy/trunk/core/Lucy.c (original)
+++ lucy/trunk/core/Lucy.c Sun Jul 22 15:59:39 2012
@@ -16,7 +16,7 @@
#include "Clownfish/Num.h"
#include "Clownfish/Hash.h"
-#include "Lucy/Object/Err.h"
+#include "Clownfish/Err.h"
void
lucy_init_parcel() {
Modified: lucy/trunk/core/Lucy/Object/Obj.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Object/Obj.c?rev=1364340&r1=1364339&r2=1364340&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Object/Obj.c (original)
+++ lucy/trunk/core/Lucy/Object/Obj.c Sun Jul 22 15:59:39 2012
@@ -25,7 +25,7 @@
#include "Lucy/Object/Obj.h"
#include "Clownfish/CharBuf.h"
-#include "Lucy/Object/Err.h"
+#include "Clownfish/Err.h"
#include "Clownfish/Hash.h"
#include "Clownfish/VTable.h"
#include "Lucy/Store/InStream.h"
Modified: lucy/trunk/core/Lucy/Search/Matcher.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Search/Matcher.c?rev=1364340&r1=1364339&r2=1364340&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Search/Matcher.c (original)
+++ lucy/trunk/core/Lucy/Search/Matcher.c Sun Jul 22 15:59:39 2012
@@ -19,7 +19,7 @@
#define CHY_USE_SHORT_NAMES
#include "Lucy/Search/Matcher.h"
-#include "Lucy/Object/Err.h"
+#include "Clownfish/Err.h"
#include "Clownfish/VTable.h"
#include "Lucy/Search/Collector.h"
Modified: lucy/trunk/core/Lucy/Store/FSDirHandle.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Store/FSDirHandle.c?rev=1364340&r1=1364339&r2=1364340&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Store/FSDirHandle.c (original)
+++ lucy/trunk/core/Lucy/Store/FSDirHandle.c Sun Jul 22 15:59:39 2012
@@ -22,7 +22,7 @@
#include <sys/stat.h>
#include "Lucy/Util/ToolSet.h"
-#include "Lucy/Object/Err.h"
+#include "Clownfish/Err.h"
#include "Clownfish/VArray.h"
#include "Lucy/Store/FSDirHandle.h"
Modified: lucy/trunk/core/Lucy/Store/Lock.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Store/Lock.cfh?rev=1364340&r1=1364339&r2=1364340&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Store/Lock.cfh (original)
+++ lucy/trunk/core/Lucy/Store/Lock.cfh Sun Jul 22 15:59:39 2012
@@ -157,10 +157,10 @@ class Lucy::Store::LockFileLock cnick LF
/** Lock exception.
*
- * LockErr is a subclass of L<Err|Lucy::Object::Err> which indicates
+ * LockErr is a subclass of L<Err|Clownfish::Err> which indicates
* that a file locking problem occurred.
*/
-public class Lucy::Store::LockErr inherits Lucy::Object::Err {
+public class Lucy::Store::LockErr inherits Clownfish::Err {
public inert incremented LockErr*
new(CharBuf *message);
Modified: lucy/trunk/core/Lucy/Test/Object/TestErr.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Test/Object/TestErr.c?rev=1364340&r1=1364339&r2=1364340&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Test/Object/TestErr.c (original)
+++ lucy/trunk/core/Lucy/Test/Object/TestErr.c Sun Jul 22 15:59:39 2012
@@ -19,7 +19,7 @@
#include "Lucy/Test.h"
#include "Lucy/Test/TestUtils.h"
#include "Lucy/Test/Object/TestErr.h"
-#include "Lucy/Object/Err.h"
+#include "Clownfish/Err.h"
static void
test_To_String(TestBatch *batch) {
Modified: lucy/trunk/core/Lucy/Util/Json/JsonParser.y
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Util/Json/JsonParser.y?rev=1364340&r1=1364339&r2=1364340&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Util/Json/JsonParser.y (original)
+++ lucy/trunk/core/Lucy/Util/Json/JsonParser.y Sun Jul 22 15:59:39 2012
@@ -27,7 +27,7 @@
#include "Clownfish/Hash.h"
#include "Clownfish/VArray.h"
#include "Clownfish/CharBuf.h"
-#include "Lucy/Object/Err.h"
+#include "Clownfish/Err.h"
#include "Lucy/Util/Json.h"
}
Modified: lucy/trunk/core/Lucy/Util/SortUtils.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Util/SortUtils.c?rev=1364340&r1=1364339&r2=1364340&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Util/SortUtils.c (original)
+++ lucy/trunk/core/Lucy/Util/SortUtils.c Sun Jul 22 15:59:39 2012
@@ -20,7 +20,7 @@
#include <string.h>
#include "Lucy/Util/SortUtils.h"
-#include "Lucy/Object/Err.h"
+#include "Clownfish/Err.h"
// Define four-byte and eight-byte types so that we can dereference void
// pointers like integer pointers. The only significance of using int32_t and
Modified: lucy/trunk/core/Lucy/Util/StringHelper.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Util/StringHelper.c?rev=1364340&r1=1364339&r2=1364340&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Util/StringHelper.c (original)
+++ lucy/trunk/core/Lucy/Util/StringHelper.c Sun Jul 22 15:59:39 2012
@@ -21,7 +21,7 @@
#define CHY_USE_SHORT_NAMES
#include "Lucy/Util/StringHelper.h"
-#include "Lucy/Object/Err.h"
+#include "Clownfish/Err.h"
#include "Lucy/Util/Memory.h"
const uint8_t lucy_StrHelp_UTF8_COUNT[] = {
Modified: lucy/trunk/core/Lucy/Util/ToolSet.h
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Util/ToolSet.h?rev=1364340&r1=1364339&r2=1364340&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Util/ToolSet.h (original)
+++ lucy/trunk/core/Lucy/Util/ToolSet.h Sun Jul 22 15:59:39 2012
@@ -40,7 +40,7 @@ extern "C" {
#include "Lucy/Object/BitVector.h"
#include "Clownfish/ByteBuf.h"
#include "Clownfish/CharBuf.h"
-#include "Lucy/Object/Err.h"
+#include "Clownfish/Err.h"
#include "Clownfish/Hash.h"
#include "Lucy/Object/I32Array.h"
#include "Clownfish/Num.h"
Modified: lucy/trunk/example-lang/src/CFBind.h
URL: http://svn.apache.org/viewvc/lucy/trunk/example-lang/src/CFBind.h?rev=1364340&r1=1364339&r2=1364340&view=diff
==============================================================================
--- lucy/trunk/example-lang/src/CFBind.h (original)
+++ lucy/trunk/example-lang/src/CFBind.h Sun Jul 22 15:59:39 2012
@@ -28,7 +28,7 @@ extern "C" {
#include "Lucy/Object/Obj.h"
#include "Clownfish/ByteBuf.h"
#include "Clownfish/CharBuf.h"
-#include "Lucy/Object/Err.h"
+#include "Clownfish/Err.h"
#include "Clownfish/Hash.h"
#include "Clownfish/Num.h"
#include "Clownfish/VArray.h"
Modified: lucy/trunk/perl/buildlib/Lucy/Build/Binding/Object.pm
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/buildlib/Lucy/Build/Binding/Object.pm?rev=1364340&r1=1364339&r2=1364340&view=diff
==============================================================================
--- lucy/trunk/perl/buildlib/Lucy/Build/Binding/Object.pm (original)
+++ lucy/trunk/perl/buildlib/Lucy/Build/Binding/Object.pm Sun Jul 22 15:59:39 2012
@@ -212,7 +212,7 @@ END_SYNOPSIS
$pod_spec->set_synopsis($synopsis);
my $xs_code = <<'END_XS_CODE';
-MODULE = Lucy PACKAGE = Lucy::Object::Err
+MODULE = Lucy PACKAGE = Clownfish::Err
SV*
trap(routine_sv, context_sv)
@@ -226,7 +226,7 @@ END_XS_CODE
my $binding = Clownfish::CFC::Binding::Perl::Class->new(
parcel => "Lucy",
- class_name => "Lucy::Object::Err",
+ class_name => "Clownfish::Err",
);
$binding->bind_constructor( alias => '_new' );
$binding->set_pod_spec($pod_spec);
Copied: lucy/trunk/perl/lib/Clownfish/Err.pm (from r1364277, lucy/trunk/perl/lib/Lucy/Object/Err.pm)
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/lib/Clownfish/Err.pm?p2=lucy/trunk/perl/lib/Clownfish/Err.pm&p1=lucy/trunk/perl/lib/Lucy/Object/Err.pm&r1=1364277&r2=1364340&rev=1364340&view=diff
==============================================================================
--- lucy/trunk/perl/lib/Lucy/Object/Err.pm (original)
+++ lucy/trunk/perl/lib/Clownfish/Err.pm Sun Jul 22 15:59:39 2012
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-package Lucy::Object::Err;
+package Clownfish::Err;
use Lucy;
our $VERSION = '0.003000';
$VERSION = eval $VERSION;
Modified: lucy/trunk/perl/lib/Lucy.pm
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/lib/Lucy.pm?rev=1364340&r1=1364339&r2=1364340&view=diff
==============================================================================
--- lucy/trunk/perl/lib/Lucy.pm (original)
+++ lucy/trunk/perl/lib/Lucy.pm Sun Jul 22 15:59:39 2012
@@ -46,7 +46,7 @@ sub kdump {
warn $kdumper->Dump;
}
-sub error {$Lucy::Object::Err::error}
+sub error {$Clownfish::Err::error}
{
package Lucy::Util::IndexFileNames;
@@ -342,7 +342,7 @@ sub error {$Lucy::Object::Err::error}
}
{
- package Lucy::Object::Err;
+ package Clownfish::Err;
our $VERSION = '0.003000';
$VERSION = eval $VERSION;
sub do_to_string { shift->to_string }
@@ -371,9 +371,9 @@ sub error {$Lucy::Object::Err::error}
sub set_error {
my $val = $_[1];
if ( defined $val ) {
- confess("Not a Lucy::Object::Err")
+ confess("Not a Clownfish::Err")
unless ( blessed($val)
- && $val->isa("Lucy::Object::Err") );
+ && $val->isa("Clownfish::Err") );
}
$error = $val;
}
Modified: lucy/trunk/perl/lib/Lucy.pod
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/lib/Lucy.pod?rev=1364340&r1=1364339&r2=1364340&view=diff
==============================================================================
--- lucy/trunk/perl/lib/Lucy.pod (original)
+++ lucy/trunk/perl/lib/Lucy.pod Sun Jul 22 15:59:39 2012
@@ -208,7 +208,7 @@ single public class method.
my $instream = $folder->open_in( file => 'foo' ) or die Lucy->error;
Access a shared variable which is set by some routines on failure. It will
-always be either a L<Lucy::Object::Err> object or undef.
+always be either a L<Clownfish::Err> object or undef.
=head1 SUPPORT
Modified: lucy/trunk/perl/t/binding/034-err.t
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/t/binding/034-err.t?rev=1364340&r1=1364339&r2=1364340&view=diff
==============================================================================
--- lucy/trunk/perl/t/binding/034-err.t (original)
+++ lucy/trunk/perl/t/binding/034-err.t Sun Jul 22 15:59:39 2012
@@ -20,46 +20,46 @@ use Lucy::Test;
package Nirvana;
sub enter {
- die Lucy::Object::Err->new("blam");
+ die Clownfish::Err->new("blam");
}
package GloriousDeath;
-use base qw( Lucy::Object::Err );
+use base qw( Clownfish::Err );
package main;
use Test::More tests => 10;
-isa_ok( Lucy::Object::Err->new("Bad stuff happened"),
- 'Lucy::Object::Err', "new" );
+isa_ok( Clownfish::Err->new("Bad stuff happened"),
+ 'Clownfish::Err', "new" );
my $glorious = GloriousDeath->new("Banzai");
isa_ok( $glorious, 'GloriousDeath', "subclass" );
-isa_ok( $glorious, 'Lucy::Object::Err', "subclass" );
+isa_ok( $glorious, 'Clownfish::Err', "subclass" );
-isa_ok( Lucy::Object::Err::trap( "bite_the_dust", undef ),
- 'Lucy::Object::Err', "trap string call" );
+isa_ok( Clownfish::Err::trap( "bite_the_dust", undef ),
+ 'Clownfish::Err', "trap string call" );
-isa_ok( Lucy::Object::Err::trap( "Nirvana::enter", undef ),
- 'Lucy::Object::Err', "trap string call in another package" );
+isa_ok( Clownfish::Err::trap( "Nirvana::enter", undef ),
+ 'Clownfish::Err', "trap string call in another package" );
-isa_ok( Lucy::Object::Err::trap( \&bite_the_dust, undef ),
- 'Lucy::Object::Err', "trap sub ref" );
+isa_ok( Clownfish::Err::trap( \&bite_the_dust, undef ),
+ 'Clownfish::Err', "trap sub ref" );
-isa_ok( Lucy::Object::Err::trap( \&Nirvana::enter, undef ),
- 'Lucy::Object::Err', "trap sub ref to another package" );
+isa_ok( Clownfish::Err::trap( \&Nirvana::enter, undef ),
+ 'Clownfish::Err', "trap sub ref to another package" );
-isa_ok( Lucy::Object::Err::trap( \&judge_gladiator, "down" ),
- 'Lucy::Object::Err', "pass argument to 'trap'" );
+isa_ok( Clownfish::Err::trap( \&judge_gladiator, "down" ),
+ 'Clownfish::Err', "pass argument to 'trap'" );
my $last_words = sub { die "Rosebud" };
-isa_ok( Lucy::Object::Err::trap( $last_words, undef ),
- 'Lucy::Object::Err', "Wrap host exception in Err" );
+isa_ok( Clownfish::Err::trap( $last_words, undef ),
+ 'Clownfish::Err', "Wrap host exception in Err" );
my $succeed = sub { };
-ok( !defined( Lucy::Object::Err::trap( $succeed, undef ) ),
+ok( !defined( Clownfish::Err::trap( $succeed, undef ) ),
"nothing to trap" );
-sub bite_the_dust { die Lucy::Object::Err->new("gasp") }
+sub bite_the_dust { die Clownfish::Err->new("gasp") }
sub judge_gladiator {
my $thumb = shift;
Copied: lucy/trunk/perl/xs/Clownfish/Err.c (from r1364284, lucy/trunk/perl/xs/Lucy/Object/Err.c)
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/xs/Clownfish/Err.c?p2=lucy/trunk/perl/xs/Clownfish/Err.c&p1=lucy/trunk/perl/xs/Lucy/Object/Err.c&r1=1364284&r2=1364340&rev=1364340&view=diff
==============================================================================
--- lucy/trunk/perl/xs/Lucy/Object/Err.c (original)
+++ lucy/trunk/perl/xs/Clownfish/Err.c Sun Jul 22 15:59:39 2012
@@ -67,7 +67,7 @@ lucy_Err_do_throw(lucy_Err *err) {
PUSHMARK(SP);
XPUSHs(sv_2mortal(error_sv));
PUTBACK;
- call_pv("Lucy::Object::Err::do_throw", G_DISCARD);
+ call_pv("Clownfish::Err::do_throw", G_DISCARD);
FREETMPS;
LEAVE;
}
@@ -124,7 +124,7 @@ lucy_Err_trap(Cfish_Err_Attempt_t routin
SV *dollar_at = get_sv("@", FALSE);
if (SvTRUE(dollar_at)) {
if (sv_isobject(dollar_at)
- && sv_derived_from(dollar_at,"Lucy::Object::Err")
+ && sv_derived_from(dollar_at,"Clownfish::Err")
) {
IV error_iv = SvIV(SvRV(dollar_at));
error = INT2PTR(lucy_Err*, error_iv);
Modified: lucy/trunk/perl/xs/Clownfish/Host.c
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/xs/Clownfish/Host.c?rev=1364340&r1=1364339&r2=1364340&view=diff
==============================================================================
--- lucy/trunk/perl/xs/Clownfish/Host.c (original)
+++ lucy/trunk/perl/xs/Clownfish/Host.c Sun Jul 22 15:59:39 2012
@@ -21,7 +21,7 @@
#include "Lucy/Object/Obj.h"
#include "Clownfish/Host.h"
#include "Clownfish/CharBuf.h"
-#include "Lucy/Object/Err.h"
+#include "Clownfish/Err.h"
#include "Lucy/Util/Memory.h"
static SV*
Modified: lucy/trunk/perl/xs/Lucy/Object/Obj.c
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/xs/Lucy/Object/Obj.c?rev=1364340&r1=1364339&r2=1364340&view=diff
==============================================================================
--- lucy/trunk/perl/xs/Lucy/Object/Obj.c (original)
+++ lucy/trunk/perl/xs/Lucy/Object/Obj.c Sun Jul 22 15:59:39 2012
@@ -23,7 +23,7 @@
#include "Lucy/Object/Obj.h"
#include "Clownfish/CharBuf.h"
-#include "Lucy/Object/Err.h"
+#include "Clownfish/Err.h"
#include "Clownfish/VTable.h"
#include "Lucy/Util/Memory.h"
Modified: lucy/trunk/perl/xs/XSBind.h
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/xs/XSBind.h?rev=1364340&r1=1364339&r2=1364340&view=diff
==============================================================================
--- lucy/trunk/perl/xs/XSBind.h (original)
+++ lucy/trunk/perl/xs/XSBind.h Sun Jul 22 15:59:39 2012
@@ -28,7 +28,7 @@ extern "C" {
#include "Lucy/Object/Obj.h"
#include "Clownfish/ByteBuf.h"
#include "Clownfish/CharBuf.h"
-#include "Lucy/Object/Err.h"
+#include "Clownfish/Err.h"
#include "Clownfish/Hash.h"
#include "Clownfish/Num.h"
#include "Clownfish/VArray.h"
Modified: lucy/trunk/ruby/src/CFBind.h
URL: http://svn.apache.org/viewvc/lucy/trunk/ruby/src/CFBind.h?rev=1364340&r1=1364339&r2=1364340&view=diff
==============================================================================
--- lucy/trunk/ruby/src/CFBind.h (original)
+++ lucy/trunk/ruby/src/CFBind.h Sun Jul 22 15:59:39 2012
@@ -28,7 +28,7 @@ extern "C" {
#include "Lucy/Object/Obj.h"
#include "Clownfish/ByteBuf.h"
#include "Clownfish/CharBuf.h"
-#include "Lucy/Object/Err.h"
+#include "Clownfish/Err.h"
#include "Clownfish/Hash.h"
#include "Clownfish/Num.h"
#include "Clownfish/VArray.h"