Author: marvin
Date: Wed Mar 14 18:44:14 2012
New Revision: 1300685
URL: http://svn.apache.org/viewvc?rev=1300685&view=rev
Log:
Move Type under Clownfish::CFC::Model.
(Check in files accidentally left off the last commit.)
Modified:
incubator/lucy/trunk/clownfish/src/CFCFunction.h
incubator/lucy/trunk/clownfish/src/CFCMethod.h
incubator/lucy/trunk/clownfish/src/CFCPerlTypeMap.h
incubator/lucy/trunk/clownfish/src/CFCType.c
incubator/lucy/trunk/clownfish/src/CFCType.h
incubator/lucy/trunk/clownfish/src/CFCVariable.h
Modified: incubator/lucy/trunk/clownfish/src/CFCFunction.h
URL:
http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCFunction.h?rev=1300685&r1=1300684&r2=1300685&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCFunction.h (original)
+++ incubator/lucy/trunk/clownfish/src/CFCFunction.h Wed Mar 14 18:44:14 2012
@@ -50,8 +50,8 @@ struct CFCFunction {
* @param class_cnick The C nickname for the class.
* @param micro_sym The lower case name of the function, without any
* namespacing prefixes.
- * @param return_type A Clownfish::CFC::Type representing the function's
- * return type.
+ * @param return_type A Clownfish::CFC::Model::Type representing the
+ * function's return type.
* @param param_list A Clownfish::CFC::ParamList representing the
* function's argument list.
* @param docucomment A Clownfish::CFC::DocuComment describing the
Modified: incubator/lucy/trunk/clownfish/src/CFCMethod.h
URL:
http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCMethod.h?rev=1300685&r1=1300684&r2=1300685&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCMethod.h (original)
+++ incubator/lucy/trunk/clownfish/src/CFCMethod.h Wed Mar 14 18:44:14 2012
@@ -175,7 +175,7 @@ CFCMethod_abstract(CFCMethod *self);
int
CFCMethod_novel(CFCMethod *self);
-/** Return the Clownfish::CFC::Type for <code>self</code>.
+/** Return the Clownfish::CFC::Model::Type for <code>self</code>.
*/
struct CFCType*
Modified: incubator/lucy/trunk/clownfish/src/CFCPerlTypeMap.h
URL:
http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCPerlTypeMap.h?rev=1300685&r1=1300684&r2=1300685&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCPerlTypeMap.h (original)
+++ incubator/lucy/trunk/clownfish/src/CFCPerlTypeMap.h Wed Mar 14 18:44:14 2012
@@ -36,7 +36,7 @@ struct CFCType;
/** Return an expression which converts from a Perl scalar to a variable of
* the specified type.
*
- * @param type A Clownfish::CFC::Type, which will be used to select the
+ * @param type A Clownfish::CFC::Model::Type, which will be used to select the
* mapping code.
* @param xs_var The C name of the Perl scalar from which we are extracting
* a value.
@@ -47,7 +47,7 @@ CFCPerlTypeMap_from_perl(struct CFCType
/** Return an expression converts from a variable of type $type to a Perl
* scalar.
*
- * @param type A Clownfish::CFC::Type, which will be used to select the
+ * @param type A Clownfish::CFC::Model::Type, which will be used to select the
* mapping code.
* @param cf_var The name of the variable from which we are extracting a
* value.
Modified: incubator/lucy/trunk/clownfish/src/CFCType.c
URL:
http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCType.c?rev=1300685&r1=1300684&r2=1300685&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCType.c (original)
+++ incubator/lucy/trunk/clownfish/src/CFCType.c Wed Mar 14 18:44:14 2012
@@ -44,7 +44,7 @@ struct CFCType {
};
const static CFCMeta CFCTYPE_META = {
- "Clownfish::CFC::Type",
+ "Clownfish::CFC::Model::Type",
sizeof(CFCType),
(CFCBase_destroy_t)CFCType_destroy
};
Modified: incubator/lucy/trunk/clownfish/src/CFCType.h
URL:
http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCType.h?rev=1300685&r1=1300684&r2=1300685&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCType.h (original)
+++ incubator/lucy/trunk/clownfish/src/CFCType.h Wed Mar 14 18:44:14 2012
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-/** Clownfish::CFC::Type - A variable's type.
+/** Clownfish::CFC::Model::Type - A variable's type.
*/
#ifndef H_CFCTYPE
@@ -122,18 +122,19 @@ CFCType_new_object(int flags, struct CFC
* single, uniform subtype.
*
* @param flags Allowed flags: COMPOSITE, NULLABLE
- * @param child The Clownfish::CFC::Type which the composite is comprised of.
- * @param indirection integer indicating level of indirection. Example: the C
type
- * "float**" has indirection 2.
+ * @param child The Clownfish::CFC::Model::Type which the composite is
+ * comprised of.
+ * @param indirection integer indicating level of indirection. Example: the C
+ * type "float**" has indirection 2.
* @param array A string describing an array postfix.
*/
CFCType*
CFCType_new_composite(int flags, CFCType *child, int indirection,
const char *array);
-/** Return a Clownfish::CFC::Type representing a the 'void' keyword in C. It
can
- * be used either for a void return type, or in conjuction with with
- * new_composite() to support the <code>void*</code> opaque pointer type.
+/** Return a Clownfish::CFC::Model::Type representing a the 'void' keyword in
+ * C. It can be used either for a void return type, or in conjuction with
+ * with new_composite() to support the <code>void*</code> opaque pointer type.
*
* @param is_const Should be true if the type is const. (Useful in the
* context of <code>const void*</code>).
@@ -175,7 +176,7 @@ CFCType_new_arbitrary(struct CFCParcel *
void
CFCType_destroy(CFCType *self);
-/** Returns true if two Clownfish::CFC::Type objects are equivalent.
+/** Returns true if two Clownfish::CFC::Model::Type objects are equivalent.
*/
int
CFCType_equals(CFCType *self, CFCType *other);
Modified: incubator/lucy/trunk/clownfish/src/CFCVariable.h
URL:
http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCVariable.h?rev=1300685&r1=1300684&r2=1300685&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCVariable.h (original)
+++ incubator/lucy/trunk/clownfish/src/CFCVariable.h Wed Mar 14 18:44:14 2012
@@ -19,8 +19,9 @@
/** Clownfish::CFC::Variable - A Clownfish variable.
*
- * A variable, having a L<Type|Clownfish::CFC::Type>, a micro_sym (i.e. name),
an
- * exposure, and optionally, a location in the global namespace hierarchy.
+ * 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
+ * hierarchy.
*
* Variable objects which exist only within a local scope, e.g. those within
* parameter lists, do not need to know about class. In contrast, inert class
@@ -37,7 +38,7 @@ struct CFCParcel;
struct CFCType;
/**
- * @param type A Clownfish::CFC::Type.
+ * @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.
@@ -83,8 +84,8 @@ CFCVariable_local_c(CFCVariable *self);
const char*
CFCVariable_global_c(CFCVariable *self);
-/** Returns C code appropriate for declaring the variable in a local scope,
such
- * as within a struct definition, or as an automatic variable within a C
+/** Returns C code appropriate for declaring the variable in a local scope,
+ * such as within a struct definition, or as an automatic variable within a C
* function. For example:
*
* int32_t average_lifespan;
