Author: marvin
Date: Sun Jul 22 15:01:59 2012
New Revision: 1364319
URL: http://svn.apache.org/viewvc?rev=1364319&view=rev
Log:
LUCY-242 Move Num and subclasses under Clownfish.
Added:
lucy/trunk/core/Clownfish/Num.c
- copied, changed from r1364278, lucy/trunk/core/Lucy/Object/Num.c
lucy/trunk/core/Clownfish/Num.cfh
- copied, changed from r1364277, lucy/trunk/core/Lucy/Object/Num.cfh
lucy/trunk/perl/lib/Clownfish/Num.pm
- copied, changed from r1364277, lucy/trunk/perl/lib/Lucy/Object/Num.pm
Removed:
lucy/trunk/core/Lucy/Object/Num.c
lucy/trunk/core/Lucy/Object/Num.cfh
lucy/trunk/perl/lib/Lucy/Object/Num.pm
Modified:
lucy/trunk/c/src/CFBind.h
lucy/trunk/core/Clownfish/VTable.c
lucy/trunk/core/Lucy.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/buildlib/Lucy/Redacted.pm
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=1364319&r1=1364318&r2=1364319&view=diff
==============================================================================
--- lucy/trunk/c/src/CFBind.h (original)
+++ lucy/trunk/c/src/CFBind.h Sun Jul 22 15:01:59 2012
@@ -30,7 +30,7 @@ extern "C" {
#include "Lucy/Object/CharBuf.h"
#include "Lucy/Object/Err.h"
#include "Lucy/Object/Hash.h"
-#include "Lucy/Object/Num.h"
+#include "Clownfish/Num.h"
#include "Lucy/Object/VArray.h"
#include "Clownfish/VTable.h"
Copied: lucy/trunk/core/Clownfish/Num.c (from r1364278,
lucy/trunk/core/Lucy/Object/Num.c)
URL:
http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/Num.c?p2=lucy/trunk/core/Clownfish/Num.c&p1=lucy/trunk/core/Lucy/Object/Num.c&r1=1364278&r2=1364319&rev=1364319&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Object/Num.c (original)
+++ lucy/trunk/core/Clownfish/Num.c Sun Jul 22 15:01:59 2012
@@ -26,7 +26,7 @@
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
-#include "Lucy/Object/Num.h"
+#include "Clownfish/Num.h"
#include "Lucy/Object/CharBuf.h"
#include "Lucy/Object/Err.h"
#include "Clownfish/VTable.h"
Copied: lucy/trunk/core/Clownfish/Num.cfh (from r1364277,
lucy/trunk/core/Lucy/Object/Num.cfh)
URL:
http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/Num.cfh?p2=lucy/trunk/core/Clownfish/Num.cfh&p1=lucy/trunk/core/Lucy/Object/Num.cfh&r1=1364277&r2=1364319&rev=1364319&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Object/Num.cfh (original)
+++ lucy/trunk/core/Clownfish/Num.cfh Sun Jul 22 15:01:59 2012
@@ -18,7 +18,7 @@ parcel Lucy;
/** Abstract base class for numbers.
*/
-abstract class Lucy::Object::Num inherits Lucy::Object::Obj {
+abstract class Clownfish::Num inherits Lucy::Object::Obj {
inert Num*
init(Num *self);
@@ -29,7 +29,7 @@ abstract class Lucy::Object::Num inherit
/** Abstract base class for floating point numbers.
*/
-abstract class Lucy::Object::FloatNum inherits Lucy::Object::Num {
+abstract class Clownfish::FloatNum inherits Clownfish::Num {
inert FloatNum*
init(FloatNum *self);
@@ -44,7 +44,7 @@ abstract class Lucy::Object::FloatNum in
/** Abstract base class for Integers.
*/
-abstract class Lucy::Object::IntNum inherits Lucy::Object::Num {
+abstract class Clownfish::IntNum inherits Clownfish::Num {
inert IntNum*
init(IntNum *self);
@@ -58,7 +58,7 @@ abstract class Lucy::Object::IntNum inhe
/** Single precision floating point number.
*/
-class Lucy::Object::Float32 inherits Lucy::Object::FloatNum {
+class Clownfish::Float32 inherits Clownfish::FloatNum {
float value;
@@ -101,7 +101,7 @@ class Lucy::Object::Float32 inherits Luc
/** Double precision floating point number.
*/
-class Lucy::Object::Float64 inherits Lucy::Object::FloatNum {
+class Clownfish::Float64 inherits Clownfish::FloatNum {
double value;
@@ -144,8 +144,8 @@ class Lucy::Object::Float64 inherits Luc
/** 32-bit signed integer.
*/
-class Lucy::Object::Integer32 cnick Int32
- inherits Lucy::Object::IntNum {
+class Clownfish::Integer32 cnick Int32
+ inherits Clownfish::IntNum {
int32_t value;
@@ -189,8 +189,8 @@ class Lucy::Object::Integer32 cnick Int3
/**
* 64-bit signed integer.
*/
-class Lucy::Object::Integer64 cnick Int64
- inherits Lucy::Object::IntNum {
+class Clownfish::Integer64 cnick Int64
+ inherits Clownfish::IntNum {
int64_t value;
@@ -241,7 +241,7 @@ class Lucy::Object::Integer64 cnick Int6
* There are only two singleton instances of this class: CFISH_TRUE and
* CFISH_FALSE.
*/
-class Lucy::Object::BoolNum cnick Bool inherits Lucy::Object::IntNum {
+class Clownfish::BoolNum cnick Bool inherits Clownfish::IntNum {
bool_t value;
CharBuf *string;
Modified: lucy/trunk/core/Clownfish/VTable.c
URL:
http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/VTable.c?rev=1364319&r1=1364318&r2=1364319&view=diff
==============================================================================
--- lucy/trunk/core/Clownfish/VTable.c (original)
+++ lucy/trunk/core/Clownfish/VTable.c Sun Jul 22 15:01:59 2012
@@ -30,7 +30,7 @@
#include "Lucy/Object/Hash.h"
#include "Clownfish/LockFreeRegistry.h"
#include "Clownfish/Method.h"
-#include "Lucy/Object/Num.h"
+#include "Clownfish/Num.h"
#include "Lucy/Object/VArray.h"
#include "Lucy/Util/Atomic.h"
#include "Lucy/Util/Memory.h"
Modified: lucy/trunk/core/Lucy.c
URL:
http://svn.apache.org/viewvc/lucy/trunk/core/Lucy.c?rev=1364319&r1=1364318&r2=1364319&view=diff
==============================================================================
--- lucy/trunk/core/Lucy.c (original)
+++ lucy/trunk/core/Lucy.c Sun Jul 22 15:01:59 2012
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "Lucy/Object/Num.h"
+#include "Clownfish/Num.h"
#include "Lucy/Object/Hash.h"
#include "Lucy/Object/Err.h"
Modified: lucy/trunk/core/Lucy/Util/ToolSet.h
URL:
http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Util/ToolSet.h?rev=1364319&r1=1364318&r2=1364319&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Util/ToolSet.h (original)
+++ lucy/trunk/core/Lucy/Util/ToolSet.h Sun Jul 22 15:01:59 2012
@@ -43,7 +43,7 @@ extern "C" {
#include "Lucy/Object/Err.h"
#include "Lucy/Object/Hash.h"
#include "Lucy/Object/I32Array.h"
-#include "Lucy/Object/Num.h"
+#include "Clownfish/Num.h"
#include "Lucy/Object/VArray.h"
#include "Clownfish/VTable.h"
#include "Lucy/Util/NumberUtils.h"
Modified: lucy/trunk/example-lang/src/CFBind.h
URL:
http://svn.apache.org/viewvc/lucy/trunk/example-lang/src/CFBind.h?rev=1364319&r1=1364318&r2=1364319&view=diff
==============================================================================
--- lucy/trunk/example-lang/src/CFBind.h (original)
+++ lucy/trunk/example-lang/src/CFBind.h Sun Jul 22 15:01:59 2012
@@ -30,7 +30,7 @@ extern "C" {
#include "Lucy/Object/CharBuf.h"
#include "Lucy/Object/Err.h"
#include "Lucy/Object/Hash.h"
-#include "Lucy/Object/Num.h"
+#include "Clownfish/Num.h"
#include "Lucy/Object/VArray.h"
#include "Clownfish/VTable.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=1364319&r1=1364318&r2=1364319&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:01:59
2012
@@ -477,7 +477,7 @@ sub bind_lockfreeregistry {
sub bind_float32 {
my $float32_xs_code = <<'END_XS_CODE';
-MODULE = Lucy PACKAGE = Lucy::Object::Float32
+MODULE = Lucy PACKAGE = Clownfish::Float32
SV*
new(either_sv, value)
@@ -494,7 +494,7 @@ END_XS_CODE
my $binding = Clownfish::CFC::Binding::Perl::Class->new(
parcel => "Lucy",
- class_name => "Lucy::Object::Float32",
+ class_name => "Clownfish::Float32",
);
$binding->append_xs($float32_xs_code);
$binding->exclude_constructor;
@@ -504,7 +504,7 @@ END_XS_CODE
sub bind_float64 {
my $float64_xs_code = <<'END_XS_CODE';
-MODULE = Lucy PACKAGE = Lucy::Object::Float64
+MODULE = Lucy PACKAGE = Clownfish::Float64
SV*
new(either_sv, value)
@@ -521,7 +521,7 @@ END_XS_CODE
my $binding = Clownfish::CFC::Binding::Perl::Class->new(
parcel => "Lucy",
- class_name => "Lucy::Object::Float64",
+ class_name => "Clownfish::Float64",
);
$binding->append_xs($float64_xs_code);
$binding->exclude_constructor;
Modified: lucy/trunk/perl/buildlib/Lucy/Redacted.pm
URL:
http://svn.apache.org/viewvc/lucy/trunk/perl/buildlib/Lucy/Redacted.pm?rev=1364319&r1=1364318&r2=1364319&view=diff
==============================================================================
--- lucy/trunk/perl/buildlib/Lucy/Redacted.pm (original)
+++ lucy/trunk/perl/buildlib/Lucy/Redacted.pm Sun Jul 22 15:01:59 2012
@@ -49,7 +49,7 @@ sub redacted {
sub hidden {
return qw(
Lucy::Analysis::Inversion
- Lucy::Object::Num
+ Clownfish::Num
Lucy::Plan::Int32Type
Lucy::Plan::Int64Type
Lucy::Plan::Float32Type
Copied: lucy/trunk/perl/lib/Clownfish/Num.pm (from r1364277,
lucy/trunk/perl/lib/Lucy/Object/Num.pm)
URL:
http://svn.apache.org/viewvc/lucy/trunk/perl/lib/Clownfish/Num.pm?p2=lucy/trunk/perl/lib/Clownfish/Num.pm&p1=lucy/trunk/perl/lib/Lucy/Object/Num.pm&r1=1364277&r2=1364319&rev=1364319&view=diff
==============================================================================
--- lucy/trunk/perl/lib/Lucy/Object/Num.pm (original)
+++ lucy/trunk/perl/lib/Clownfish/Num.pm Sun Jul 22 15:01:59 2012
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-package Lucy::Object::Num;
+package Clownfish::Num;
use Lucy;
our $VERSION = '0.003000';
$VERSION = eval $VERSION;
Modified: lucy/trunk/perl/xs/XSBind.h
URL:
http://svn.apache.org/viewvc/lucy/trunk/perl/xs/XSBind.h?rev=1364319&r1=1364318&r2=1364319&view=diff
==============================================================================
--- lucy/trunk/perl/xs/XSBind.h (original)
+++ lucy/trunk/perl/xs/XSBind.h Sun Jul 22 15:01:59 2012
@@ -30,7 +30,7 @@ extern "C" {
#include "Lucy/Object/CharBuf.h"
#include "Lucy/Object/Err.h"
#include "Lucy/Object/Hash.h"
-#include "Lucy/Object/Num.h"
+#include "Clownfish/Num.h"
#include "Lucy/Object/VArray.h"
#include "Clownfish/VTable.h"
Modified: lucy/trunk/ruby/src/CFBind.h
URL:
http://svn.apache.org/viewvc/lucy/trunk/ruby/src/CFBind.h?rev=1364319&r1=1364318&r2=1364319&view=diff
==============================================================================
--- lucy/trunk/ruby/src/CFBind.h (original)
+++ lucy/trunk/ruby/src/CFBind.h Sun Jul 22 15:01:59 2012
@@ -30,7 +30,7 @@ extern "C" {
#include "Lucy/Object/CharBuf.h"
#include "Lucy/Object/Err.h"
#include "Lucy/Object/Hash.h"
-#include "Lucy/Object/Num.h"
+#include "Clownfish/Num.h"
#include "Lucy/Object/VArray.h"
#include "Clownfish/VTable.h"
