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/03/15 14:48:56 UTC
[lucy-commits] svn commit: r1300981 [2/2] - in /incubator/lucy/trunk: clownfish/perl/
clownfish/perl/lib/Clownfish/ clownfish/perl/lib/Clownfish/CFC/
clownfish/perl/lib/Clownfish/CFC/Model/ clownfish/perl/t/ clownfish/src/
perl/buildlib/Lucy/ ruby/
Modified: incubator/lucy/trunk/clownfish/src/CFCParcel.h
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCParcel.h?rev=1300981&r1=1300980&r2=1300981&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCParcel.h (original)
+++ incubator/lucy/trunk/clownfish/src/CFCParcel.h Thu Mar 15 13:48:54 2012
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-/** Clownfish::CFC::Parcel - Collection of code.
+/** Clownfish::CFC::Model::Parcel - Collection of code.
*
* A Parcel is a cohesive collection of code, which could, in theory, be
* published as as a single entity.
@@ -24,9 +24,9 @@
*
* prefix_ClassNick_local_symbol
*
- * Clownfish::CFC::Parcel supports the first tier, specifying initial prefixes.
- * These prefixes come in three capitalization variants: prefix_, Prefix_, and
- * PREFIX_.
+ * Clownfish::CFC::Model::Parcel supports the first tier, specifying initial
+ * prefixes. These prefixes come in three capitalization variants: prefix_,
+ * Prefix_, and PREFIX_.
*/
#ifndef H_CFCPARCEL
Modified: incubator/lucy/trunk/clownfish/src/CFCParseHeader.y
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCParseHeader.y?rev=1300981&r1=1300980&r2=1300981&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCParseHeader.y (original)
+++ incubator/lucy/trunk/clownfish/src/CFCParseHeader.y Thu Mar 15 13:48:54 2012
@@ -397,7 +397,7 @@ class_defs(A) ::= class_defs(B) var_decl
class_defs(A) ::= class_defs(B) subroutine_declaration_statement(C).
{
A = B;
- if (strcmp(CFCBase_get_cfc_class(C), "Clownfish::CFC::Function") == 0) {
+ if (strcmp(CFCBase_get_cfc_class(C), "Clownfish::CFC::Model::Function") == 0) {
CFCClass_add_function(A, (CFCFunction*)C);
}
else {
Modified: incubator/lucy/trunk/clownfish/src/CFCPerl.h
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCPerl.h?rev=1300981&r1=1300980&r2=1300981&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCPerl.h (original)
+++ incubator/lucy/trunk/clownfish/src/CFCPerl.h Thu Mar 15 13:48:54 2012
@@ -25,21 +25,22 @@ typedef struct CFCPerl CFCPerl;
struct CFCParcel;
struct CFCHierarchy;
-/** Clownfish::CFC::Binding::Perl - Perl bindings for a Clownfish::CFC::Hierarchy.
+/** Clownfish::CFC::Binding::Perl - Perl bindings for a
+ * Clownfish::CFC::Model::Hierarchy.
*
- * Clownfish::CFC::Binding::Perl presents an interface for auto-generating XS and
- * Perl code to bind C code for a Clownfish class hierarchy to Perl.
+ * Clownfish::CFC::Binding::Perl presents an interface for auto-generating XS
+ * and Perl code to bind C code for a Clownfish class hierarchy to Perl.
*
* In theory this module could be much more flexible and its API could be more
* elegant. There are many ways which you could walk the parsed parcels,
- * classes, methods, etc. in a Clownfish::CFC::Hierarchy and generate binding code.
- * However, our needs are very limited, so we are content with a "one size fits
- * one" solution.
- *
- * In particular, this module assumes that the XS bindings for all classes in the
- * hierarchy should be assembled into a single shared object which belongs to the
- * primary, "boot" class. There's no reason why it could not write one .xs file
- * per class, or one per parcel, instead.
+ * classes, methods, etc. in a Clownfish::CFC::Model::Hierarchy and generate
+ * binding code. However, our needs are very limited, so we are content with
+ * a "one size fits one" solution.
+ *
+ * In particular, this module assumes that the XS bindings for all classes in
+ * the hierarchy should be assembled into a single shared object which belongs
+ * to the primary, "boot" class. There's no reason why it could not write one
+ * .xs file per class, or one per parcel, instead.
*
* The files written by this class are derived from the name of the boot class.
* If it is "Crustacean", the following files will be generated.
@@ -54,9 +55,9 @@ struct CFCHierarchy;
*/
/**
- * @param parcel The L<Clownfish::CFC::Parcel> to which the C<boot_class>
- * belongs.
- * @param hierarchy A Clownfish::CFC::Hierarchy.
+ * @param parcel The L<Clownfish::CFC::Model::Parcel> to which the
+ * C<boot_class> belongs.
+ * @param hierarchy A Clownfish::CFC::Model::Hierarchy.
* @param lib_dir location of the Perl lib directory to which files will be
* written.
* @param boot_class The name of the main class, which will own the shared
Modified: incubator/lucy/trunk/clownfish/src/CFCPerlClass.h
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCPerlClass.h?rev=1300981&r1=1300980&r2=1300981&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCPerlClass.h (original)
+++ incubator/lucy/trunk/clownfish/src/CFCPerlClass.h Thu Mar 15 13:48:54 2012
@@ -30,11 +30,11 @@ struct CFCPerlMethod;
struct CFCPerlConstructor;
/** Clownfish::CFC::Binding::Perl::Class - Generate Perl binding code for a
- * Clownfish::CFC::Class.
+ * Clownfish::CFC::Model::Class.
*/
/**
- * @param parcel A Clownfish::CFC::Parcel.
+ * @param parcel A Clownfish::CFC::Model::Parcel.
* @param class_name The name of the class to be registered.
*/
CFCPerlClass*
@@ -117,7 +117,7 @@ CFCPerlClass_constructor_bindings(CFCPer
char*
CFCPerlClass_create_pod(CFCPerlClass *self);
-/** Accessor for the Clownfish::CFC::Class module to be bound.
+/** Accessor for the Clownfish::CFC::Model::Class module to be bound.
*/
struct CFCClass*
CFCPerlClass_get_client(CFCPerlClass *self);
Modified: incubator/lucy/trunk/clownfish/src/CFCPerlConstructor.h
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCPerlConstructor.h?rev=1300981&r1=1300980&r2=1300981&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCPerlConstructor.h (original)
+++ incubator/lucy/trunk/clownfish/src/CFCPerlConstructor.h Thu Mar 15 13:48:54 2012
@@ -34,7 +34,7 @@ struct CFCClass;
*/
/**
- * @param klass A L<Clownfish::CFC::Class>.
+ * @param klass A L<Clownfish::CFC::Model::Class>.
* @param alias The Perl name for the constructor.
* @param initializer The name of the function which should be bound (default
* "init").
Modified: incubator/lucy/trunk/clownfish/src/CFCPerlMethod.h
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCPerlMethod.h?rev=1300981&r1=1300980&r2=1300981&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCPerlMethod.h (original)
+++ incubator/lucy/trunk/clownfish/src/CFCPerlMethod.h Thu Mar 15 13:48:54 2012
@@ -38,7 +38,7 @@ CFCPerlMethod*
CFCPerlMethod_new(struct CFCMethod *method, const char *alias);
/**
- * @param method A Clownfish::CFC::Method.
+ * @param method A Clownfish::CFC::Model::Method.
* @param alias The perl name for the method. Defaults to the lowercased name
* of the supplied Clownfish Method.
*/
Modified: incubator/lucy/trunk/clownfish/src/CFCPerlPod.h
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCPerlPod.h?rev=1300981&r1=1300980&r2=1300981&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCPerlPod.h (original)
+++ incubator/lucy/trunk/clownfish/src/CFCPerlPod.h Thu Mar 15 13:48:54 2012
@@ -101,12 +101,12 @@ CFCPerlPod_get_description(CFCPerlPod *s
char*
CFCPerlPod_perlify_doc_text(CFCPerlPod *self, const char *source);
-/** Autogenerate pod for either a Clownfish::CFC::Method or a
- * Clownfish::CFC::Function.
+/** Autogenerate pod for either a Clownfish::CFC::Model::Method or a
+ * Clownfish::CFC::Model::Function.
*
* @param func The Method or Function.
* @param alias The Perl name for the subroutine.
- * @param klass The Clownfish::CFC::Class.
+ * @param klass The Clownfish::CFC::Model::Class.
* @param code_sample Optional example usage code.
* @param is_construtor Indicate whether this is a constructor, as the default
* argument handling is different for constructors.
Modified: incubator/lucy/trunk/clownfish/src/CFCPerlSub.h
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCPerlSub.h?rev=1300981&r1=1300980&r2=1300981&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCPerlSub.h (original)
+++ incubator/lucy/trunk/clownfish/src/CFCPerlSub.h Thu Mar 15 13:48:54 2012
@@ -40,7 +40,7 @@ struct CFCPerlSub {
#endif
/** Clownfish::CFC::Binding::Perl::Subroutine - Abstract base binding for a
- * Clownfish::CFC::Function.
+ * Clownfish::CFC::Model::Function.
*
* This class is used to generate binding code for invoking Clownfish's
* functions and methods across the Perl/C barrier.
@@ -48,7 +48,7 @@ struct CFCPerlSub {
/** Abstract constructor.
*
- * @param param_list A Clownfish::CFC::ParamList.
+ * @param param_list A Clownfish::CFC::Model::ParamList.
* @param class_name The name of the Perl class that the subroutine belongs
* to.
* @param alias The local, unqualified name for the Perl subroutine that
Modified: incubator/lucy/trunk/clownfish/src/CFCPerlTypeMap.h
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCPerlTypeMap.h?rev=1300981&r1=1300980&r2=1300981&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCPerlTypeMap.h (original)
+++ incubator/lucy/trunk/clownfish/src/CFCPerlTypeMap.h Thu Mar 15 13:48:54 2012
@@ -63,7 +63,7 @@ CFCPerlTypeMap_to_perl(struct CFCType *t
* between them when checking arguments. Keeping the entries up-to-date
* manually as classes come and go would be a pain.
*
- * @param hierarchy A Clownfish::CFC::Hierarchy.
+ * @param hierarchy A Clownfish::CFC::Model::Hierarchy.
*/
void
CFCPerlTypeMap_write_xs_typemap(struct CFCHierarchy *hierarchy);
Modified: incubator/lucy/trunk/clownfish/src/CFCSymbol.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCSymbol.c?rev=1300981&r1=1300980&r2=1300981&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCSymbol.c (original)
+++ incubator/lucy/trunk/clownfish/src/CFCSymbol.c Thu Mar 15 13:48:54 2012
@@ -28,7 +28,7 @@
#include "CFCUtil.h"
const static CFCMeta CFCSYMBOL_META = {
- "Clownfish::CFC::Symbol",
+ "Clownfish::CFC::Model::Symbol",
sizeof(CFCSymbol),
(CFCBase_destroy_t)CFCSymbol_destroy
};
Modified: incubator/lucy/trunk/clownfish/src/CFCSymbol.h
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCSymbol.h?rev=1300981&r1=1300980&r2=1300981&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCSymbol.h (original)
+++ incubator/lucy/trunk/clownfish/src/CFCSymbol.h Thu Mar 15 13:48:54 2012
@@ -14,10 +14,11 @@
* limitations under the License.
*/
-/** Clownfish::CFC::Symbol - Base class for Clownfish symbols.
+/** Clownfish::CFC::Model::Symbol - Base class for Clownfish symbols.
*
- * Clownfish::CFC::Symbol serves as a parent class for entities which may live in
- * the global namespace, such as classes, functions, methods, and variables.
+ * Clownfish::CFC::Model::Symbol serves as a parent class for entities which
+ * may live in the global namespace, such as classes, functions, methods, and
+ * variables.
*/
#ifndef H_CFCSYMBOL
@@ -53,8 +54,8 @@ int
CFCSymbol_validate_class_name_component(const char *name);
/**
- * @param parcel A Clownfish::CFC::Parcel. If not supplied, will be assigned to the
- * default Parcel.
+ * @param parcel A Clownfish::CFC::Model::Parcel. If not supplied, will be
+ * assigned to the default Parcel.
* @param exposure The scope in which the symbol is exposed. Must be
* 'public', 'parcel', 'private', or 'local'.
* @param class_name A optional class name, consisting of one or more
Modified: incubator/lucy/trunk/clownfish/src/CFCType.h
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCType.h?rev=1300981&r1=1300980&r2=1300981&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCType.h (original)
+++ incubator/lucy/trunk/clownfish/src/CFCType.h Thu Mar 15 13:48:54 2012
@@ -45,7 +45,7 @@ struct CFCParcel;
*
* @param flags Flags which apply to the Type. Supplying incompatible flags
* will trigger an error.
- * @param parcel A Clownfish::CFC::Parcel.
+ * @param parcel A Clownfish::CFC::Model::Parcel.
* @param specifier The C name for the type, not including any indirection or
* array subscripts.
* @param indirection integer indicating level of indirection. Example: the C
@@ -109,9 +109,9 @@ CFCType_new_float(int flags, const char
*
* @param flags Allowed flags: OBJECT, STRING_TYPE, CONST, NULLABLE,
* INCREMENTED, DECREMENTED.
- * @param parcel A Clownfish::CFC::Parcel.
- * @param specifier Required. Must follow the rules for Clownfish::CFC::Class
- * class name components.
+ * @param parcel A Clownfish::CFC::Model::Parcel.
+ * @param specifier Required. Must follow the rules for
+ * Clownfish::CFC::Model::Class class name components.
* @param indirection Level of indirection. Must be 1 if supplied.
*/
CFCType*
@@ -168,7 +168,7 @@ CFCType_new_va_list(void);
* Lobster_foo_t -> crust_Lobster_foo_t # prefix prepended
*
* @param specifier The name of the type, which must end in "_t".
- * @param parcel A Clownfish::CFC::Parcel.
+ * @param parcel A Clownfish::CFC::Model::Parcel.
*/
CFCType*
CFCType_new_arbitrary(struct CFCParcel *parcel, const char *specifier);
Modified: incubator/lucy/trunk/clownfish/src/CFCVariable.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCVariable.c?rev=1300981&r1=1300980&r2=1300981&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCVariable.c (original)
+++ incubator/lucy/trunk/clownfish/src/CFCVariable.c Thu Mar 15 13:48:54 2012
@@ -39,7 +39,7 @@ struct CFCVariable {
};
const static CFCMeta CFCVARIABLE_META = {
- "Clownfish::CFC::Variable",
+ "Clownfish::CFC::Model::Variable",
sizeof(CFCVariable),
(CFCBase_destroy_t)CFCVariable_destroy
};
Modified: incubator/lucy/trunk/clownfish/src/CFCVariable.h
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCVariable.h?rev=1300981&r1=1300980&r2=1300981&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCVariable.h (original)
+++ incubator/lucy/trunk/clownfish/src/CFCVariable.h Thu Mar 15 13:48:54 2012
@@ -17,7 +17,7 @@
#ifndef H_CFCVARIABLE
#define H_CFCVARIABLE
-/** Clownfish::CFC::Variable - A Clownfish variable.
+/** Clownfish::CFC::Model::Variable - A Clownfish variable.
*
* A variable, having a L<Type|Clownfish::CFC::Model::Type>, a micro_sym (i.e.
* name), an exposure, and optionally, a location in the global namespace
@@ -40,9 +40,9 @@ struct CFCType;
/**
* @param type A Clownfish::CFC::Model::Type.
* @param micro_sym The variable's name, without any namespacing prefixes.
- * @param exposure See Clownfish::CFC::Symbol.
- * @param class_name See Clownfish::CFC::Symbol.
- * @param class_cnick See Clownfish::CFC::Symbol.
+ * @param exposure See Clownfish::CFC::Model::Symbol.
+ * @param class_name See Clownfish::CFC::Model::Symbol.
+ * @param class_cnick See Clownfish::CFC::Model::Symbol.
*/
CFCVariable*
CFCVariable_new(struct CFCParcel *parcel, const char *exposure,
Modified: incubator/lucy/trunk/perl/buildlib/Lucy/Build.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/buildlib/Lucy/Build.pm?rev=1300981&r1=1300980&r2=1300981&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/buildlib/Lucy/Build.pm (original)
+++ incubator/lucy/trunk/perl/buildlib/Lucy/Build.pm Thu Mar 15 13:48:54 2012
@@ -222,12 +222,12 @@ sub ACTION_lemon {
sub _compile_clownfish {
my $self = shift;
- require Clownfish::CFC::Hierarchy;
+ require Clownfish::CFC::Model::Hierarchy;
require Clownfish::CFC::Binding::Perl;
require Clownfish::CFC::Binding::Perl::Class;
# Compile Clownfish.
- my $hierarchy = Clownfish::CFC::Hierarchy->new(
+ my $hierarchy = Clownfish::CFC::Model::Hierarchy->new(
source => $CORE_SOURCE_DIR,
dest => $AUTOGEN_DIR,
);
Modified: incubator/lucy/trunk/ruby/Rakefile
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/ruby/Rakefile?rev=1300981&r1=1300980&r2=1300981&view=diff
==============================================================================
--- incubator/lucy/trunk/ruby/Rakefile (original)
+++ incubator/lucy/trunk/ruby/Rakefile Thu Mar 15 13:48:54 2012
@@ -196,7 +196,7 @@ END_AUTOGEN
end
def compile_clownfish
- hierarchy_obj = Clownfish::CFC::Hierarchy.new(CORE_SOURCE_DIR, AUTOGEN_DIR)
+ hierarchy_obj = Clownfish::CFC::Model::Hierarchy.new(CORE_SOURCE_DIR, AUTOGEN_DIR)
hierarchy_obj.build
return hierarchy_obj