[lucy-commits] svn commit: r1067742 - in /incubator/lucy/trunk/clownfish: lib/Clownfish/Parser.pm lib/Clownfish/Type.pm lib/Clownfish/Type/Float.pm lib/Clownfish/Type/Integer.pm lib/Clownfish/Type/Primitive.pm t/101-primitive_type.t

[ma...@apache.org]

Author: marvin
Date: Sun Feb  6 20:14:30 2011
New Revision: 1067742

URL: http://svn.apache.org/viewvc?rev=1067742&view=rev
Log:
Factor away Clownfish::Type::Primitive, rendered obsolete by PRIMITIVE flag
within Clownfish::Type.

Removed:
    incubator/lucy/trunk/clownfish/lib/Clownfish/Type/Primitive.pm
Modified:
    incubator/lucy/trunk/clownfish/lib/Clownfish/Parser.pm
    incubator/lucy/trunk/clownfish/lib/Clownfish/Type.pm
    incubator/lucy/trunk/clownfish/lib/Clownfish/Type/Float.pm
    incubator/lucy/trunk/clownfish/lib/Clownfish/Type/Integer.pm
    incubator/lucy/trunk/clownfish/t/101-primitive_type.t

Modified: incubator/lucy/trunk/clownfish/lib/Clownfish/Parser.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/lib/Clownfish/Parser.pm?rev=1067742&r1=1067741&r2=1067742&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/lib/Clownfish/Parser.pm (original)
+++ incubator/lucy/trunk/clownfish/lib/Clownfish/Parser.pm Sun Feb  6 20:14:30 2011
@@ -21,7 +21,6 @@ use base qw( Parse::RecDescent );
 
 use Clownfish::Parcel;
 use Clownfish::Type;
-use Clownfish::Type::Primitive;
 use Clownfish::Type::Integer;
 use Clownfish::Type::Float;
 use Clownfish::Type::Void;

Modified: incubator/lucy/trunk/clownfish/lib/Clownfish/Type.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/lib/Clownfish/Type.pm?rev=1067742&r1=1067741&r2=1067742&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/lib/Clownfish/Type.pm (original)
+++ incubator/lucy/trunk/clownfish/lib/Clownfish/Type.pm Sun Feb  6 20:14:30 2011
@@ -160,7 +160,7 @@ Shorthand for various $type->isa($packag
 
 =item * is_object: Clownfish::Type::Object
 
-=item * is_primitive: Clownfish::Type::Primitive
+=item * is_primitive: primitive, concrete type, i.e. not an object or composite.
 
 =item * is_integer: Clownfish::Type::Integer
 

Modified: incubator/lucy/trunk/clownfish/lib/Clownfish/Type/Float.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/lib/Clownfish/Type/Float.pm?rev=1067742&r1=1067741&r2=1067742&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/lib/Clownfish/Type/Float.pm (original)
+++ incubator/lucy/trunk/clownfish/lib/Clownfish/Type/Float.pm Sun Feb  6 20:14:30 2011
@@ -17,7 +17,7 @@ use strict;
 use warnings;
 
 package Clownfish::Type::Float;
-use base qw( Clownfish::Type::Primitive );
+use base qw( Clownfish::Type );
 use Clownfish::Util qw( verify_args );
 use Carp;
 
@@ -42,8 +42,9 @@ sub new {
 
     return $either->SUPER::new(
         %args,
-        c_string => $c_string,
-        floating => 1,
+        c_string  => $c_string,
+        floating  => 1,
+        primitive => 1,
     );
 }
 

Modified: incubator/lucy/trunk/clownfish/lib/Clownfish/Type/Integer.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/lib/Clownfish/Type/Integer.pm?rev=1067742&r1=1067741&r2=1067742&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/lib/Clownfish/Type/Integer.pm (original)
+++ incubator/lucy/trunk/clownfish/lib/Clownfish/Type/Integer.pm Sun Feb  6 20:14:30 2011
@@ -17,7 +17,7 @@ use strict;
 use warnings;
 
 package Clownfish::Type::Integer;
-use base qw( Clownfish::Type::Primitive );
+use base qw( Clownfish::Type );
 use Clownfish::Util qw( verify_args );
 use Carp;
 use Config;
@@ -62,8 +62,9 @@ sub new {
 
     my $self = $either->SUPER::new(
         %args,
-        c_string => $c_string,
-        integer  => 1,
+        c_string  => $c_string,
+        integer   => 1,
+        primitive => 1,
     );
     $sizeof{$self} = $sizeof;
     return $self;

Modified: incubator/lucy/trunk/clownfish/t/101-primitive_type.t
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/t/101-primitive_type.t?rev=1067742&r1=1067741&r2=1067742&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/t/101-primitive_type.t (original)
+++ incubator/lucy/trunk/clownfish/t/101-primitive_type.t Sun Feb  6 20:14:30 2011
@@ -17,7 +17,12 @@ use strict;
 use warnings;
 
 package MyPrimitiveType;
-use base qw( Clownfish::Type::Primitive );
+use base qw( Clownfish::Type );
+
+sub new {
+    my $either = shift;
+    return $either->SUPER::new( @_, primitive => 1, );
+}
 
 package main;
 use Test::More tests => 4;