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 2011/05/02 01:50:38 UTC
[lucy-commits] svn commit: r1098445 [4/23] - in /incubator/lucy/trunk: charmonizer/
charmonizer/src/Charmonizer/ charmonizer/src/Charmonizer/Core/
charmonizer/src/Charmonizer/Probe/ charmonizer/src/Charmonizer/Test/
clownfish/lib/ clownfish/lib/Clownfish/Binding/ clo...
Modified: incubator/lucy/trunk/clownfish/src/CFCParcel.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCParcel.c?rev=1098445&r1=1098444&r2=1098445&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCParcel.c (original)
+++ incubator/lucy/trunk/clownfish/src/CFCParcel.c Sun May 1 23:50:24 2011
@@ -44,8 +44,7 @@ static CFCParcel *registry[MAX_PARCELS +
static int first_time = true;
CFCParcel*
-CFCParcel_singleton(const char *name, const char *cnick)
-{
+CFCParcel_singleton(const char *name, const char *cnick) {
// Set up registry.
if (first_time) {
size_t i;
@@ -64,8 +63,8 @@ CFCParcel_singleton(const char *name, co
CFCParcel *existing = registry[i];
if (strcmp(existing->name, name) == 0) {
if (cnick && strcmp(existing->cnick, cnick) != 0) {
- croak("cnick '%s' for parcel '%s' conflicts with '%s'",
- cnick, name, existing->cnick);
+ croak("cnick '%s' for parcel '%s' conflicts with '%s'",
+ cnick, name, existing->cnick);
}
return existing;
}
@@ -82,8 +81,7 @@ CFCParcel_singleton(const char *name, co
}
void
-CFCParcel_reap_singletons(void)
-{
+CFCParcel_reap_singletons(void) {
if (registry[0]) {
// default parcel.
CFCBase_decref((CFCBase*)registry[0]);
@@ -96,26 +94,23 @@ CFCParcel_reap_singletons(void)
}
static int
-S_validate_name_or_cnick(const char *orig)
-{
+S_validate_name_or_cnick(const char *orig) {
const char *ptr = orig;
- for ( ; *ptr != 0; ptr++) {
+ for (; *ptr != 0; ptr++) {
if (!isalpha(*ptr)) { return false; }
}
return true;
}
CFCParcel*
-CFCParcel_new(const char *name, const char *cnick)
-{
+CFCParcel_new(const char *name, const char *cnick) {
CFCParcel *self = (CFCParcel*)CFCBase_allocate(sizeof(CFCParcel),
- "Clownfish::Parcel");
+ "Clownfish::Parcel");
return CFCParcel_init(self, name, cnick);
}
CFCParcel*
-CFCParcel_init(CFCParcel *self, const char *name, const char *cnick)
-{
+CFCParcel_init(CFCParcel *self, const char *name, const char *cnick) {
// Validate name.
if (!name || !S_validate_name_or_cnick(name)) {
croak("Invalid name: '%s'", name ? name : "[NULL]");
@@ -129,11 +124,11 @@ CFCParcel_init(CFCParcel *self, const ch
}
self->cnick = CFCUtil_strdup(cnick);
}
- else {
+ else {
// Default cnick to name.
self->cnick = CFCUtil_strdup(name);
}
-
+
// Derive prefix, Prefix, PREFIX.
size_t cnick_len = strlen(self->cnick);
size_t prefix_len = cnick_len ? cnick_len + 1 : 0;
@@ -162,8 +157,7 @@ CFCParcel_init(CFCParcel *self, const ch
}
void
-CFCParcel_destroy(CFCParcel *self)
-{
+CFCParcel_destroy(CFCParcel *self) {
FREEMEM(self->name);
FREEMEM(self->cnick);
FREEMEM(self->prefix);
@@ -175,8 +169,7 @@ CFCParcel_destroy(CFCParcel *self)
static CFCParcel *default_parcel = NULL;
CFCParcel*
-CFCParcel_default_parcel(void)
-{
+CFCParcel_default_parcel(void) {
if (default_parcel == NULL) {
default_parcel = CFCParcel_new("DEFAULT", "");
registry[0] = default_parcel;
@@ -185,46 +178,39 @@ CFCParcel_default_parcel(void)
}
CFCParcel*
-CFCParcel_clownfish_parcel(void)
-{
+CFCParcel_clownfish_parcel(void) {
return CFCParcel_singleton("Lucy", "Lucy");
}
int
-CFCParcel_equals(CFCParcel *self, CFCParcel *other)
-{
+CFCParcel_equals(CFCParcel *self, CFCParcel *other) {
if (strcmp(self->name, other->name)) { return false; }
if (strcmp(self->cnick, other->cnick)) { return false; }
return true;
}
const char*
-CFCParcel_get_name(CFCParcel *self)
-{
+CFCParcel_get_name(CFCParcel *self) {
return self->name;
}
const char*
-CFCParcel_get_cnick(CFCParcel *self)
-{
+CFCParcel_get_cnick(CFCParcel *self) {
return self->cnick;
}
const char*
-CFCParcel_get_prefix(CFCParcel *self)
-{
+CFCParcel_get_prefix(CFCParcel *self) {
return self->prefix;
}
const char*
-CFCParcel_get_Prefix(CFCParcel *self)
-{
+CFCParcel_get_Prefix(CFCParcel *self) {
return self->Prefix;
}
const char*
-CFCParcel_get_PREFIX(CFCParcel *self)
-{
+CFCParcel_get_PREFIX(CFCParcel *self) {
return self->PREFIX;
}
Modified: incubator/lucy/trunk/clownfish/src/CFCSymbol.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCSymbol.c?rev=1098445&r1=1098444&r2=1098445&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCSymbol.c (original)
+++ incubator/lucy/trunk/clownfish/src/CFCSymbol.c Sun May 1 23:50:24 2011
@@ -32,49 +32,46 @@
#include "CFCUtil.h"
CFCSymbol*
-CFCSymbol_new(struct CFCParcel *parcel, const char *exposure,
- const char *class_name, const char *class_cnick,
- const char *micro_sym)
-{
+CFCSymbol_new(struct CFCParcel *parcel, const char *exposure,
+ const char *class_name, const char *class_cnick,
+ const char *micro_sym) {
CFCSymbol *self = (CFCSymbol*)CFCBase_allocate(sizeof(CFCSymbol),
- "Clownfish::Symbol");
+ "Clownfish::Symbol");
return CFCSymbol_init(self, parcel, exposure, class_name, class_cnick,
- micro_sym);
+ micro_sym);
}
static int
-S_validate_exposure(const char *exposure)
-{
+S_validate_exposure(const char *exposure) {
if (!exposure) { return false; }
- if ( strcmp(exposure, "public")
+ if (strcmp(exposure, "public")
&& strcmp(exposure, "parcel")
&& strcmp(exposure, "private")
&& strcmp(exposure, "local")
- ) {
+ ) {
return false;
}
return true;
}
static int
-S_validate_class_name(const char *class_name)
-{
+S_validate_class_name(const char *class_name) {
const char *ptr;
// Must be UpperCamelCase, separated by "::".
- for (ptr = class_name; *ptr != 0; ) {
+ for (ptr = class_name; *ptr != 0;) {
if (!isupper(*ptr)) { return false; }
// Each component must contain lowercase letters.
const char *substring;
for (substring = ptr; ; substring++) {
- if (*substring == 0) { return false; }
+ if (*substring == 0) { return false; }
else if (*substring == ':') { return false; }
else if (islower(*substring)) { break; }
}
- while(*ptr != 0) {
- if (*ptr == 0) { break; }
+ while (*ptr != 0) {
+ if (*ptr == 0) { break; }
else if (*ptr == ':') {
ptr++;
if (*ptr != ':') { return false; }
@@ -91,16 +88,14 @@ S_validate_class_name(const char *class_
}
int
-CFCSymbol_validate_class_name_component(const char *name)
-{
+CFCSymbol_validate_class_name_component(const char *name) {
if (!S_validate_class_name(name)) { return false; }
if (strchr(name, ':') != NULL) { return false; }
return true;
}
static int
-S_validate_class_cnick(const char *class_cnick)
-{
+S_validate_class_cnick(const char *class_cnick) {
// Allow all caps.
const char *ptr;
for (ptr = class_cnick; ; ptr++) {
@@ -116,21 +111,19 @@ S_validate_class_cnick(const char *class
}
static int
-S_validate_identifier(const char *identifier)
-{
+S_validate_identifier(const char *identifier) {
const char *ptr = identifier;
if (!isalpha(*ptr) && *ptr != '_') { return false; }
- for ( ; *ptr != 0; ptr++) {
+ for (; *ptr != 0; ptr++) {
if (!isalnum(*ptr) && *ptr != '_') { return false; }
}
return true;
}
CFCSymbol*
-CFCSymbol_init(CFCSymbol *self, struct CFCParcel *parcel,
- const char *exposure, const char *class_name,
- const char *class_cnick, const char *micro_sym)
-{
+CFCSymbol_init(CFCSymbol *self, struct CFCParcel *parcel,
+ const char *exposure, const char *class_name,
+ const char *class_cnick, const char *micro_sym) {
// Validate.
CFCUTIL_NULL_CHECK(parcel);
if (!S_validate_exposure(exposure)) {
@@ -173,25 +166,25 @@ CFCSymbol_init(CFCSymbol *self, struct C
self->micro_sym = CFCUtil_strdup(micro_sym);
// Derive short_sym.
- size_t class_cnick_len = self->class_cnick
- ? strlen(self->class_cnick)
- : 0;
+ size_t class_cnick_len = self->class_cnick
+ ? strlen(self->class_cnick)
+ : 0;
size_t short_sym_len = class_cnick_len
- + strlen("_")
- + strlen(self->micro_sym);
+ + strlen("_")
+ + strlen(self->micro_sym);
self->short_sym = (char*)MALLOCATE(short_sym_len + 1);
if (self->class_cnick) {
memcpy((void*)self->short_sym, self->class_cnick, class_cnick_len);
}
self->short_sym[class_cnick_len] = '_';
- memcpy(&self->short_sym[class_cnick_len + 1],
- self->micro_sym, strlen(micro_sym));
+ memcpy(&self->short_sym[class_cnick_len + 1],
+ self->micro_sym, strlen(micro_sym));
self->short_sym[short_sym_len] = '\0';
// Derive full_sym;
- const char *prefix = CFCParcel_get_prefix(self->parcel);
- size_t prefix_len = strlen(prefix);
- size_t full_sym_len = prefix_len + short_sym_len;
+ const char *prefix = CFCParcel_get_prefix(self->parcel);
+ size_t prefix_len = strlen(prefix);
+ size_t full_sym_len = prefix_len + short_sym_len;
self->full_sym = (char*)MALLOCATE(full_sym_len + 1);
memcpy(self->full_sym, prefix, prefix_len);
memcpy(&self->full_sym[prefix_len], self->short_sym, short_sym_len);
@@ -201,8 +194,7 @@ CFCSymbol_init(CFCSymbol *self, struct C
}
void
-CFCSymbol_destroy(CFCSymbol *self)
-{
+CFCSymbol_destroy(CFCSymbol *self) {
CFCBase_decref((CFCBase*)self->parcel);
FREEMEM(self->exposure);
FREEMEM(self->class_name);
@@ -214,104 +206,89 @@ CFCSymbol_destroy(CFCSymbol *self)
}
int
-CFCSymbol_equals(CFCSymbol *self, CFCSymbol *other)
-{
+CFCSymbol_equals(CFCSymbol *self, CFCSymbol *other) {
if (strcmp(self->micro_sym, other->micro_sym) != 0) { return false; }
if (!CFCParcel_equals(self->parcel, other->parcel)) { return false; }
if (strcmp(self->exposure, other->exposure) != 0) { return false; }
if (self->class_name) {
if (!other->class_name) { return false; }
- if (strcmp(self->class_name, other->class_name) != 0) {
+ if (strcmp(self->class_name, other->class_name) != 0) {
return false;
}
}
else if (other->class_name) {
- return false;
+ return false;
}
return true;
}
int
-CFCSymbol_public(CFCSymbol *self)
-{
+CFCSymbol_public(CFCSymbol *self) {
return !strcmp(self->exposure, "public");
}
int
-CFCSymbol_parcel(CFCSymbol *self)
-{
+CFCSymbol_parcel(CFCSymbol *self) {
return !strcmp(self->exposure, "parcel");
}
int
-CFCSymbol_private(CFCSymbol *self)
-{
+CFCSymbol_private(CFCSymbol *self) {
return !strcmp(self->exposure, "private");
}
int
-CFCSymbol_local(CFCSymbol *self)
-{
+CFCSymbol_local(CFCSymbol *self) {
return !strcmp(self->exposure, "local");
}
const char*
-CFCSymbol_full_sym(CFCSymbol *self)
-{
+CFCSymbol_full_sym(CFCSymbol *self) {
return self->full_sym;
}
const char*
-CFCSymbol_short_sym(CFCSymbol *self)
-{
+CFCSymbol_short_sym(CFCSymbol *self) {
return self->short_sym;
}
struct CFCParcel*
-CFCSymbol_get_parcel(CFCSymbol *self)
-{
+CFCSymbol_get_parcel(CFCSymbol *self) {
return self->parcel;
}
const char*
-CFCSymbol_get_class_name(CFCSymbol *self)
-{
+CFCSymbol_get_class_name(CFCSymbol *self) {
return self->class_name;
}
const char*
-CFCSymbol_get_class_cnick(CFCSymbol *self)
-{
+CFCSymbol_get_class_cnick(CFCSymbol *self) {
return self->class_cnick;
}
const char*
-CFCSymbol_get_exposure(CFCSymbol *self)
-{
+CFCSymbol_get_exposure(CFCSymbol *self) {
return self->exposure;
}
const char*
-CFCSymbol_micro_sym(CFCSymbol *self)
-{
+CFCSymbol_micro_sym(CFCSymbol *self) {
return self->micro_sym;
}
const char*
-CFCSymbol_get_prefix(CFCSymbol *self)
-{
+CFCSymbol_get_prefix(CFCSymbol *self) {
return CFCParcel_get_prefix(self->parcel);
}
const char*
-CFCSymbol_get_Prefix(CFCSymbol *self)
-{
+CFCSymbol_get_Prefix(CFCSymbol *self) {
return CFCParcel_get_Prefix(self->parcel);
}
const char*
-CFCSymbol_get_PREFIX(CFCSymbol *self)
-{
+CFCSymbol_get_PREFIX(CFCSymbol *self) {
return CFCParcel_get_PREFIX(self->parcel);
}
Modified: incubator/lucy/trunk/clownfish/src/CFCSymbol.h
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCSymbol.h?rev=1098445&r1=1098444&r2=1098445&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCSymbol.h (original)
+++ incubator/lucy/trunk/clownfish/src/CFCSymbol.h Sun May 1 23:50:24 2011
@@ -47,12 +47,12 @@ int
CFCSymbol_validate_class_name_component(const char *name);
CFCSymbol*
-CFCSymbol_new(struct CFCParcel *parcel, const char *exposure, const char *class_name,
+CFCSymbol_new(struct CFCParcel *parcel, const char *exposure, const char *class_name,
const char *class_cnick, const char *micro_sym);
CFCSymbol*
-CFCSymbol_init(CFCSymbol *self, struct CFCParcel *parcel, const char *exposure,
- const char *class_name, const char *class_cnick,
+CFCSymbol_init(CFCSymbol *self, struct CFCParcel *parcel, const char *exposure,
+ const char *class_name, const char *class_cnick,
const char *micro_sym);
void
Modified: incubator/lucy/trunk/clownfish/src/CFCType.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCType.c?rev=1098445&r1=1098444&r2=1098445&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCType.c (original)
+++ incubator/lucy/trunk/clownfish/src/CFCType.c Sun May 1 23:50:24 2011
@@ -33,31 +33,29 @@
#include "CFCUtil.h"
struct CFCType {
- CFCBase base;
- int flags;
- char *specifier;
- int indirection;
+ CFCBase base;
+ int flags;
+ char *specifier;
+ int indirection;
struct CFCParcel *parcel;
- char *c_string;
- size_t width;
- char *array;
+ char *c_string;
+ size_t width;
+ char *array;
struct CFCType *child;
};
CFCType*
CFCType_new(int flags, struct CFCParcel *parcel, const char *specifier,
- int indirection, const char *c_string)
-{
+ int indirection, const char *c_string) {
CFCType *self = (CFCType*)CFCBase_allocate(sizeof(CFCType),
- "Clownfish::Type");
- return CFCType_init(self, flags, parcel, specifier, indirection,
- c_string);
+ "Clownfish::Type");
+ return CFCType_init(self, flags, parcel, specifier, indirection,
+ c_string);
}
CFCType*
-CFCType_init(CFCType *self, int flags, struct CFCParcel *parcel,
- const char *specifier, int indirection, const char *c_string)
-{
+CFCType_init(CFCType *self, int flags, struct CFCParcel *parcel,
+ const char *specifier, int indirection, const char *c_string) {
self->flags = flags;
self->parcel = (CFCParcel*)CFCBase_incref((CFCBase*)parcel);
self->specifier = CFCUtil_strdup(specifier);
@@ -70,10 +68,9 @@ CFCType_init(CFCType *self, int flags, s
}
CFCType*
-CFCType_new_integer(int flags, const char *specifier)
-{
+CFCType_new_integer(int flags, const char *specifier) {
// Validate specifier, find width.
- size_t width;
+ size_t width;
if (!strcmp(specifier, "int8_t") || !strcmp(specifier, "uint8_t")) {
width = 1;
}
@@ -86,13 +83,13 @@ CFCType_new_integer(int flags, const cha
else if (!strcmp(specifier, "int64_t") || !strcmp(specifier, "uint64_t")) {
width = 8;
}
- else if ( !strcmp(specifier, "char")
+ else if (!strcmp(specifier, "char")
|| !strcmp(specifier, "short")
|| !strcmp(specifier, "int")
|| !strcmp(specifier, "long")
|| !strcmp(specifier, "size_t")
|| !strcmp(specifier, "bool_t") // Charmonizer type.
- ) {
+ ) {
width = 0;
}
else {
@@ -126,15 +123,14 @@ CFCType_new_integer(int flags, const cha
return self;
}
-static const char *float_specifiers[] = {
- "float",
- "double",
- NULL
+static const char *float_specifiers[] = {
+ "float",
+ "double",
+ NULL
};
CFCType*
-CFCType_new_float(int flags, const char *specifier)
-{
+CFCType_new_float(int flags, const char *specifier) {
// Validate specifier.
size_t i;
for (i = 0; ; i++) {
@@ -162,9 +158,8 @@ CFCType_new_float(int flags, const char
}
CFCType*
-CFCType_new_object(int flags, CFCParcel *parcel, const char *specifier,
- int indirection)
-{
+CFCType_new_object(int flags, CFCParcel *parcel, const char *specifier,
+ int indirection) {
// Validate params.
if (indirection != 1) {
croak("Parameter 'indirection' can only be 1");
@@ -204,7 +199,7 @@ CFCType_new_object(int flags, CFCParcel
if (!CFCSymbol_validate_class_name_component(small_specifier)) {
croak("Invalid specifier: '%s'", specifier);
}
-
+
// Cache C representation.
char c_string[MAX_SPECIFIER_LEN + 10];
if (flags & CFCTYPE_CONST) {
@@ -218,9 +213,8 @@ CFCType_new_object(int flags, CFCParcel
}
CFCType*
-CFCType_new_composite(int flags, CFCType *child, int indirection,
- const char *array)
-{
+CFCType_new_composite(int flags, CFCType *child, int indirection,
+ const char *array) {
if (!child) {
croak("Missing required param 'child'");
}
@@ -228,10 +222,10 @@ CFCType_new_composite(int flags, CFCType
// Cache C representation.
// NOTE: Array postfixes are NOT included.
- const size_t MAX_LEN = 256;
- const char *child_c_string = CFCType_to_c(child);
- size_t child_c_len = strlen(child_c_string);
- size_t amount = child_c_len + indirection;
+ const size_t MAX_LEN = 256;
+ const char *child_c_string = CFCType_to_c(child);
+ size_t child_c_len = strlen(child_c_string);
+ size_t amount = child_c_len + indirection;
if (amount > MAX_LEN) {
croak("C representation too long");
}
@@ -243,7 +237,7 @@ CFCType_new_composite(int flags, CFCType
}
CFCType *self = CFCType_new(flags, NULL, CFCType_get_specifier(child),
- indirection, c_string);
+ indirection, c_string);
self->child = (CFCType*)CFCBase_incref((CFCBase*)child);
// Record array spec.
@@ -256,8 +250,7 @@ CFCType_new_composite(int flags, CFCType
}
CFCType*
-CFCType_new_void(int is_const)
-{
+CFCType_new_void(int is_const) {
int flags = CFCTYPE_VOID;
const char *c_string = is_const ? "const void" : "void";
if (is_const) { flags |= CFCTYPE_CONST; }
@@ -265,30 +258,28 @@ CFCType_new_void(int is_const)
}
CFCType*
-CFCType_new_va_list(void)
-{
+CFCType_new_va_list(void) {
return CFCType_new(CFCTYPE_VA_LIST, NULL, "va_list", 0, "va_list");
}
CFCType*
-CFCType_new_arbitrary(CFCParcel *parcel, const char *specifier)
-{
+CFCType_new_arbitrary(CFCParcel *parcel, const char *specifier) {
const size_t MAX_SPECIFIER_LEN = 256;
// Add parcel prefix to what appear to be namespaced types.
char full_specifier[MAX_SPECIFIER_LEN + 1];
if (isupper(*specifier) && parcel != NULL) {
- const char *prefix = CFCParcel_get_prefix(parcel);
- size_t full_len = strlen(prefix) + strlen(specifier);
+ const char *prefix = CFCParcel_get_prefix(parcel);
+ size_t full_len = strlen(prefix) + strlen(specifier);
if (full_len > MAX_SPECIFIER_LEN) {
- croak("Illegal specifier: '%s'", specifier);
+ croak("Illegal specifier: '%s'", specifier);
}
sprintf(full_specifier, "%s%s", prefix, specifier);
}
else {
if (strlen(specifier) > MAX_SPECIFIER_LEN) {
- croak("Illegal specifier: '%s'", specifier);
+ croak("Illegal specifier: '%s'", specifier);
}
strcpy(full_specifier, specifier);
}
@@ -297,17 +288,16 @@ CFCType_new_arbitrary(CFCParcel *parcel,
size_t i, max;
for (i = 0, max = strlen(full_specifier); i < max; i++) {
if (!isalnum(full_specifier[i]) && full_specifier[i] != '_') {
- croak("Illegal specifier: '%s'", full_specifier);
+ croak("Illegal specifier: '%s'", full_specifier);
}
}
- return CFCType_new(CFCTYPE_ARBITRARY, parcel, full_specifier, 0,
- full_specifier);
+ return CFCType_new(CFCTYPE_ARBITRARY, parcel, full_specifier, 0,
+ full_specifier);
}
void
-CFCType_destroy(CFCType *self)
-{
+CFCType_destroy(CFCType *self) {
if (self->child) {
CFCBase_decref((CFCBase*)self->child);
}
@@ -319,9 +309,8 @@ CFCType_destroy(CFCType *self)
}
int
-CFCType_equals(CFCType *self, CFCType *other)
-{
- if ( (CFCType_const(self) ^ CFCType_const(other))
+CFCType_equals(CFCType *self, CFCType *other) {
+ if ((CFCType_const(self) ^ CFCType_const(other))
|| (CFCType_nullable(self) ^ CFCType_nullable(other))
|| (CFCType_is_void(self) ^ CFCType_is_void(other))
|| (CFCType_is_object(self) ^ CFCType_is_object(other))
@@ -335,8 +324,8 @@ CFCType_equals(CFCType *self, CFCType *o
|| (CFCType_decremented(self) ^ CFCType_decremented(other))
|| !!self->child ^ !!other->child
|| !!self->array ^ !!other->array
- ) {
- return false;
+ ) {
+ return false;
}
if (self->indirection != other->indirection) { return false; }
if (strcmp(self->specifier, other->specifier) != 0) { return false; }
@@ -350,81 +339,70 @@ CFCType_equals(CFCType *self, CFCType *o
}
int
-CFCType_similar(CFCType *self, CFCType *other)
-{
+CFCType_similar(CFCType *self, CFCType *other) {
if (!CFCType_is_object(self)) {
croak("Attempt to call 'similar' on a non-object type");
}
- if ( (CFCType_const(self) ^ CFCType_const(other))
+ if ((CFCType_const(self) ^ CFCType_const(other))
|| (CFCType_nullable(self) ^ CFCType_nullable(other))
|| (CFCType_incremented(self) ^ CFCType_incremented(other))
|| (CFCType_decremented(self) ^ CFCType_decremented(other))
|| (CFCType_is_object(self) ^ CFCType_is_object(other))
- ) {
+ ) {
return false;
}
return true;
}
void
-CFCType_set_specifier(CFCType *self, const char *specifier)
-{
+CFCType_set_specifier(CFCType *self, const char *specifier) {
FREEMEM(self->specifier);
self->specifier = CFCUtil_strdup(specifier);
}
const char*
-CFCType_get_specifier(CFCType *self)
-{
+CFCType_get_specifier(CFCType *self) {
return self->specifier;
}
int
-CFCType_get_indirection(CFCType *self)
-{
+CFCType_get_indirection(CFCType *self) {
return self->indirection;
}
struct CFCParcel*
-CFCType_get_parcel(CFCType *self)
-{
+CFCType_get_parcel(CFCType *self) {
return self->parcel;
}
void
-CFCType_set_c_string(CFCType *self, const char *c_string)
-{
+CFCType_set_c_string(CFCType *self, const char *c_string) {
FREEMEM(self->c_string);
self->c_string = CFCUtil_strdup(c_string);
}
const char*
-CFCType_to_c(CFCType *self)
-{
+CFCType_to_c(CFCType *self) {
return self->c_string;
}
size_t
-CFCType_get_width(CFCType *self)
-{
+CFCType_get_width(CFCType *self) {
return self->width;
}
const char*
-CFCType_get_array(CFCType *self)
-{
+CFCType_get_array(CFCType *self) {
return self->array;
}
int
-CFCType_const(CFCType *self)
-{
+CFCType_const(CFCType *self) {
return !!(self->flags & CFCTYPE_CONST);
}
void
-CFCType_set_nullable(CFCType *self, int nullable)
-{
+CFCType_set_nullable(CFCType *self, int nullable) {
if (nullable) {
self->flags |= CFCTYPE_NULLABLE;
}
@@ -434,74 +412,62 @@ CFCType_set_nullable(CFCType *self, int
}
int
-CFCType_nullable(CFCType *self)
-{
+CFCType_nullable(CFCType *self) {
return !!(self->flags & CFCTYPE_NULLABLE);
}
int
-CFCType_incremented(CFCType *self)
-{
+CFCType_incremented(CFCType *self) {
return !!(self->flags & CFCTYPE_INCREMENTED);
}
int
-CFCType_decremented(CFCType *self)
-{
+CFCType_decremented(CFCType *self) {
return !!(self->flags & CFCTYPE_DECREMENTED);
}
int
-CFCType_is_void(CFCType *self)
-{
+CFCType_is_void(CFCType *self) {
return !!(self->flags & CFCTYPE_VOID);
}
int
-CFCType_is_object(CFCType *self)
-{
+CFCType_is_object(CFCType *self) {
return !!(self->flags & CFCTYPE_OBJECT);
}
int
-CFCType_is_primitive(CFCType *self)
-{
+CFCType_is_primitive(CFCType *self) {
return !!(self->flags & CFCTYPE_PRIMITIVE);
}
int
-CFCType_is_integer(CFCType *self)
-{
+CFCType_is_integer(CFCType *self) {
return !!(self->flags & CFCTYPE_INTEGER);
}
int
-CFCType_is_floating(CFCType *self)
-{
+CFCType_is_floating(CFCType *self) {
return !!(self->flags & CFCTYPE_FLOATING);
}
int
-CFCType_is_string_type(CFCType *self)
-{
+CFCType_is_string_type(CFCType *self) {
return !!(self->flags & CFCTYPE_STRING_TYPE);
}
int
-CFCType_is_va_list(CFCType *self)
-{
+CFCType_is_va_list(CFCType *self) {
return !!(self->flags & CFCTYPE_VA_LIST);
}
int
-CFCType_is_arbitrary(CFCType *self)
-{
+CFCType_is_arbitrary(CFCType *self) {
return !!(self->flags & CFCTYPE_ARBITRARY);
}
int
-CFCType_is_composite(CFCType *self)
-{
+CFCType_is_composite(CFCType *self) {
return !!(self->flags & CFCTYPE_COMPOSITE);
}
Modified: incubator/lucy/trunk/clownfish/src/CFCType.h
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCType.h?rev=1098445&r1=1098444&r2=1098445&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCType.h (original)
+++ incubator/lucy/trunk/clownfish/src/CFCType.h Sun May 1 23:50:24 2011
@@ -43,7 +43,7 @@ CFCType_new(int flags, struct CFCParcel
int indirection, const char *c_string);
CFCType*
-CFCType_init(CFCType *self, int flags, struct CFCParcel *parcel,
+CFCType_init(CFCType *self, int flags, struct CFCParcel *parcel,
const char *specifier, int indirection, const char *c_string);
CFCType*
@@ -57,7 +57,7 @@ CFCType_new_object(int flags, struct CFC
int indirection);
CFCType*
-CFCType_new_composite(int flags, CFCType *child, int indirection,
+CFCType_new_composite(int flags, CFCType *child, int indirection,
const char *array);
CFCType*
Modified: incubator/lucy/trunk/clownfish/src/CFCUtil.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCUtil.c?rev=1098445&r1=1098444&r2=1098445&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCUtil.c (original)
+++ incubator/lucy/trunk/clownfish/src/CFCUtil.c Sun May 1 23:50:24 2011
@@ -30,23 +30,21 @@
#include "CFCUtil.h"
void
-CFCUtil_null_check(const void *arg, const char *name, const char *file, int line)
-{
+CFCUtil_null_check(const void *arg, const char *name, const char *file,
+ int line) {
if (!arg) {
CFCUtil_die("%s cannot be NULL at %s line %d", name, file, line);
}
}
char*
-CFCUtil_strdup(const char *string)
-{
+CFCUtil_strdup(const char *string) {
if (!string) { return NULL; }
return CFCUtil_strndup(string, strlen(string));
}
char*
-CFCUtil_strndup(const char *string, size_t len)
-{
+CFCUtil_strndup(const char *string, size_t len) {
if (!string) { return NULL; }
char *copy = (char*)MALLOCATE(len + 1);
memcpy(copy, string, len);
@@ -55,8 +53,7 @@ CFCUtil_strndup(const char *string, size
}
void
-CFCUtil_trim_whitespace(char *text)
-{
+CFCUtil_trim_whitespace(char *text) {
if (!text) {
return;
}
@@ -68,7 +65,7 @@ CFCUtil_trim_whitespace(char *text)
// Find end.
size_t orig_len = strlen(text);
char *limit = text + orig_len;
- for ( ; limit > text; limit--) {
+ for (; limit > text; limit--) {
if (!isspace(*(limit - 1))) { break; }
}
@@ -80,13 +77,12 @@ CFCUtil_trim_whitespace(char *text)
}
void*
-CFCUtil_wrapped_malloc(size_t count, const char *file, int line)
-{
+CFCUtil_wrapped_malloc(size_t count, const char *file, int line) {
void *pointer = malloc(count);
if (pointer == NULL && count != 0) {
if (sizeof(long) >= sizeof(size_t)) {
- fprintf(stderr, "Can't malloc %lu bytes at %s line %d\n",
- (unsigned long)count, file, line);
+ fprintf(stderr, "Can't malloc %lu bytes at %s line %d\n",
+ (unsigned long)count, file, line);
}
else {
fprintf(stderr, "malloc failed at %s line %d\n", file, line);
@@ -97,14 +93,13 @@ CFCUtil_wrapped_malloc(size_t count, con
}
void*
-CFCUtil_wrapped_calloc(size_t count, size_t size, const char *file, int line)
-{
+CFCUtil_wrapped_calloc(size_t count, size_t size, const char *file, int line) {
void *pointer = calloc(count, size);
if (pointer == NULL && count != 0) {
if (sizeof(long) >= sizeof(size_t)) {
- fprintf(stderr,
- "Can't calloc %lu elements of size %lu at %s line %d\n",
- (unsigned long)count, (unsigned long)size, file, line);
+ fprintf(stderr,
+ "Can't calloc %lu elements of size %lu at %s line %d\n",
+ (unsigned long)count, (unsigned long)size, file, line);
}
else {
fprintf(stderr, "calloc failed at %s line %d\n", file, line);
@@ -115,13 +110,12 @@ CFCUtil_wrapped_calloc(size_t count, siz
}
void*
-CFCUtil_wrapped_realloc(void *ptr, size_t size, const char *file, int line)
-{
+CFCUtil_wrapped_realloc(void *ptr, size_t size, const char *file, int line) {
void *pointer = realloc(ptr, size);
if (pointer == NULL && size != 0) {
if (sizeof(long) >= sizeof(size_t)) {
- fprintf(stderr, "Can't realloc %lu bytes at %s line %d\n",
- (unsigned long)size, file, line);
+ fprintf(stderr, "Can't realloc %lu bytes at %s line %d\n",
+ (unsigned long)size, file, line);
}
else {
fprintf(stderr, "realloc failed at %s line %d\n", file, line);
@@ -132,23 +126,21 @@ CFCUtil_wrapped_realloc(void *ptr, size_
}
void
-CFCUtil_wrapped_free(void *ptr)
-{
+CFCUtil_wrapped_free(void *ptr) {
free(ptr);
}
int
-CFCUtil_current(const char *orig, const char *dest)
-{
+CFCUtil_current(const char *orig, const char *dest) {
// If the destination file doesn't exist, we're not current.
struct stat dest_stat;
- if (stat(dest, &dest_stat) == -1) {
+ if (stat(dest, &dest_stat) == -1) {
return false;
- }
+ }
// If the source file is newer than the dest, we're not current.
struct stat orig_stat;
- if (stat(orig, &orig_stat) == -1) {
+ if (stat(orig, &orig_stat) == -1) {
CFCUtil_die("Missing source file '%s'", orig);
}
if (orig_stat.st_mtime > dest_stat.st_mtime) {
@@ -160,8 +152,7 @@ CFCUtil_current(const char *orig, const
}
void
-CFCUtil_write_file(const char *filename, const char *content, size_t len)
-{
+CFCUtil_write_file(const char *filename, const char *content, size_t len) {
FILE *fh = fopen(filename, "w+");
if (fh == NULL) {
CFCUtil_die("Couldn't open '%s': %s", filename, strerror(errno));
@@ -173,8 +164,7 @@ CFCUtil_write_file(const char *filename,
}
char*
-CFCUtil_slurp_file(const char *file_path, size_t *len_ptr)
-{
+CFCUtil_slurp_file(const char *file_path, size_t *len_ptr) {
FILE *const file = fopen(file_path, "rb");
char *contents;
size_t len;
@@ -200,7 +190,7 @@ CFCUtil_slurp_file(const char *file_path
/* Weak error check, because CRLF might result in fewer chars read. */
if (check_val <= 0) {
CFCUtil_die("Tried to read %d characters of '%s', got %d", (int)len,
- file_path, check_val);
+ file_path, check_val);
}
/* Set length pointer for benefit of caller. */
@@ -215,11 +205,10 @@ CFCUtil_slurp_file(const char *file_path
}
void
-CFCUtil_write_if_changed(const char *path, const char *content, size_t len)
-{
+CFCUtil_write_if_changed(const char *path, const char *content, size_t len) {
FILE *f = fopen(path, "r");
if (f) { // Does file exist?
- if (fclose(f)) {
+ if (fclose(f)) {
CFCUtil_die("Error closing file '%s': %s", path, strerror(errno));
}
size_t existing_len;
@@ -236,9 +225,8 @@ CFCUtil_write_if_changed(const char *pat
CFCUtil_write_file(path, content, len);
}
-long
-CFCUtil_flength(void *file)
-{
+long
+CFCUtil_flength(void *file) {
FILE *f = (FILE*)file;
const long bookmark = (long)ftell(f);
long check_val;
@@ -257,9 +245,8 @@ CFCUtil_flength(void *file)
return len;
}
-void
-CFCUtil_die(const char* format, ...)
-{
+void
+CFCUtil_die(const char* format, ...) {
va_list args;
va_start(args, format);
vfprintf(stderr, format, args);
@@ -268,9 +255,8 @@ CFCUtil_die(const char* format, ...)
exit(1);
}
-void
-CFCUtil_warn(const char* format, ...)
-{
+void
+CFCUtil_warn(const char* format, ...) {
va_list args;
va_start(args, format);
vfprintf(stderr, format, args);
@@ -283,8 +269,7 @@ CFCUtil_warn(const char* format, ...)
#include "XSUB.h"
void*
-CFCUtil_make_perl_obj(void *ptr, const char *klass)
-{
+CFCUtil_make_perl_obj(void *ptr, const char *klass) {
SV *inner_obj = newSV(0);
SvOBJECT_on(inner_obj);
PL_sv_objcount++;
Modified: incubator/lucy/trunk/clownfish/src/CFCUtil.h
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCUtil.h?rev=1098445&r1=1098444&r2=1098445&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCUtil.h (original)
+++ incubator/lucy/trunk/clownfish/src/CFCUtil.h Sun May 1 23:50:24 2011
@@ -97,17 +97,17 @@ CFCUtil_write_if_changed(const char *pat
/* Read an entire file into memory.
*/
-char*
+char*
CFCUtil_slurp_file(const char *file_path, size_t *len_ptr);
/* Get the length of a file (may overshoot on text files under DOS).
*/
-long
+long
CFCUtil_flength(void *file);
/* Print an error message to stderr and exit.
*/
-void
+void
CFCUtil_die(const char *format, ...);
/* Print an error message to stderr.
Modified: incubator/lucy/trunk/clownfish/src/CFCVariable.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCVariable.c?rev=1098445&r1=1098444&r2=1098445&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCVariable.c (original)
+++ incubator/lucy/trunk/clownfish/src/CFCVariable.c Sun May 1 23:50:24 2011
@@ -42,22 +42,20 @@ struct CFCVariable {
};
CFCVariable*
-CFCVariable_new(struct CFCParcel *parcel, const char *exposure,
- const char *class_name, const char *class_cnick,
- const char *micro_sym, struct CFCType *type)
-{
- CFCVariable *self = (CFCVariable*)CFCBase_allocate(sizeof(CFCVariable),
- "Clownfish::Variable");
+CFCVariable_new(struct CFCParcel *parcel, const char *exposure,
+ const char *class_name, const char *class_cnick,
+ const char *micro_sym, struct CFCType *type) {
+ CFCVariable *self = (CFCVariable*)CFCBase_allocate(sizeof(CFCVariable),
+ "Clownfish::Variable");
return CFCVariable_init(self, parcel, exposure, class_name, class_cnick,
- micro_sym, type);
+ micro_sym, type);
}
CFCVariable*
-CFCVariable_init(CFCVariable *self, struct CFCParcel *parcel,
- const char *exposure, const char *class_name,
- const char *class_cnick, const char *micro_sym,
- struct CFCType *type)
-{
+CFCVariable_init(CFCVariable *self, struct CFCParcel *parcel,
+ const char *exposure, const char *class_name,
+ const char *class_cnick, const char *micro_sym,
+ struct CFCType *type) {
// Validate type.
CFCUTIL_NULL_CHECK(type);
@@ -65,7 +63,7 @@ CFCVariable_init(CFCVariable *self, stru
const char *real_exposure = exposure ? exposure : "local";
CFCSymbol_init((CFCSymbol*)self, parcel, real_exposure, class_name,
- class_cnick, micro_sym);
+ class_cnick, micro_sym);
// Assign type.
self->type = (CFCType*)CFCBase_incref((CFCBase*)type);
@@ -78,7 +76,7 @@ CFCVariable_init(CFCVariable *self, stru
}
{
size_t size = strlen(type_str) + sizeof(" ") + strlen(micro_sym) +
- strlen(postfix) + 1;
+ strlen(postfix) + 1;
self->local_c = (char*)MALLOCATE(size);
sprintf(self->local_c, "%s %s%s", type_str, micro_sym, postfix);
}
@@ -89,7 +87,7 @@ CFCVariable_init(CFCVariable *self, stru
{
const char *full_sym = CFCSymbol_full_sym((CFCSymbol*)self);
size_t size = strlen(type_str) + sizeof(" ") + strlen(full_sym) +
- strlen(postfix) + 1;
+ strlen(postfix) + 1;
self->global_c = (char*)MALLOCATE(size);
sprintf(self->global_c, "%s %s%s", type_str, full_sym, postfix);
}
@@ -98,8 +96,7 @@ CFCVariable_init(CFCVariable *self, stru
}
void
-CFCVariable_destroy(CFCVariable *self)
-{
+CFCVariable_destroy(CFCVariable *self) {
CFCBase_decref((CFCBase*)self->type);
FREEMEM(self->local_c);
FREEMEM(self->global_c);
@@ -108,33 +105,28 @@ CFCVariable_destroy(CFCVariable *self)
}
int
-CFCVariable_equals(CFCVariable *self, CFCVariable *other)
-{
+CFCVariable_equals(CFCVariable *self, CFCVariable *other) {
if (!CFCType_equals(self->type, other->type)) { return false; }
return CFCSymbol_equals((CFCSymbol*)self, (CFCSymbol*)other);
}
CFCType*
-CFCVariable_get_type(CFCVariable *self)
-{
+CFCVariable_get_type(CFCVariable *self) {
return self->type;
}
const char*
-CFCVariable_local_c(CFCVariable *self)
-{
+CFCVariable_local_c(CFCVariable *self) {
return self->local_c;
}
const char*
-CFCVariable_global_c(CFCVariable *self)
-{
+CFCVariable_global_c(CFCVariable *self) {
return self->global_c;
}
const char*
-CFCVariable_local_declaration(CFCVariable *self)
-{
+CFCVariable_local_declaration(CFCVariable *self) {
return self->local_dec;
}
Modified: incubator/lucy/trunk/clownfish/src/CFCVariable.h
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCVariable.h?rev=1098445&r1=1098444&r2=1098445&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCVariable.h (original)
+++ incubator/lucy/trunk/clownfish/src/CFCVariable.h Sun May 1 23:50:24 2011
@@ -26,14 +26,14 @@ struct CFCParcel;
struct CFCType;
CFCVariable*
-CFCVariable_new(struct CFCParcel *parcel, const char *exposure,
- const char *class_name, const char *class_cnick,
+CFCVariable_new(struct CFCParcel *parcel, const char *exposure,
+ const char *class_name, const char *class_cnick,
const char *micro_sym, struct CFCType *type);
CFCVariable*
-CFCVariable_init(CFCVariable *self, struct CFCParcel *parcel,
- const char *exposure, const char *class_name,
- const char *class_cnick, const char *micro_sym,
+CFCVariable_init(CFCVariable *self, struct CFCParcel *parcel,
+ const char *exposure, const char *class_name,
+ const char *class_cnick, const char *micro_sym,
struct CFCType *type);
void
Modified: incubator/lucy/trunk/clownfish/t/400-class.t
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/t/400-class.t?rev=1098445&r1=1098444&r2=1098445&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/t/400-class.t (original)
+++ incubator/lucy/trunk/clownfish/t/400-class.t Sun May 1 23:50:24 2011
@@ -213,18 +213,18 @@ ok( $class->has_attribute('lovable'), "p
ok( $class->has_attribute('drooly'), "parsed second class attribute" );
$class_content = qq|
- parcel inert class Rigor::Mortis cnick Mort {
- parcel inert void lie_still();
+ parcel inert class Rigor::Mortis cnick Mort {
+ parcel inert void lie_still();
}|;
$class = $parser->class_declaration($class_content);
isa_ok( $class, "Clownfish::Class", "inert class_declaration" );
ok( $class->inert, "inert modifier parsed and passed to constructor" );
$class_content = qq|
- final class Ultimo {
+ final class Ultimo {
/** Throws an error.
*/
- void Say_Never(Ultimo *self);
+ void Say_Never(Ultimo *self);
}|;
$class = $parser->class_declaration($class_content);
ok( $class->final, "final class_declaration" );
Modified: incubator/lucy/trunk/clownfish/t/cfsource/Animal/Dog.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/t/cfsource/Animal/Dog.cfh?rev=1098445&r1=1098444&r2=1098445&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/t/cfsource/Animal/Dog.cfh (original)
+++ incubator/lucy/trunk/clownfish/t/cfsource/Animal/Dog.cfh Sun May 1 23:50:24 2011
@@ -20,7 +20,7 @@ class Animal::Dog inherits Animal {
public inert incremented Dog*
new();
- public inert Dog*
+ public inert Dog*
init(Dog *self);
public void
Modified: incubator/lucy/trunk/core/Lucy/Analysis/Analyzer.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Analysis/Analyzer.c?rev=1098445&r1=1098444&r2=1098445&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Analysis/Analyzer.c (original)
+++ incubator/lucy/trunk/core/Lucy/Analysis/Analyzer.c Sun May 1 23:50:24 2011
@@ -23,18 +23,16 @@
#include "Lucy/Analysis/Inversion.h"
Analyzer*
-Analyzer_init(Analyzer *self)
-{
+Analyzer_init(Analyzer *self) {
ABSTRACT_CLASS_CHECK(self, ANALYZER);
return self;
}
Inversion*
-Analyzer_transform_text(Analyzer *self, CharBuf *text)
-{
+Analyzer_transform_text(Analyzer *self, CharBuf *text) {
size_t token_len = CB_Get_Size(text);
- Token *seed = Token_new((char*)CB_Get_Ptr8(text), token_len, 0,
- token_len, 1.0, 1);
+ Token *seed = Token_new((char*)CB_Get_Ptr8(text), token_len, 0,
+ token_len, 1.0, 1);
Inversion *starter = Inversion_new(seed);
Inversion *retval = Analyzer_Transform(self, starter);
DECREF(seed);
@@ -43,8 +41,7 @@ Analyzer_transform_text(Analyzer *self,
}
VArray*
-Analyzer_split(Analyzer *self, CharBuf *text)
-{
+Analyzer_split(Analyzer *self, CharBuf *text) {
Inversion *inversion = Analyzer_Transform_Text(self, text);
VArray *out = VA_new(0);
Token *token;
Modified: incubator/lucy/trunk/core/Lucy/Analysis/Analyzer.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Analysis/Analyzer.cfh?rev=1098445&r1=1098444&r2=1098445&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Analysis/Analyzer.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Analysis/Analyzer.cfh Sun May 1 23:50:24 2011
@@ -24,10 +24,10 @@ parcel Lucy;
* perform case folding to facilitate case-insensitive search
* (L<CaseFolder|Lucy::Analysis::CaseFolder>).
*/
-abstract class Lucy::Analysis::Analyzer
+abstract class Lucy::Analysis::Analyzer
inherits Lucy::Object::Obj : dumpable {
- public inert Analyzer*
+ public inert Analyzer*
init(Analyzer *self);
/** Take a single L<Inversion|Lucy::Analysis::Inversion> as input
Modified: incubator/lucy/trunk/core/Lucy/Analysis/CaseFolder.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Analysis/CaseFolder.c?rev=1098445&r1=1098444&r2=1098445&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Analysis/CaseFolder.c (original)
+++ incubator/lucy/trunk/core/Lucy/Analysis/CaseFolder.c Sun May 1 23:50:24 2011
@@ -22,30 +22,26 @@
#include "Lucy/Analysis/Inversion.h"
CaseFolder*
-CaseFolder_new()
-{
+CaseFolder_new() {
CaseFolder *self = (CaseFolder*)VTable_Make_Obj(CASEFOLDER);
return CaseFolder_init(self);
}
CaseFolder*
-CaseFolder_init(CaseFolder *self)
-{
+CaseFolder_init(CaseFolder *self) {
Analyzer_init((Analyzer*)self);
self->work_buf = BB_new(0);
return self;
}
void
-CaseFolder_destroy(CaseFolder *self)
-{
+CaseFolder_destroy(CaseFolder *self) {
DECREF(self->work_buf);
SUPER_DESTROY(self, CASEFOLDER);
}
bool_t
-CaseFolder_equals(CaseFolder *self, Obj *other)
-{
+CaseFolder_equals(CaseFolder *self, Obj *other) {
CaseFolder *const twin = (CaseFolder*)other;
if (twin == self) return true;
UNUSED_VAR(self);
@@ -54,17 +50,15 @@ CaseFolder_equals(CaseFolder *self, Obj
}
Hash*
-CaseFolder_dump(CaseFolder *self)
-{
- CaseFolder_dump_t super_dump
+CaseFolder_dump(CaseFolder *self) {
+ CaseFolder_dump_t super_dump
= (CaseFolder_dump_t)SUPER_METHOD(CASEFOLDER, CaseFolder, Dump);
return super_dump(self);
}
CaseFolder*
-CaseFolder_load(CaseFolder *self, Obj *dump)
-{
- CaseFolder_load_t super_load
+CaseFolder_load(CaseFolder *self, Obj *dump) {
+ CaseFolder_load_t super_load
= (CaseFolder_load_t)SUPER_METHOD(CASEFOLDER, CaseFolder, Load);
CaseFolder *loaded = super_load(self, dump);
return CaseFolder_init(loaded);
Modified: incubator/lucy/trunk/core/Lucy/Analysis/CaseFolder.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Analysis/CaseFolder.cfh?rev=1098445&r1=1098444&r2=1098445&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Analysis/CaseFolder.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Analysis/CaseFolder.cfh Sun May 1 23:50:24 2011
@@ -22,17 +22,17 @@ parcel Lucy;
* searches will be case-insensitive.
*/
-class Lucy::Analysis::CaseFolder
+class Lucy::Analysis::CaseFolder
inherits Lucy::Analysis::Analyzer : dumpable {
ByteBuf *work_buf;
- inert incremented CaseFolder*
+ inert incremented CaseFolder*
new();
/** Constructor. Takes no arguments.
*/
- public inert CaseFolder*
+ public inert CaseFolder*
init(CaseFolder *self);
public incremented Inversion*
Modified: incubator/lucy/trunk/core/Lucy/Analysis/Inversion.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Analysis/Inversion.c?rev=1098445&r1=1098444&r2=1098445&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Analysis/Inversion.c (original)
+++ incubator/lucy/trunk/core/Lucy/Analysis/Inversion.c Sun May 1 23:50:24 2011
@@ -31,8 +31,7 @@ static void
S_count_clusters(Inversion *self);
Inversion*
-Inversion_new(Token *seed_token)
-{
+Inversion_new(Token *seed_token) {
Inversion *self = (Inversion*)VTable_Make_Obj(INVERSION);
// Init.
@@ -52,13 +51,12 @@ Inversion_new(Token *seed_token)
return self;
}
-void
-Inversion_destroy(Inversion *self)
-{
+void
+Inversion_destroy(Inversion *self) {
if (self->tokens) {
Token **tokens = self->tokens;
Token **const limit = tokens + self->size;
- for ( ; tokens < limit; tokens++) {
+ for (; tokens < limit; tokens++) {
DECREF(*tokens);
}
FREEMEM(self->tokens);
@@ -68,27 +66,26 @@ Inversion_destroy(Inversion *self)
}
uint32_t
-Inversion_get_size(Inversion *self) { return self->size; }
+Inversion_get_size(Inversion *self) {
+ return self->size;
+}
Token*
-Inversion_next(Inversion *self)
-{
+Inversion_next(Inversion *self) {
// Kill the iteration if we're out of tokens.
if (self->cur == self->size) {
return NULL;
}
- return self->tokens[ self->cur++ ];
+ return self->tokens[self->cur++];
}
void
-Inversion_reset(Inversion *self)
-{
+Inversion_reset(Inversion *self) {
self->cur = 0;
}
static void
-S_grow(Inversion *self, size_t size)
-{
+S_grow(Inversion *self, size_t size) {
if (size > self->cap) {
uint64_t amount = size * sizeof(Token*);
// Clip rather than wrap.
@@ -96,13 +93,12 @@ S_grow(Inversion *self, size_t size)
self->tokens = (Token**)REALLOCATE(self->tokens, (size_t)amount);
self->cap = size;
memset(self->tokens + self->size, 0,
- (size - self->size) * sizeof(Token*));
+ (size - self->size) * sizeof(Token*));
}
}
void
-Inversion_append(Inversion *self, Token *token)
-{
+Inversion_append(Inversion *self, Token *token) {
if (self->inverted) {
THROW(ERR, "Can't append tokens after inversion");
}
@@ -110,13 +106,12 @@ Inversion_append(Inversion *self, Token
size_t new_capacity = Memory_oversize(self->size + 1, sizeof(Token*));
S_grow(self, new_capacity);
}
- self->tokens[ self->size ] = token;
+ self->tokens[self->size] = token;
self->size++;
}
Token**
-Inversion_next_cluster(Inversion *self, uint32_t *count)
-{
+Inversion_next_cluster(Inversion *self, uint32_t *count) {
Token **cluster = self->tokens + self->cur;
if (self->cur == self->size) {
@@ -133,15 +128,14 @@ Inversion_next_cluster(Inversion *self,
}
// Place cluster count in passed-in var, advance bookmark.
- *count = self->cluster_counts[ self->cur ];
+ *count = self->cluster_counts[self->cur];
self->cur += *count;
return cluster;
}
-void
-Inversion_invert(Inversion *self)
-{
+void
+Inversion_invert(Inversion *self) {
Token **tokens = self->tokens;
Token **limit = tokens + self->size;
int32_t token_pos = 0;
@@ -153,34 +147,33 @@ Inversion_invert(Inversion *self)
self->inverted = true;
// Assign token positions.
- for ( ;tokens < limit; tokens++) {
+ for (; tokens < limit; tokens++) {
Token *const cur_token = *tokens;
cur_token->pos = token_pos;
token_pos += cur_token->pos_inc;
if (token_pos < cur_token->pos) {
- THROW(ERR, "Token positions out of order: %i32 %i32",
- cur_token->pos, token_pos);
+ THROW(ERR, "Token positions out of order: %i32 %i32",
+ cur_token->pos, token_pos);
}
}
// Sort the tokens lexically, and hand off to cluster counting routine.
Sort_quicksort(self->tokens, self->size, sizeof(Token*), Token_compare,
- NULL);
+ NULL);
S_count_clusters(self);
}
static void
-S_count_clusters(Inversion *self)
-{
+S_count_clusters(Inversion *self) {
Token **tokens = self->tokens;
- uint32_t *counts
- = (uint32_t*)CALLOCATE(self->size + 1, sizeof(uint32_t));
+ uint32_t *counts
+ = (uint32_t*)CALLOCATE(self->size + 1, sizeof(uint32_t));
// Save the cluster counts.
self->cluster_counts_size = self->size;
self->cluster_counts = counts;
- for (uint32_t i = 0; i < self->size; ) {
+ for (uint32_t i = 0; i < self->size;) {
Token *const base_token = tokens[i];
char *const base_text = base_token->text;
const size_t base_len = base_token->len;
@@ -190,9 +183,9 @@ S_count_clusters(Inversion *self)
while (j < self->size) {
Token *const candidate = tokens[j];
- if ( (candidate->len == base_len)
+ if ((candidate->len == base_len)
&& (memcmp(candidate->text, base_text, base_len) == 0)
- ) {
+ ) {
j++;
}
else {
Modified: incubator/lucy/trunk/core/Lucy/Analysis/Inversion.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Analysis/Inversion.cfh?rev=1098445&r1=1098444&r2=1098445&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Analysis/Inversion.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Analysis/Inversion.cfh Sun May 1 23:50:24 2011
@@ -35,32 +35,32 @@ class Lucy::Analysis::Inversion inherits
/**
* @param seed An initial Token to start things off, which may be NULL.
*/
- inert incremented Inversion*
+ inert incremented Inversion*
new(Token *seed = NULL);
/** Tack a token onto the end of the Inversion.
*
* @param token A Token.
*/
- void
+ void
Append(Inversion *self, decremented Token *token);
/** Return the next token in the Inversion until out of tokens.
*/
- nullable Token*
+ nullable Token*
Next(Inversion *self);
/** Reset the Inversion's iterator, so that the next call to next()
* returns the first Token in the inversion.
*/
- void
+ void
Reset(Inversion *self);
/** Assign positions to constituent Tokens, tallying up the position
* increments. Sort the tokens first by token text and then by position
* ascending.
*/
- void
+ void
Invert(Inversion *self);
/** Return a pointer to the next group of like Tokens. The number of
@@ -68,13 +68,13 @@ class Lucy::Analysis::Inversion inherits
*
* @param count The number of tokens in the cluster.
*/
- nullable Token**
+ nullable Token**
Next_Cluster(Inversion *self, uint32_t *count);
uint32_t
Get_Size(Inversion *self);
- public void
+ public void
Destroy(Inversion *self);
}
Modified: incubator/lucy/trunk/core/Lucy/Analysis/PolyAnalyzer.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Analysis/PolyAnalyzer.c?rev=1098445&r1=1098444&r2=1098445&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Analysis/PolyAnalyzer.c (original)
+++ incubator/lucy/trunk/core/Lucy/Analysis/PolyAnalyzer.c Sun May 1 23:50:24 2011
@@ -25,16 +25,14 @@
#include "Lucy/Analysis/RegexTokenizer.h"
PolyAnalyzer*
-PolyAnalyzer_new(const CharBuf *language, VArray *analyzers)
-{
+PolyAnalyzer_new(const CharBuf *language, VArray *analyzers) {
PolyAnalyzer *self = (PolyAnalyzer*)VTable_Make_Obj(POLYANALYZER);
return PolyAnalyzer_init(self, language, analyzers);
}
PolyAnalyzer*
-PolyAnalyzer_init(PolyAnalyzer *self, const CharBuf *language,
- VArray *analyzers)
-{
+PolyAnalyzer_init(PolyAnalyzer *self, const CharBuf *language,
+ VArray *analyzers) {
Analyzer_init((Analyzer*)self);
if (analyzers) {
for (uint32_t i = 0, max = VA_Get_Size(analyzers); i < max; i++) {
@@ -56,18 +54,18 @@ PolyAnalyzer_init(PolyAnalyzer *self, co
}
void
-PolyAnalyzer_destroy(PolyAnalyzer *self)
-{
+PolyAnalyzer_destroy(PolyAnalyzer *self) {
DECREF(self->analyzers);
SUPER_DESTROY(self, POLYANALYZER);
}
VArray*
-PolyAnalyzer_get_analyzers(PolyAnalyzer *self) { return self->analyzers; }
+PolyAnalyzer_get_analyzers(PolyAnalyzer *self) {
+ return self->analyzers;
+}
Inversion*
-PolyAnalyzer_transform(PolyAnalyzer *self, Inversion *inversion)
-{
+PolyAnalyzer_transform(PolyAnalyzer *self, Inversion *inversion) {
VArray *const analyzers = self->analyzers;
(void)INCREF(inversion);
@@ -83,8 +81,7 @@ PolyAnalyzer_transform(PolyAnalyzer *sel
}
Inversion*
-PolyAnalyzer_transform_text(PolyAnalyzer *self, CharBuf *text)
-{
+PolyAnalyzer_transform_text(PolyAnalyzer *self, CharBuf *text) {
VArray *const analyzers = self->analyzers;
const uint32_t num_analyzers = VA_Get_Size(analyzers);
Inversion *retval;
@@ -111,8 +108,7 @@ PolyAnalyzer_transform_text(PolyAnalyzer
}
bool_t
-PolyAnalyzer_equals(PolyAnalyzer *self, Obj *other)
-{
+PolyAnalyzer_equals(PolyAnalyzer *self, Obj *other) {
PolyAnalyzer *const twin = (PolyAnalyzer*)other;
if (twin == self) return true;
if (!Obj_Is_A(other, POLYANALYZER)) return false;
@@ -121,16 +117,17 @@ PolyAnalyzer_equals(PolyAnalyzer *self,
}
PolyAnalyzer*
-PolyAnalyzer_load(PolyAnalyzer *self, Obj *dump)
-{
+PolyAnalyzer_load(PolyAnalyzer *self, Obj *dump) {
Hash *source = (Hash*)CERTIFY(dump, HASH);
- PolyAnalyzer_load_t super_load = (PolyAnalyzer_load_t)
- SUPER_METHOD(POLYANALYZER, PolyAnalyzer, Load);
+ PolyAnalyzer_load_t super_load = (PolyAnalyzer_load_t)SUPER_METHOD(
+ POLYANALYZER, PolyAnalyzer, Load);
PolyAnalyzer *loaded = super_load(self, dump);
VArray *analyzer_dumps = (VArray*)CERTIFY(
- Hash_Fetch_Str(source, "analyzers", 9), VARRAY);
+ Hash_Fetch_Str(source, "analyzers", 9),
+ VARRAY);
VArray *analyzers = (VArray*)CERTIFY(
- VA_Load(analyzer_dumps, (Obj*)analyzer_dumps), VARRAY);
+ VA_Load(analyzer_dumps, (Obj*)analyzer_dumps),
+ VARRAY);
PolyAnalyzer_init(loaded, NULL, analyzers);
DECREF(analyzers);
return loaded;
Modified: incubator/lucy/trunk/core/Lucy/Analysis/PolyAnalyzer.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Analysis/PolyAnalyzer.cfh?rev=1098445&r1=1098444&r2=1098445&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Analysis/PolyAnalyzer.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Analysis/PolyAnalyzer.cfh Sun May 1 23:50:24 2011
@@ -44,12 +44,12 @@ parcel Lucy;
* sv => Swedish,
* tr => Turkish,
*/
-class Lucy::Analysis::PolyAnalyzer
+class Lucy::Analysis::PolyAnalyzer
inherits Lucy::Analysis::Analyzer : dumpable {
VArray *analyzers;
- inert incremented PolyAnalyzer*
+ inert incremented PolyAnalyzer*
new(const CharBuf *language = NULL, VArray *analyzers = NULL);
/**
@@ -61,8 +61,8 @@ class Lucy::Analysis::PolyAnalyzer
* stoplist). In general, the sequence should be: normalize, tokenize,
* stopalize, stem.
*/
- public inert PolyAnalyzer*
- init(PolyAnalyzer *self, const CharBuf *language = NULL,
+ public inert PolyAnalyzer*
+ init(PolyAnalyzer *self, const CharBuf *language = NULL,
VArray *analyzers = NULL);
/** Getter for "analyzers" member.
Modified: incubator/lucy/trunk/core/Lucy/Analysis/RegexTokenizer.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Analysis/RegexTokenizer.c?rev=1098445&r1=1098444&r2=1098445&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Analysis/RegexTokenizer.c (original)
+++ incubator/lucy/trunk/core/Lucy/Analysis/RegexTokenizer.c Sun May 1 23:50:24 2011
@@ -23,20 +23,18 @@
#include "Lucy/Analysis/Inversion.h"
RegexTokenizer*
-RegexTokenizer_new(const CharBuf *pattern)
-{
+RegexTokenizer_new(const CharBuf *pattern) {
RegexTokenizer *self = (RegexTokenizer*)VTable_Make_Obj(REGEXTOKENIZER);
return RegexTokenizer_init(self, pattern);
}
Inversion*
-RegexTokenizer_transform(RegexTokenizer *self, Inversion *inversion)
-{
+RegexTokenizer_transform(RegexTokenizer *self, Inversion *inversion) {
Inversion *new_inversion = Inversion_new(NULL);
Token *token;
while (NULL != (token = Inversion_Next(inversion))) {
- RegexTokenizer_Tokenize_Str(self, token->text, token->len,
+ RegexTokenizer_Tokenize_Str(self, token->text, token->len,
new_inversion);
}
@@ -44,17 +42,15 @@ RegexTokenizer_transform(RegexTokenizer
}
Inversion*
-RegexTokenizer_transform_text(RegexTokenizer *self, CharBuf *text)
-{
+RegexTokenizer_transform_text(RegexTokenizer *self, CharBuf *text) {
Inversion *new_inversion = Inversion_new(NULL);
- RegexTokenizer_Tokenize_Str(self, (char*)CB_Get_Ptr8(text),
- CB_Get_Size(text), new_inversion);
+ RegexTokenizer_Tokenize_Str(self, (char*)CB_Get_Ptr8(text),
+ CB_Get_Size(text), new_inversion);
return new_inversion;
}
Obj*
-RegexTokenizer_dump(RegexTokenizer *self)
-{
+RegexTokenizer_dump(RegexTokenizer *self) {
RegexTokenizer_dump_t super_dump
= (RegexTokenizer_dump_t)SUPER_METHOD(REGEXTOKENIZER, RegexTokenizer, Dump);
Hash *dump = (Hash*)CERTIFY(super_dump(self), HASH);
@@ -63,20 +59,18 @@ RegexTokenizer_dump(RegexTokenizer *self
}
RegexTokenizer*
-RegexTokenizer_load(RegexTokenizer *self, Obj *dump)
-{
+RegexTokenizer_load(RegexTokenizer *self, Obj *dump) {
Hash *source = (Hash*)CERTIFY(dump, HASH);
- RegexTokenizer_load_t super_load
+ RegexTokenizer_load_t super_load
= (RegexTokenizer_load_t)SUPER_METHOD(REGEXTOKENIZER, RegexTokenizer, Load);
RegexTokenizer *loaded = super_load(self, dump);
- CharBuf *pattern = (CharBuf*)CERTIFY(
- Hash_Fetch_Str(source, "pattern", 7), CHARBUF);
+ CharBuf *pattern
+ = (CharBuf*)CERTIFY(Hash_Fetch_Str(source, "pattern", 7), CHARBUF);
return RegexTokenizer_init(loaded, pattern);
}
bool_t
-RegexTokenizer_equals(RegexTokenizer *self, Obj *other)
-{
+RegexTokenizer_equals(RegexTokenizer *self, Obj *other) {
RegexTokenizer *const twin = (RegexTokenizer*)other;
if (twin == self) return true;
if (!Obj_Is_A(other, REGEXTOKENIZER)) return false;
Modified: incubator/lucy/trunk/core/Lucy/Analysis/RegexTokenizer.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Analysis/RegexTokenizer.cfh?rev=1098445&r1=1098444&r2=1098445&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Analysis/RegexTokenizer.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Analysis/RegexTokenizer.cfh Sun May 1 23:50:24 2011
@@ -47,13 +47,13 @@ parcel Lucy;
* ... the difference being that the word character tokenizer skips over
* punctuation as well as whitespace when determining token boundaries.
*/
-class Lucy::Analysis::RegexTokenizer
+class Lucy::Analysis::RegexTokenizer
inherits Lucy::Analysis::Analyzer {
CharBuf *pattern;
void *token_re;
- inert incremented RegexTokenizer*
+ inert incremented RegexTokenizer*
new(const CharBuf *pattern = NULL);
/**
@@ -62,7 +62,7 @@ class Lucy::Analysis::RegexTokenizer
* <code>\w+(?:[\x{2019}']\w+)*</code>, which matches "it's" as well as
* "it" and "O'Henry's" as well as "Henry".
*/
- public inert RegexTokenizer*
+ public inert RegexTokenizer*
init(RegexTokenizer *self, const CharBuf *pattern = NULL);
public incremented Inversion*
@@ -75,7 +75,7 @@ class Lucy::Analysis::RegexTokenizer
* supplied Inversion.
*/
void
- Tokenize_Str(RegexTokenizer *self, const char *text, size_t len,
+ Tokenize_Str(RegexTokenizer *self, const char *text, size_t len,
Inversion *inversion);
/** Set the compiled regular expression for matching a token. Also sets
Modified: incubator/lucy/trunk/core/Lucy/Analysis/SnowballStemmer.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Analysis/SnowballStemmer.c?rev=1098445&r1=1098444&r2=1098445&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Analysis/SnowballStemmer.c (original)
+++ incubator/lucy/trunk/core/Lucy/Analysis/SnowballStemmer.c Sun May 1 23:50:24 2011
@@ -26,15 +26,13 @@
#include "libstemmer.h"
SnowballStemmer*
-SnowStemmer_new(const CharBuf *language)
-{
+SnowStemmer_new(const CharBuf *language) {
SnowballStemmer *self = (SnowballStemmer*)VTable_Make_Obj(SNOWBALLSTEMMER);
return SnowStemmer_init(self, language);
}
SnowballStemmer*
-SnowStemmer_init(SnowballStemmer *self, const CharBuf *language)
-{
+SnowStemmer_init(SnowballStemmer *self, const CharBuf *language) {
char lang_buf[3];
Analyzer_init((Analyzer*)self);
self->language = CB_Clone(language);
@@ -52,8 +50,7 @@ SnowStemmer_init(SnowballStemmer *self,
}
void
-SnowStemmer_destroy(SnowballStemmer *self)
-{
+SnowStemmer_destroy(SnowballStemmer *self) {
if (self->snowstemmer) {
sb_stemmer_delete((struct sb_stemmer*)self->snowstemmer);
}
@@ -62,15 +59,14 @@ SnowStemmer_destroy(SnowballStemmer *sel
}
Inversion*
-SnowStemmer_transform(SnowballStemmer *self, Inversion *inversion)
-{
+SnowStemmer_transform(SnowballStemmer *self, Inversion *inversion) {
Token *token;
- struct sb_stemmer *const snowstemmer
+ struct sb_stemmer *const snowstemmer
= (struct sb_stemmer*)self->snowstemmer;
while (NULL != (token = Inversion_Next(inversion))) {
- const sb_symbol *stemmed_text = sb_stemmer_stem(snowstemmer,
- (sb_symbol*)token->text, token->len);
+ const sb_symbol *stemmed_text
+ = sb_stemmer_stem(snowstemmer, (sb_symbol*)token->text, token->len);
size_t len = sb_stemmer_length(snowstemmer);
if (len > token->len) {
FREEMEM(token->text);
@@ -84,9 +80,8 @@ SnowStemmer_transform(SnowballStemmer *s
}
Hash*
-SnowStemmer_dump(SnowballStemmer *self)
-{
- SnowStemmer_dump_t super_dump
+SnowStemmer_dump(SnowballStemmer *self) {
+ SnowStemmer_dump_t super_dump
= (SnowStemmer_dump_t)SUPER_METHOD(SNOWBALLSTEMMER, SnowStemmer, Dump);
Hash *dump = super_dump(self);
Hash_Store_Str(dump, "language", 8, (Obj*)CB_Clone(self->language));
@@ -94,25 +89,23 @@ SnowStemmer_dump(SnowballStemmer *self)
}
SnowballStemmer*
-SnowStemmer_load(SnowballStemmer *self, Obj *dump)
-{
- SnowStemmer_load_t super_load
+SnowStemmer_load(SnowballStemmer *self, Obj *dump) {
+ SnowStemmer_load_t super_load
= (SnowStemmer_load_t)SUPER_METHOD(SNOWBALLSTEMMER, SnowStemmer, Load);
SnowballStemmer *loaded = super_load(self, dump);
Hash *source = (Hash*)CERTIFY(dump, HASH);
- CharBuf *language = (CharBuf*)CERTIFY(
- Hash_Fetch_Str(source, "language", 8), CHARBUF);
+ CharBuf *language
+ = (CharBuf*)CERTIFY(Hash_Fetch_Str(source, "language", 8), CHARBUF);
return SnowStemmer_init(loaded, language);
}
bool_t
-SnowStemmer_equals(SnowballStemmer *self, Obj *other)
-{
+SnowStemmer_equals(SnowballStemmer *self, Obj *other) {
SnowballStemmer *const twin = (SnowballStemmer*)other;
if (twin == self) return true;
if (!Obj_Is_A(other, SNOWBALLSTEMMER)) return false;
if (!CB_Equals(twin->language, (Obj*)self->language)) return false;
return true;
-}
+}
Modified: incubator/lucy/trunk/core/Lucy/Analysis/SnowballStemmer.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Analysis/SnowballStemmer.cfh?rev=1098445&r1=1098444&r2=1098445&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Analysis/SnowballStemmer.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Analysis/SnowballStemmer.cfh Sun May 1 23:50:24 2011
@@ -31,14 +31,14 @@ class Lucy::Analysis::SnowballStemmer cn
void *snowstemmer;
CharBuf *language;
- inert incremented SnowballStemmer*
+ inert incremented SnowballStemmer*
new(const CharBuf *language);
/**
* @param language A two-letter ISO code identifying a language supported
* by Snowball.
*/
- public inert SnowballStemmer*
+ public inert SnowballStemmer*
init(SnowballStemmer *self, const CharBuf *language);
public incremented Inversion*
Modified: incubator/lucy/trunk/core/Lucy/Analysis/SnowballStopFilter.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Analysis/SnowballStopFilter.c?rev=1098445&r1=1098444&r2=1098445&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Analysis/SnowballStopFilter.c (original)
+++ incubator/lucy/trunk/core/Lucy/Analysis/SnowballStopFilter.c Sun May 1 23:50:24 2011
@@ -24,15 +24,14 @@
#include "Lucy/Analysis/Inversion.h"
SnowballStopFilter*
-SnowStop_new(const CharBuf *language, Hash *stoplist)
-{
+SnowStop_new(const CharBuf *language, Hash *stoplist) {
SnowballStopFilter *self = (SnowballStopFilter*)VTable_Make_Obj(SNOWBALLSTOPFILTER);
return SnowStop_init(self, language, stoplist);
}
SnowballStopFilter*
-SnowStop_init(SnowballStopFilter *self, const CharBuf *language, Hash *stoplist)
-{
+SnowStop_init(SnowballStopFilter *self, const CharBuf *language,
+ Hash *stoplist) {
Analyzer_init((Analyzer*)self);
if (stoplist) {
@@ -53,15 +52,13 @@ SnowStop_init(SnowballStopFilter *self,
}
void
-SnowStop_destroy(SnowballStopFilter *self)
-{
+SnowStop_destroy(SnowballStopFilter *self) {
DECREF(self->stoplist);
SUPER_DESTROY(self, SNOWBALLSTOPFILTER);
}
Inversion*
-SnowStop_transform(SnowballStopFilter *self, Inversion *inversion)
-{
+SnowStop_transform(SnowballStopFilter *self, Inversion *inversion) {
Token *token;
Inversion *new_inversion = Inversion_new(NULL);
Hash *const stoplist = self->stoplist;
@@ -76,8 +73,7 @@ SnowStop_transform(SnowballStopFilter *s
}
bool_t
-SnowStop_equals(SnowballStopFilter *self, Obj *other)
-{
+SnowStop_equals(SnowballStopFilter *self, Obj *other) {
SnowballStopFilter *const twin = (SnowballStopFilter*)other;
if (twin == self) return true;
if (!Obj_Is_A(other, SNOWBALLSTOPFILTER)) return false;
@@ -88,13 +84,12 @@ SnowStop_equals(SnowballStopFilter *self
}
Hash*
-SnowStop_gen_stoplist(const CharBuf *language)
-{
+SnowStop_gen_stoplist(const CharBuf *language) {
CharBuf *lang = CB_new(3);
CB_Cat_Char(lang, tolower(CB_Code_Point_At(language, 0)));
CB_Cat_Char(lang, tolower(CB_Code_Point_At(language, 1)));
const uint8_t **words = NULL;
- if (CB_Equals_Str(lang, "da", 2)) { words = SnowStop_snow_da; }
+ if (CB_Equals_Str(lang, "da", 2)) { words = SnowStop_snow_da; }
else if (CB_Equals_Str(lang, "de", 2)) { words = SnowStop_snow_de; }
else if (CB_Equals_Str(lang, "en", 2)) { words = SnowStop_snow_en; }
else if (CB_Equals_Str(lang, "es", 2)) { words = SnowStop_snow_es; }
@@ -113,7 +108,7 @@ SnowStop_gen_stoplist(const CharBuf *lan
}
size_t num_stopwords = 0;
for (uint32_t i = 0; words[i] != NULL; i++) { num_stopwords++; }
- NoCloneHash *stoplist = NoCloneHash_new(num_stopwords);
+ NoCloneHash *stoplist = NoCloneHash_new(num_stopwords);
for (uint32_t i = 0; words[i] != NULL; i++) {
char *word = (char*)words[i];
ViewCharBuf *stop = ViewCB_new_from_trusted_utf8(word, strlen(word));
@@ -127,21 +122,18 @@ SnowStop_gen_stoplist(const CharBuf *lan
/***************************************************************************/
NoCloneHash*
-NoCloneHash_new(uint32_t capacity)
-{
+NoCloneHash_new(uint32_t capacity) {
NoCloneHash *self = (NoCloneHash*)VTable_Make_Obj(NOCLONEHASH);
return NoCloneHash_init(self, capacity);
}
NoCloneHash*
-NoCloneHash_init(NoCloneHash *self, uint32_t capacity)
-{
+NoCloneHash_init(NoCloneHash *self, uint32_t capacity) {
return (NoCloneHash*)Hash_init((Hash*)self, capacity);
}
Obj*
-NoCloneHash_make_key(NoCloneHash *self, Obj *key, int32_t hash_sum)
-{
+NoCloneHash_make_key(NoCloneHash *self, Obj *key, int32_t hash_sum) {
UNUSED_VAR(self);
UNUSED_VAR(hash_sum);
return INCREF(key);
Modified: incubator/lucy/trunk/core/Lucy/Analysis/SnowballStopFilter.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Analysis/SnowballStopFilter.cfh?rev=1098445&r1=1098444&r2=1098445&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Analysis/SnowballStopFilter.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Analysis/SnowballStopFilter.cfh Sun May 1 23:50:24 2011
@@ -25,11 +25,11 @@ parcel Lucy;
*
* Before filtering stopwords:
*
- * ( "i", "am", "the", "walrus" )
+ * ("i", "am", "the", "walrus")
*
* After filtering stopwords:
*
- * ( "walrus" )
+ * ("walrus")
*
* SnowballStopFilter provides default stoplists for several languages, courtesy of
* the Snowball project (<http://snowball.tartarus.org>), or you may supply
@@ -72,16 +72,16 @@ class Lucy::Analysis::SnowballStopFilter
inert const uint8_t** snow_pt;
inert const uint8_t** snow_ru;
inert const uint8_t** snow_sv;
-
- inert incremented SnowballStopFilter*
+
+ inert incremented SnowballStopFilter*
new(const CharBuf *language = NULL, Hash *stoplist = NULL);
/**
* @param stoplist A hash with stopwords as the keys.
* @param language The ISO code for a supported language.
*/
- public inert SnowballStopFilter*
- init(SnowballStopFilter *self, const CharBuf *language = NULL,
+ public inert SnowballStopFilter*
+ init(SnowballStopFilter *self, const CharBuf *language = NULL,
Hash *stoplist = NULL);
/** Return a Hash with the Snowball stoplist for the supplied language.
Modified: incubator/lucy/trunk/core/Lucy/Analysis/Token.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Analysis/Token.c?rev=1098445&r1=1098444&r2=1098445&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Analysis/Token.c (original)
+++ incubator/lucy/trunk/core/Lucy/Analysis/Token.c Sun May 1 23:50:24 2011
@@ -20,20 +20,18 @@
#include "Lucy/Analysis/Token.h"
Token*
-Token_new(const char* text, size_t len, uint32_t start_offset,
- uint32_t end_offset, float boost, int32_t pos_inc)
-{
+Token_new(const char* text, size_t len, uint32_t start_offset,
+ uint32_t end_offset, float boost, int32_t pos_inc) {
Token *self = (Token*)VTable_Make_Obj(TOKEN);
return Token_init(self, text, len, start_offset, end_offset, boost,
- pos_inc);
+ pos_inc);
}
Token*
Token_init(Token *self, const char* text, size_t len, uint32_t start_offset,
- uint32_t end_offset, float boost, int32_t pos_inc)
-{
+ uint32_t end_offset, float boost, int32_t pos_inc) {
// Allocate and assign.
- self->text = (char*)MALLOCATE(len + 1);
+ self->text = (char*)MALLOCATE(len + 1);
self->text[len] = '\0';
memcpy(self->text, text, len);
@@ -51,19 +49,17 @@ Token_init(Token *self, const char* text
}
void
-Token_destroy(Token *self)
-{
+Token_destroy(Token *self) {
FREEMEM(self->text);
SUPER_DESTROY(self, TOKEN);
}
int
-Token_compare(void *context, const void *va, const void *vb)
-{
+Token_compare(void *context, const void *va, const void *vb) {
Token *const a = *((Token**)va);
Token *const b = *((Token**)vb);
size_t min_len = a->len < b->len ? a->len : b->len;
- int comparison = memcmp(a->text, b->text, min_len);
+ int comparison = memcmp(a->text, b->text, min_len);
UNUSED_VAR(context);
if (comparison == 0) {
@@ -79,21 +75,37 @@ Token_compare(void *context, const void
}
uint32_t
-Token_get_start_offset(Token *self) { return self->start_offset; }
+Token_get_start_offset(Token *self) {
+ return self->start_offset;
+}
+
uint32_t
-Token_get_end_offset(Token *self) { return self->end_offset; }
+Token_get_end_offset(Token *self) {
+ return self->end_offset;
+}
+
float
-Token_get_boost(Token *self) { return self->boost; }
+Token_get_boost(Token *self) {
+ return self->boost;
+}
+
int32_t
-Token_get_pos_inc(Token *self) { return self->pos_inc; }
+Token_get_pos_inc(Token *self) {
+ return self->pos_inc;
+}
+
char*
-Token_get_text(Token *self) { return self->text; }
+Token_get_text(Token *self) {
+ return self->text;
+}
+
size_t
-Token_get_len(Token *self) { return self->len; }
+Token_get_len(Token *self) {
+ return self->len;
+}
void
-Token_set_text(Token *self, char *text, size_t len)
-{
+Token_set_text(Token *self, char *text, size_t len) {
if (len > self->len) {
FREEMEM(self->text);
self->text = (char*)MALLOCATE(len + 1);
Modified: incubator/lucy/trunk/core/Lucy/Analysis/Token.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Analysis/Token.cfh?rev=1098445&r1=1098444&r2=1098445&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Analysis/Token.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Analysis/Token.cfh Sun May 1 23:50:24 2011
@@ -59,18 +59,18 @@ class Lucy::Analysis::Token inherits Luc
int32_t pos_inc;
int32_t pos;
- inert incremented Token*
- new(const char *text, size_t len, uint32_t start_offset,
+ inert incremented Token*
+ new(const char *text, size_t len, uint32_t start_offset,
uint32_t end_offset, float boost = 1.0, int32_t pos_inc = 1);
- inert Token*
- init(Token *self, const char *text, size_t len,
- uint32_t start_offset, uint32_t end_offset,
+ inert Token*
+ init(Token *self, const char *text, size_t len,
+ uint32_t start_offset, uint32_t end_offset,
float boost = 1.0, int32_t pos_inc = 1);
/** Sort_quicksort-compatible comparison routine.
*/
- inert int
+ inert int
compare(void *context, const void *va, const void *vb);
uint32_t
@@ -94,7 +94,7 @@ class Lucy::Analysis::Token inherits Luc
void
Set_Text(Token *self, char *text, size_t len);
- public void
+ public void
Destroy(Token *self);
}
Modified: incubator/lucy/trunk/core/Lucy/Document/Doc.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Document/Doc.c?rev=1098445&r1=1098444&r2=1098445&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Document/Doc.c (original)
+++ incubator/lucy/trunk/core/Lucy/Document/Doc.c Sun May 1 23:50:24 2011
@@ -20,17 +20,24 @@
#include "Lucy/Document/Doc.h"
Doc*
-Doc_new(void *fields, int32_t doc_id)
-{
+Doc_new(void *fields, int32_t doc_id) {
Doc *self = (Doc*)VTable_Make_Obj(DOC);
return Doc_init(self, fields, doc_id);
}
-void
-Doc_set_doc_id(Doc *self, int32_t doc_id) { self->doc_id = doc_id; }
-int32_t
-Doc_get_doc_id(Doc *self) { return self->doc_id; }
-void*
-Doc_get_fields(Doc *self) { return self->fields; }
+void
+Doc_set_doc_id(Doc *self, int32_t doc_id) {
+ self->doc_id = doc_id;
+}
+
+int32_t
+Doc_get_doc_id(Doc *self) {
+ return self->doc_id;
+}
+
+void*
+Doc_get_fields(Doc *self) {
+ return self->fields;
+}
Modified: incubator/lucy/trunk/core/Lucy/Document/Doc.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Document/Doc.cfh?rev=1098445&r1=1098444&r2=1098445&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Document/Doc.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Document/Doc.cfh Sun May 1 23:50:24 2011
@@ -22,7 +22,7 @@ parcel Lucy;
* or more fields, each of which has a value.
*/
-public class Lucy::Document::Doc inherits Lucy::Object::Obj
+public class Lucy::Document::Doc inherits Lucy::Object::Obj
: dumpable {
void *fields;
@@ -36,7 +36,7 @@ public class Lucy::Document::Doc inherit
* @param doc_id Internal Lucy document id. Default of 0 (an
* invalid doc id).
*/
- public inert Doc*
+ public inert Doc*
init(Doc *self, void *fields = NULL, int32_t doc_id = 0);
/** Set internal Lucy document id.
@@ -58,7 +58,7 @@ public class Lucy::Document::Doc inherit
*/
void
Set_Fields(Doc *self, void *fields);
-
+
/** Return the Doc's backing fields hash.
*/
public nullable void*
Modified: incubator/lucy/trunk/core/Lucy/Document/HitDoc.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Document/HitDoc.c?rev=1098445&r1=1098444&r2=1098445&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Document/HitDoc.c (original)
+++ incubator/lucy/trunk/core/Lucy/Document/HitDoc.c Sun May 1 23:50:24 2011
@@ -22,33 +22,36 @@
#include "Lucy/Store/OutStream.h"
HitDoc*
-HitDoc_new(void *fields, int32_t doc_id, float score)
-{
+HitDoc_new(void *fields, int32_t doc_id, float score) {
HitDoc *self = (HitDoc*)VTable_Make_Obj(HITDOC);
return HitDoc_init(self, fields, doc_id, score);
}
HitDoc*
-HitDoc_init(HitDoc *self, void *fields, int32_t doc_id, float score)
-{
+HitDoc_init(HitDoc *self, void *fields, int32_t doc_id, float score) {
Doc_init((Doc*)self, fields, doc_id);
self->score = score;
return self;
}
-void HitDoc_set_score(HitDoc *self, float score) { self->score = score; }
-float HitDoc_get_score(HitDoc *self) { return self->score; }
+void
+HitDoc_set_score(HitDoc *self, float score) {
+ self->score = score;
+}
+
+float
+HitDoc_get_score(HitDoc *self) {
+ return self->score;
+}
void
-HitDoc_serialize(HitDoc *self, OutStream *outstream)
-{
+HitDoc_serialize(HitDoc *self, OutStream *outstream) {
Doc_serialize((Doc*)self, outstream);
OutStream_Write_F32(outstream, self->score);
}
HitDoc*
-HitDoc_deserialize(HitDoc *self, InStream *instream)
-{
+HitDoc_deserialize(HitDoc *self, InStream *instream) {
self = self ? self : (HitDoc*)VTable_Make_Obj(HITDOC);
Doc_deserialize((Doc*)self, instream);
self->score = InStream_Read_F32(instream);
@@ -56,9 +59,8 @@ HitDoc_deserialize(HitDoc *self, InStrea
}
Hash*
-HitDoc_dump(HitDoc *self)
-{
- HitDoc_dump_t super_dump
+HitDoc_dump(HitDoc *self) {
+ HitDoc_dump_t super_dump
= (HitDoc_dump_t)SUPER_METHOD(HITDOC, HitDoc, Dump);
Hash *dump = super_dump(self);
Hash_Store_Str(dump, "score", 5, (Obj*)CB_newf("%f64", self->score));
@@ -66,10 +68,9 @@ HitDoc_dump(HitDoc *self)
}
HitDoc*
-HitDoc_load(HitDoc *self, Obj *dump)
-{
+HitDoc_load(HitDoc *self, Obj *dump) {
Hash *source = (Hash*)CERTIFY(dump, HASH);
- HitDoc_load_t super_load
+ HitDoc_load_t super_load
= (HitDoc_load_t)SUPER_METHOD(HITDOC, HitDoc, Load);
HitDoc *loaded = super_load(self, dump);
Obj *score = CERTIFY(Hash_Fetch_Str(source, "score", 5), OBJ);
@@ -78,13 +79,12 @@ HitDoc_load(HitDoc *self, Obj *dump)
}
bool_t
-HitDoc_equals(HitDoc *self, Obj *other)
-{
+HitDoc_equals(HitDoc *self, Obj *other) {
HitDoc *twin = (HitDoc*)other;
- if (twin == self) { return true; }
+ if (twin == self) { return true; }
if (!Obj_Is_A(other, HITDOC)) { return false; }
if (!Doc_equals((Doc*)self, other)) { return false; }
- if (self->score != twin->score) { return false; }
+ if (self->score != twin->score) { return false; }
return true;
}
Modified: incubator/lucy/trunk/core/Lucy/Document/HitDoc.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Document/HitDoc.cfh?rev=1098445&r1=1098444&r2=1098445&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Document/HitDoc.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Document/HitDoc.cfh Sun May 1 23:50:24 2011
@@ -27,7 +27,7 @@ class Lucy::Document::HitDoc inherits Lu
float score;
- inert incremented HitDoc*
+ inert incremented HitDoc*
new(void *fields = NULL, int32_t doc_id = 0, float score = 0.0);
/** Constructor.
@@ -36,8 +36,8 @@ class Lucy::Document::HitDoc inherits Lu
* @param doc_id Internal document id.
* @param score Number indicating how well the doc scored against a query.
*/
- inert HitDoc*
- init(HitDoc *self, void *fields = NULL, int32_t doc_id = 0,
+ inert HitDoc*
+ init(HitDoc *self, void *fields = NULL, int32_t doc_id = 0,
float score = 0.0);
/** Set score attribute.