lucy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nwelln...@apache.org
Subject [lucy-commits] [1/3] Global rename of "cnick" to "nickname"
Date Wed, 23 Apr 2014 14:43:13 GMT
Repository: lucy-clownfish
Updated Branches:
  refs/heads/master b7d53da9b -> 501820b22


http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/d0486854/compiler/src/CFCParseHeader.y
----------------------------------------------------------------------
diff --git a/compiler/src/CFCParseHeader.y b/compiler/src/CFCParseHeader.y
index 5528998..13912d9 100644
--- a/compiler/src/CFCParseHeader.y
+++ b/compiler/src/CFCParseHeader.y
@@ -35,7 +35,7 @@
 
 static CFCClass*
 S_start_class(CFCParser *state, CFCDocuComment *docucomment, char *exposure,
-              char *modifiers, char *class_name, char *class_cnick,
+              char *modifiers, char *class_name, char *class_nickname,
               char *inheritance) {
     CFCFileSpec *file_spec = CFCParser_get_file_spec(state);
     int is_final = false;
@@ -49,9 +49,9 @@ S_start_class(CFCParser *state, CFCDocuComment *docucomment, char *exposure,
         is_inert = !!strstr(modifiers, "inert");
     }
     CFCParser_set_class_name(state, class_name);
-    CFCParser_set_class_cnick(state, class_cnick);
+    CFCParser_set_class_nickname(state, class_nickname);
     CFCClass *klass = CFCClass_create(CFCParser_get_parcel(state), exposure,
-                                      class_name, class_cnick, NULL,
+                                      class_name, class_nickname, NULL,
                                       docucomment, file_spec, inheritance,
                                       is_final, is_inert);
     CFCBase_decref((CFCBase*)docucomment);
@@ -69,15 +69,15 @@ S_new_var(CFCParser *state, char *exposure, char *modifiers, CFCType *type,
         inert = true;
     }
 
-    CFCParcel  *parcel      = CFCParser_get_parcel(state);
-    const char *class_name  = NULL;
-    const char *class_cnick = NULL;
+    CFCParcel  *parcel         = CFCParser_get_parcel(state);
+    const char *class_name     = NULL;
+    const char *class_nickname = NULL;
     if (exposure && strcmp(exposure, "local") != 0) {
-        class_name  = CFCParser_get_class_name(state);
-        class_cnick = CFCParser_get_class_cnick(state);
+        class_name     = CFCParser_get_class_name(state);
+        class_nickname = CFCParser_get_class_nickname(state);
     }
     CFCVariable *var = CFCVariable_new(parcel, exposure, class_name,
-                                       class_cnick, name, type, inert);
+                                       class_nickname, name, type, inert);
 
     /* Consume tokens. */
     CFCBase_decref((CFCBase*)type);
@@ -89,9 +89,9 @@ static CFCBase*
 S_new_sub(CFCParser *state, CFCDocuComment *docucomment, 
           char *exposure, char *modifiers, CFCType *type, char *name,
           CFCParamList *param_list) {
-    CFCParcel  *parcel      = CFCParser_get_parcel(state);
-    const char *class_name  = CFCParser_get_class_name(state);
-    const char *class_cnick = CFCParser_get_class_cnick(state);
+    CFCParcel  *parcel         = CFCParser_get_parcel(state);
+    const char *class_name     = CFCParser_get_class_name(state);
+    const char *class_nickname = CFCParser_get_class_nickname(state);
 
     /* Find modifiers by scanning the list. */
     int is_abstract = false;
@@ -115,15 +115,15 @@ S_new_sub(CFCParser *state, CFCDocuComment *docucomment,
             CFCUtil_die("Inert functions must not be final");
         }
         sub = (CFCBase*)CFCFunction_new(parcel, exposure, class_name,
-                                         class_cnick, name, type, param_list,
-                                         docucomment, is_inline);
+                                         class_nickname, name, type,
+                                         param_list, docucomment, is_inline);
     }
     else {
         if (is_inline) {
             CFCUtil_die("Methods must not be inline");
         }
         sub = (CFCBase*)CFCMethod_new(parcel, exposure, class_name,
-                                       class_cnick, name, type, param_list,
+                                       class_nickname, name, type, param_list,
                                        docucomment, is_final, is_abstract);
     }
 
@@ -347,41 +347,41 @@ class_declaration(A) ::= class_defs(B) RIGHT_CURLY_BRACE.
 {
     A = B;
     CFCParser_set_class_name(state, NULL);
-    CFCParser_set_class_cnick(state, NULL);
-}
-
-class_head(A) ::= docucomment(B) exposure_specifier(C) declaration_modifier_list(D) CLASS qualified_id(E) cnick(F) class_inheritance(G).  { A = S_start_class(state, B,    C,    D,    E,    F,    G   ); }
-class_head(A) ::=                exposure_specifier(C) declaration_modifier_list(D) CLASS qualified_id(E) cnick(F) class_inheritance(G).  { A = S_start_class(state, NULL, C,    D,    E,    F,    G   ); }
-class_head(A) ::= docucomment(B)                       declaration_modifier_list(D) CLASS qualified_id(E) cnick(F) class_inheritance(G).  { A = S_start_class(state, B,    NULL, D,    E,    F,    G   ); }
-class_head(A) ::=                                      declaration_modifier_list(D) CLASS qualified_id(E) cnick(F) class_inheritance(G).  { A = S_start_class(state, NULL, NULL, D,    E,    F,    G   ); }
-class_head(A) ::= docucomment(B) exposure_specifier(C)                              CLASS qualified_id(E) cnick(F) class_inheritance(G).  { A = S_start_class(state, B,    C,    NULL, E,    F,    G   ); }
-class_head(A) ::=                exposure_specifier(C)                              CLASS qualified_id(E) cnick(F) class_inheritance(G).  { A = S_start_class(state, NULL, C,    NULL, E,    F,    G   ); }
-class_head(A) ::= docucomment(B)                                                    CLASS qualified_id(E) cnick(F) class_inheritance(G).  { A = S_start_class(state, B,    NULL, NULL, E,    F,    G   ); }
-class_head(A) ::=                                                                   CLASS qualified_id(E) cnick(F) class_inheritance(G).  { A = S_start_class(state, NULL, NULL, NULL, E,    F,    G   ); }
-class_head(A) ::= docucomment(B) exposure_specifier(C) declaration_modifier_list(D) CLASS qualified_id(E)          class_inheritance(G).  { A = S_start_class(state, B,    C,    D,    E,    NULL, G   ); }
-class_head(A) ::=                exposure_specifier(C) declaration_modifier_list(D) CLASS qualified_id(E)          class_inheritance(G).  { A = S_start_class(state, NULL, C,    D,    E,    NULL, G   ); }
-class_head(A) ::= docucomment(B)                       declaration_modifier_list(D) CLASS qualified_id(E)          class_inheritance(G).  { A = S_start_class(state, B,    NULL, D,    E,    NULL, G   ); }
-class_head(A) ::=                                      declaration_modifier_list(D) CLASS qualified_id(E)          class_inheritance(G).  { A = S_start_class(state, NULL, NULL, D,    E,    NULL, G   ); }
-class_head(A) ::= docucomment(B) exposure_specifier(C)                              CLASS qualified_id(E)          class_inheritance(G).  { A = S_start_class(state, B,    C,    NULL, E,    NULL, G   ); }
-class_head(A) ::=                exposure_specifier(C)                              CLASS qualified_id(E)          class_inheritance(G).  { A = S_start_class(state, NULL, C,    NULL, E,    NULL, G   ); }
-class_head(A) ::= docucomment(B)                                                    CLASS qualified_id(E)          class_inheritance(G).  { A = S_start_class(state, B,    NULL, NULL, E,    NULL, G   ); }
-class_head(A) ::=                                                                   CLASS qualified_id(E)          class_inheritance(G).  { A = S_start_class(state, NULL, NULL, NULL, E,    NULL, G   ); }
-class_head(A) ::= docucomment(B) exposure_specifier(C) declaration_modifier_list(D) CLASS qualified_id(E) cnick(F)                     .  { A = S_start_class(state, B,    C,    D,    E,    F,    NULL ); }
-class_head(A) ::=                exposure_specifier(C) declaration_modifier_list(D) CLASS qualified_id(E) cnick(F)                     .  { A = S_start_class(state, NULL, C,    D,    E,    F,    NULL ); }
-class_head(A) ::= docucomment(B)                       declaration_modifier_list(D) CLASS qualified_id(E) cnick(F)                     .  { A = S_start_class(state, B,    NULL, D,    E,    F,    NULL ); }
-class_head(A) ::=                                      declaration_modifier_list(D) CLASS qualified_id(E) cnick(F)                     .  { A = S_start_class(state, NULL, NULL, D,    E,    F,    NULL ); }
-class_head(A) ::= docucomment(B) exposure_specifier(C)                              CLASS qualified_id(E) cnick(F)                     .  { A = S_start_class(state, B,    C,    NULL, E,    F,    NULL ); }
-class_head(A) ::=                exposure_specifier(C)                              CLASS qualified_id(E) cnick(F)                     .  { A = S_start_class(state, NULL, C,    NULL, E,    F,    NULL ); }
-class_head(A) ::= docucomment(B)                                                    CLASS qualified_id(E) cnick(F)                     .  { A = S_start_class(state, B,    NULL, NULL, E,    F,    NULL ); }
-class_head(A) ::=                                                                   CLASS qualified_id(E) cnick(F)                     .  { A = S_start_class(state, NULL, NULL, NULL, E,    F,    NULL ); }
-class_head(A) ::= docucomment(B) exposure_specifier(C) declaration_modifier_list(D) CLASS qualified_id(E)                              .  { A = S_start_class(state, B,    C,    D,    E,    NULL, NULL ); }
-class_head(A) ::=                exposure_specifier(C) declaration_modifier_list(D) CLASS qualified_id(E)                              .  { A = S_start_class(state, NULL, C,    D,    E,    NULL, NULL ); }
-class_head(A) ::= docucomment(B)                       declaration_modifier_list(D) CLASS qualified_id(E)                              .  { A = S_start_class(state, B,    NULL, D,    E,    NULL, NULL ); }
-class_head(A) ::=                                      declaration_modifier_list(D) CLASS qualified_id(E)                              .  { A = S_start_class(state, NULL, NULL, D,    E,    NULL, NULL ); }
-class_head(A) ::= docucomment(B) exposure_specifier(C)                              CLASS qualified_id(E)                              .  { A = S_start_class(state, B,    C,    NULL, E,    NULL, NULL ); }
-class_head(A) ::=                exposure_specifier(C)                              CLASS qualified_id(E)                              .  { A = S_start_class(state, NULL, C,    NULL, E,    NULL, NULL ); }
-class_head(A) ::= docucomment(B)                                                    CLASS qualified_id(E)                              .  { A = S_start_class(state, B,    NULL, NULL, E,    NULL, NULL ); }
-class_head(A) ::=                                                                   CLASS qualified_id(E)                              .  { A = S_start_class(state, NULL, NULL, NULL, E,    NULL, NULL ); }
+    CFCParser_set_class_nickname(state, NULL);
+}
+
+class_head(A) ::= docucomment(B) exposure_specifier(C) declaration_modifier_list(D) CLASS qualified_id(E) nickname(F) class_inheritance(G).  { A = S_start_class(state, B,    C,    D,    E,    F,    G   ); }
+class_head(A) ::=                exposure_specifier(C) declaration_modifier_list(D) CLASS qualified_id(E) nickname(F) class_inheritance(G).  { A = S_start_class(state, NULL, C,    D,    E,    F,    G   ); }
+class_head(A) ::= docucomment(B)                       declaration_modifier_list(D) CLASS qualified_id(E) nickname(F) class_inheritance(G).  { A = S_start_class(state, B,    NULL, D,    E,    F,    G   ); }
+class_head(A) ::=                                      declaration_modifier_list(D) CLASS qualified_id(E) nickname(F) class_inheritance(G).  { A = S_start_class(state, NULL, NULL, D,    E,    F,    G   ); }
+class_head(A) ::= docucomment(B) exposure_specifier(C)                              CLASS qualified_id(E) nickname(F) class_inheritance(G).  { A = S_start_class(state, B,    C,    NULL, E,    F,    G   ); }
+class_head(A) ::=                exposure_specifier(C)                              CLASS qualified_id(E) nickname(F) class_inheritance(G).  { A = S_start_class(state, NULL, C,    NULL, E,    F,    G   ); }
+class_head(A) ::= docucomment(B)                                                    CLASS qualified_id(E) nickname(F) class_inheritance(G).  { A = S_start_class(state, B,    NULL, NULL, E,    F,    G   ); }
+class_head(A) ::=                                                                   CLASS qualified_id(E) nickname(F) class_inheritance(G).  { A = S_start_class(state, NULL, NULL, NULL, E,    F,    G   ); }
+class_head(A) ::= docucomment(B) exposure_specifier(C) declaration_modifier_list(D) CLASS qualified_id(E)             class_inheritance(G).  { A = S_start_class(state, B,    C,    D,    E,    NULL, G   ); }
+class_head(A) ::=                exposure_specifier(C) declaration_modifier_list(D) CLASS qualified_id(E)             class_inheritance(G).  { A = S_start_class(state, NULL, C,    D,    E,    NULL, G   ); }
+class_head(A) ::= docucomment(B)                       declaration_modifier_list(D) CLASS qualified_id(E)             class_inheritance(G).  { A = S_start_class(state, B,    NULL, D,    E,    NULL, G   ); }
+class_head(A) ::=                                      declaration_modifier_list(D) CLASS qualified_id(E)             class_inheritance(G).  { A = S_start_class(state, NULL, NULL, D,    E,    NULL, G   ); }
+class_head(A) ::= docucomment(B) exposure_specifier(C)                              CLASS qualified_id(E)             class_inheritance(G).  { A = S_start_class(state, B,    C,    NULL, E,    NULL, G   ); }
+class_head(A) ::=                exposure_specifier(C)                              CLASS qualified_id(E)             class_inheritance(G).  { A = S_start_class(state, NULL, C,    NULL, E,    NULL, G   ); }
+class_head(A) ::= docucomment(B)                                                    CLASS qualified_id(E)             class_inheritance(G).  { A = S_start_class(state, B,    NULL, NULL, E,    NULL, G   ); }
+class_head(A) ::=                                                                   CLASS qualified_id(E)             class_inheritance(G).  { A = S_start_class(state, NULL, NULL, NULL, E,    NULL, G   ); }
+class_head(A) ::= docucomment(B) exposure_specifier(C) declaration_modifier_list(D) CLASS qualified_id(E) nickname(F)                     .  { A = S_start_class(state, B,    C,    D,    E,    F,    NULL ); }
+class_head(A) ::=                exposure_specifier(C) declaration_modifier_list(D) CLASS qualified_id(E) nickname(F)                     .  { A = S_start_class(state, NULL, C,    D,    E,    F,    NULL ); }
+class_head(A) ::= docucomment(B)                       declaration_modifier_list(D) CLASS qualified_id(E) nickname(F)                     .  { A = S_start_class(state, B,    NULL, D,    E,    F,    NULL ); }
+class_head(A) ::=                                      declaration_modifier_list(D) CLASS qualified_id(E) nickname(F)                     .  { A = S_start_class(state, NULL, NULL, D,    E,    F,    NULL ); }
+class_head(A) ::= docucomment(B) exposure_specifier(C)                              CLASS qualified_id(E) nickname(F)                     .  { A = S_start_class(state, B,    C,    NULL, E,    F,    NULL ); }
+class_head(A) ::=                exposure_specifier(C)                              CLASS qualified_id(E) nickname(F)                     .  { A = S_start_class(state, NULL, C,    NULL, E,    F,    NULL ); }
+class_head(A) ::= docucomment(B)                                                    CLASS qualified_id(E) nickname(F)                     .  { A = S_start_class(state, B,    NULL, NULL, E,    F,    NULL ); }
+class_head(A) ::=                                                                   CLASS qualified_id(E) nickname(F)                     .  { A = S_start_class(state, NULL, NULL, NULL, E,    F,    NULL ); }
+class_head(A) ::= docucomment(B) exposure_specifier(C) declaration_modifier_list(D) CLASS qualified_id(E)                                 .  { A = S_start_class(state, B,    C,    D,    E,    NULL, NULL ); }
+class_head(A) ::=                exposure_specifier(C) declaration_modifier_list(D) CLASS qualified_id(E)                                 .  { A = S_start_class(state, NULL, C,    D,    E,    NULL, NULL ); }
+class_head(A) ::= docucomment(B)                       declaration_modifier_list(D) CLASS qualified_id(E)                                 .  { A = S_start_class(state, B,    NULL, D,    E,    NULL, NULL ); }
+class_head(A) ::=                                      declaration_modifier_list(D) CLASS qualified_id(E)                                 .  { A = S_start_class(state, NULL, NULL, D,    E,    NULL, NULL ); }
+class_head(A) ::= docucomment(B) exposure_specifier(C)                              CLASS qualified_id(E)                                 .  { A = S_start_class(state, B,    C,    NULL, E,    NULL, NULL ); }
+class_head(A) ::=                exposure_specifier(C)                              CLASS qualified_id(E)                                 .  { A = S_start_class(state, NULL, C,    NULL, E,    NULL, NULL ); }
+class_head(A) ::= docucomment(B)                                                    CLASS qualified_id(E)                                 .  { A = S_start_class(state, B,    NULL, NULL, E,    NULL, NULL ); }
+class_head(A) ::=                                                                   CLASS qualified_id(E)                                 .  { A = S_start_class(state, NULL, NULL, NULL, E,    NULL, NULL ); }
 
 class_defs(A) ::= class_head(B) LEFT_CURLY_BRACE.
 {
@@ -636,7 +636,7 @@ qualified_id(A) ::= qualified_id(B) SCOPE_OP IDENTIFIER(C).
 
 docucomment(A)       ::= DOCUCOMMENT(B).                     { A = CFCDocuComment_parse(B); }
 class_inheritance(A) ::= INHERITS qualified_id(B).           { A = B; }
-cnick(A)             ::= CNICK IDENTIFIER(B).                { A = B; }
+nickname(A)          ::= NICKNAME IDENTIFIER(B).             { A = B; }
 cblock(A)            ::= CBLOCK_START blob(B) CBLOCK_CLOSE.  { A = CFCCBlock_new(B); }
 cblock(A)            ::= CBLOCK_START CBLOCK_CLOSE.          { A = CFCCBlock_new(""); }
 

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/d0486854/compiler/src/CFCParser.c
----------------------------------------------------------------------
diff --git a/compiler/src/CFCParser.c b/compiler/src/CFCParser.c
index 9cb9d6a..4ce3f28 100644
--- a/compiler/src/CFCParser.c
+++ b/compiler/src/CFCParser.c
@@ -40,7 +40,7 @@ struct CFCParser {
     int errors;
     int lineno;
     char *class_name;
-    char *class_cnick;
+    char *class_nickname;
     CFCFileSpec *file_spec;
     CFCMemPool *pool;
     CFCParcel  *parcel;
@@ -64,14 +64,14 @@ CFCParser_init(CFCParser *self) {
     if (self->header_parser == NULL) {
         CFCUtil_die("Failed to allocate header parser");
     }
-    self->result       = NULL;
-    self->errors       = false;
-    self->lineno       = 0;
-    self->class_name   = NULL;
-    self->class_cnick  = NULL;
-    self->file_spec    = NULL;
-    self->pool         = NULL;
-    self->parcel       = NULL;
+    self->result         = NULL;
+    self->errors         = false;
+    self->lineno         = 0;
+    self->class_name     = NULL;
+    self->class_nickname = NULL;
+    self->file_spec      = NULL;
+    self->pool           = NULL;
+    self->parcel         = NULL;
     return self;
 }
 
@@ -79,7 +79,7 @@ void
 CFCParser_destroy(CFCParser *self) {
     CFCParseHeaderFree(self->header_parser, free);
     FREEMEM(self->class_name);
-    FREEMEM(self->class_cnick);
+    FREEMEM(self->class_nickname);
     CFCBase_decref((CFCBase*)self->file_spec);
     CFCBase_decref((CFCBase*)self->pool);
     CFCBase_decref(self->result);
@@ -194,19 +194,19 @@ CFCParser_get_class_name(CFCParser *self) {
 }
 
 void
-CFCParser_set_class_cnick(CFCParser *self, const char *class_cnick) {
-    FREEMEM(self->class_cnick);
-    if (class_cnick) {
-        self->class_cnick = CFCUtil_strdup(class_cnick);
+CFCParser_set_class_nickname(CFCParser *self, const char *class_nickname) {
+    FREEMEM(self->class_nickname);
+    if (class_nickname) {
+        self->class_nickname = CFCUtil_strdup(class_nickname);
     }
     else {
-        self->class_cnick = NULL;
+        self->class_nickname = NULL;
     }
 }
 
 const char*
-CFCParser_get_class_cnick(CFCParser *self) {
-    return self->class_cnick;
+CFCParser_get_class_nickname(CFCParser *self) {
+    return self->class_nickname;
 }
 
 void

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/d0486854/compiler/src/CFCParser.h
----------------------------------------------------------------------
diff --git a/compiler/src/CFCParser.h b/compiler/src/CFCParser.h
index 8b250a3..51b0f44 100644
--- a/compiler/src/CFCParser.h
+++ b/compiler/src/CFCParser.h
@@ -89,10 +89,10 @@ const char*
 CFCParser_get_class_name(CFCParser *self);
 
 void
-CFCParser_set_class_cnick(CFCParser *self, const char *class_cnick);
+CFCParser_set_class_nickname(CFCParser *self, const char *class_nickname);
 
 const char*
-CFCParser_get_class_cnick(CFCParser *self);
+CFCParser_get_class_nickname(CFCParser *self);
 
 void
 CFCParser_set_file_spec(CFCParser *self, struct CFCFileSpec *file_spec);

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/d0486854/compiler/src/CFCSymbol.c
----------------------------------------------------------------------
diff --git a/compiler/src/CFCSymbol.c b/compiler/src/CFCSymbol.c
index 4d06677..20d06a3 100644
--- a/compiler/src/CFCSymbol.c
+++ b/compiler/src/CFCSymbol.c
@@ -35,10 +35,10 @@ static const CFCMeta CFCSYMBOL_META = {
 
 CFCSymbol*
 CFCSymbol_new(struct CFCParcel *parcel, const char *exposure,
-              const char *class_name, const char *class_cnick,
+              const char *class_name, const char *class_nickname,
               const char *micro_sym) {
     CFCSymbol *self = (CFCSymbol*)CFCBase_allocate(&CFCSYMBOL_META);
-    return CFCSymbol_init(self, parcel, exposure, class_name, class_cnick,
+    return CFCSymbol_init(self, parcel, exposure, class_name, class_nickname,
                           micro_sym);
 }
 
@@ -94,19 +94,19 @@ CFCSymbol_validate_class_name_component(const char *name) {
 }
 
 static int
-S_validate_class_cnick(const char *class_cnick) {
+S_validate_class_nickname(const char *class_nickname) {
     // Allow all caps.
     const char *ptr;
-    for (ptr = class_cnick; ; ptr++) {
+    for (ptr = class_nickname; ; ptr++) {
         if (*ptr == 0) {
-            if (strlen(class_cnick)) { return true; }
+            if (strlen(class_nickname)) { return true; }
             else { break; }
         }
         else if (!isupper(*ptr)) { break; }
     }
 
     // Same as one component of a class name.
-    return CFCSymbol_validate_class_name_component(class_cnick);
+    return CFCSymbol_validate_class_name_component(class_nickname);
 }
 
 static int
@@ -122,7 +122,7 @@ S_validate_identifier(const char *identifier) {
 CFCSymbol*
 CFCSymbol_init(CFCSymbol *self, struct CFCParcel *parcel,
                const char *exposure, const char *class_name,
-               const char *class_cnick, const char *micro_sym) {
+               const char *class_nickname, const char *micro_sym) {
     // Validate.
     CFCUTIL_NULL_CHECK(parcel);
     if (!S_validate_exposure(exposure)) {
@@ -138,40 +138,40 @@ CFCSymbol_init(CFCSymbol *self, struct CFCParcel *parcel,
         CFCUtil_die("Invalid micro_sym: '%s'",  micro_sym ? micro_sym : "[NULL]");
     }
 
-    // Derive class_cnick if necessary, then validate.
-    const char *real_cnick = NULL;
+    // Derive class_nickname if necessary, then validate.
+    const char *real_nickname = NULL;
     if (class_name) {
-        if (class_cnick) {
-            real_cnick = class_cnick;
+        if (class_nickname) {
+            real_nickname = class_nickname;
         }
         else {
             const char *last_colon = strrchr(class_name, ':');
-            real_cnick = last_colon ? last_colon + 1 : class_name;
+            real_nickname = last_colon ? last_colon + 1 : class_name;
         }
     }
-    else if (class_cnick) {
-        // Sanity check class_cnick without class_name.
+    else if (class_nickname) {
+        // Sanity check class_nickname without class_name.
         CFCBase_decref((CFCBase*)self);
-        CFCUtil_die("Can't supply class_cnick without class_name");
+        CFCUtil_die("Can't supply class_nickname without class_name");
     }
     else {
-        real_cnick = NULL;
+        real_nickname = NULL;
     }
-    if (real_cnick && !S_validate_class_cnick(real_cnick)) {
+    if (real_nickname && !S_validate_class_nickname(real_nickname)) {
         CFCBase_decref((CFCBase*)self);
-        CFCUtil_die("Invalid class_cnick: '%s'", real_cnick);
+        CFCUtil_die("Invalid class_nickname: '%s'", real_nickname);
     }
 
     // Assign.
-    self->parcel      = (CFCParcel*)CFCBase_incref((CFCBase*)parcel);
-    self->exposure    = CFCUtil_strdup(exposure);
-    self->class_name  = CFCUtil_strdup(class_name);
-    self->class_cnick = CFCUtil_strdup(real_cnick);
-    self->micro_sym   = CFCUtil_strdup(micro_sym);
+    self->parcel         = (CFCParcel*)CFCBase_incref((CFCBase*)parcel);
+    self->exposure       = CFCUtil_strdup(exposure);
+    self->class_name     = CFCUtil_strdup(class_name);
+    self->class_nickname = CFCUtil_strdup(real_nickname);
+    self->micro_sym      = CFCUtil_strdup(micro_sym);
 
     // Derive short_sym and full_sym.
-    char *cnick = self->class_cnick ? self->class_cnick : "";
-    self->short_sym = CFCUtil_sprintf("%s_%s", cnick, micro_sym);
+    char *nickname = self->class_nickname ? self->class_nickname : "";
+    self->short_sym = CFCUtil_sprintf("%s_%s", nickname, micro_sym);
     self->full_sym
         = CFCUtil_sprintf("%s%s", CFCParcel_get_prefix(self->parcel),
                           self->short_sym);
@@ -184,7 +184,7 @@ CFCSymbol_destroy(CFCSymbol *self) {
     CFCBase_decref((CFCBase*)self->parcel);
     FREEMEM(self->exposure);
     FREEMEM(self->class_name);
-    FREEMEM(self->class_cnick);
+    FREEMEM(self->class_nickname);
     FREEMEM(self->micro_sym);
     FREEMEM(self->short_sym);
     FREEMEM(self->full_sym);
@@ -249,8 +249,8 @@ CFCSymbol_get_class_name(CFCSymbol *self) {
 }
 
 const char*
-CFCSymbol_get_class_cnick(CFCSymbol *self) {
-    return self->class_cnick;
+CFCSymbol_get_class_nickname(CFCSymbol *self) {
+    return self->class_nickname;
 }
 
 const char*

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/d0486854/compiler/src/CFCSymbol.h
----------------------------------------------------------------------
diff --git a/compiler/src/CFCSymbol.h b/compiler/src/CFCSymbol.h
index d91bb52..2fecf48 100644
--- a/compiler/src/CFCSymbol.h
+++ b/compiler/src/CFCSymbol.h
@@ -39,7 +39,7 @@ struct CFCSymbol {
     struct CFCParcel *parcel;
     char *exposure;
     char *class_name;
-    char *class_cnick;
+    char *class_nickname;
     char *micro_sym;
     char *short_sym;
     char *full_sym;
@@ -61,18 +61,19 @@ CFCSymbol_validate_class_name_component(const char *name);
  * components separated by "::".  Each component must start with a capital
  * letter, contain at least one lower-case letter, and consist entirely of the
  * characters [A-Za-z0-9].
- * @param class_cnick The C nickname associated with the supplied class
+ * @param class_nickname The C nickname associated with the supplied class
  * name.  If not supplied, will be derived if possible from C<class_name> by
  * extracting the last class name component.
  * @param micro_sym The local identifier for the symbol.
  */
 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_nickname,
+              const char *micro_sym);
 
 CFCSymbol*
 CFCSymbol_init(CFCSymbol *self, struct CFCParcel *parcel, const char *exposure,
-               const char *class_name, const char *class_cnick,
+               const char *class_name, const char *class_nickname,
                const char *micro_sym);
 
 void
@@ -92,7 +93,7 @@ CFCSymbol_get_class_name(CFCSymbol *self);
 
 // May be NULL.
 const char*
-CFCSymbol_get_class_cnick(CFCSymbol *self);
+CFCSymbol_get_class_nickname(CFCSymbol *self);
 
 const char*
 CFCSymbol_get_exposure(CFCSymbol *self);

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/d0486854/compiler/src/CFCTestClass.c
----------------------------------------------------------------------
diff --git a/compiler/src/CFCTestClass.c b/compiler/src/CFCTestClass.c
index 40c26f1..c8184ee 100644
--- a/compiler/src/CFCTestClass.c
+++ b/compiler/src/CFCTestClass.c
@@ -233,7 +233,7 @@ S_run_tests(CFCTest *test) {
 
     {
         const char *class_src =
-            "public class Foo::Foodie cnick Foodie inherits Foo {\n"
+            "public class Foo::Foodie nickname Foodie inherits Foo {\n"
             "    int num;\n"
             "}\n";
         CFCClass *klass = CFCTest_parse_class(test, parser, class_src);
@@ -306,7 +306,7 @@ S_run_tests(CFCTest *test) {
 
     {
         const char *class_src =
-            "inert class Rigor::Mortis cnick Mort {\n"
+            "inert class Rigor::Mortis nickname Mort {\n"
             "    inert void lie_still();\n"
             "}\n";
         CFCClass *klass = CFCTest_parse_class(test, parser, class_src);

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/d0486854/compiler/src/CFCTestFunction.c
----------------------------------------------------------------------
diff --git a/compiler/src/CFCTestFunction.c b/compiler/src/CFCTestFunction.c
index 4cd6967..a2b4d6d 100644
--- a/compiler/src/CFCTestFunction.c
+++ b/compiler/src/CFCTestFunction.c
@@ -55,7 +55,7 @@ S_run_tests(CFCTest *test) {
 
     {
         CFCParser_set_class_name(parser, "Neato::Obj");
-        CFCParser_set_class_cnick(parser, "Obj");
+        CFCParser_set_class_nickname(parser, "Obj");
         static const char *func_strings[2] = {
             "inert int running_count(int biscuit);",
             "public inert Hash* init_fave_hash(int32_t num_buckets,"

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/d0486854/compiler/src/CFCTestMethod.c
----------------------------------------------------------------------
diff --git a/compiler/src/CFCTestMethod.c b/compiler/src/CFCTestMethod.c
index b2eca23..5cf0df2 100644
--- a/compiler/src/CFCTestMethod.c
+++ b/compiler/src/CFCTestMethod.c
@@ -180,7 +180,7 @@ S_run_parser_tests(CFCTest *test) {
     CFCParcel *neato_parcel
         = CFCTest_parse_parcel(test, parser, "parcel Neato;");
     CFCParser_set_class_name(parser, "Neato::Obj");
-    CFCParser_set_class_cnick(parser, "Obj");
+    CFCParser_set_class_nickname(parser, "Obj");
 
     {
         static const char *method_strings[4] = {

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/d0486854/compiler/src/CFCTestParser.c
----------------------------------------------------------------------
diff --git a/compiler/src/CFCTestParser.c b/compiler/src/CFCTestParser.c
index f377baa..9a0ccae 100644
--- a/compiler/src/CFCTestParser.c
+++ b/compiler/src/CFCTestParser.c
@@ -262,7 +262,7 @@ S_run_tests(CFCTest *test) {
 
     {
         CFCParser_set_class_name(parser, "Stuff::Obj");
-        CFCParser_set_class_cnick(parser, "Obj");
+        CFCParser_set_class_nickname(parser, "Obj");
 
         const char *method_string =
             "public Foo* Spew_Foo(Obj *self, uint32_t *how_many);";
@@ -293,14 +293,16 @@ S_run_tests(CFCTest *test) {
     }
 
     {
-        static const char *const cnicks[2] =  { "Food", "FF" };
+        static const char *const nicknames[2] =  { "Food", "FF" };
         for (int i = 0; i < 2; ++i) {
-            const char *cnick = cnicks[i];
+            const char *nickname = nicknames[i];
             char *class_string
-                = CFCUtil_sprintf("class Foodie%s cnick %s { }", cnick, cnick);
+                = CFCUtil_sprintf("class Foodie%s nickname %s { }", nickname,
+                                  nickname);
             CFCClass *klass
                 = CFCTest_parse_class(test, parser, class_string);
-            STR_EQ(test, CFCClass_get_cnick(klass), cnick, "cnick: %s", cnick);
+            STR_EQ(test, CFCClass_get_nickname(klass), nickname,
+                   "nickname: %s", nickname);
             FREEMEM(class_string);
             CFCBase_decref((CFCBase*)klass);
         }

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/d0486854/compiler/src/CFCTestSymbol.c
----------------------------------------------------------------------
diff --git a/compiler/src/CFCTestSymbol.c b/compiler/src/CFCTestSymbol.c
index 77659d8..2fff530 100644
--- a/compiler/src/CFCTestSymbol.c
+++ b/compiler/src/CFCTestSymbol.c
@@ -74,9 +74,9 @@ S_run_tests(CFCTest *test) {
         OK(test, !equal, "different class_name spoils equals");
         const char *foo_jr_name = CFCSymbol_get_class_name(foo_jr);
         STR_EQ(test, foo_jr_name, "Foo::FooJr", "get_class_name");
-        const char *foo_jr_cnick = CFCSymbol_get_class_cnick(foo_jr);
-        STR_EQ(test, foo_jr_cnick, "FooJr",
-               "derive class_cnick from class_name");
+        const char *foo_jr_nickname = CFCSymbol_get_class_nickname(foo_jr);
+        STR_EQ(test, foo_jr_nickname, "FooJr",
+               "derive class_nickname from class_name");
 
         CFCBase_decref((CFCBase*)foo);
         CFCBase_decref((CFCBase*)foo_jr);

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/d0486854/compiler/src/CFCVariable.c
----------------------------------------------------------------------
diff --git a/compiler/src/CFCVariable.c b/compiler/src/CFCVariable.c
index 3443933..61cd087 100644
--- a/compiler/src/CFCVariable.c
+++ b/compiler/src/CFCVariable.c
@@ -49,17 +49,17 @@ S_generate_c_strings(CFCVariable *self);
 
 CFCVariable*
 CFCVariable_new(struct CFCParcel *parcel, const char *exposure,
-                const char *class_name, const char *class_cnick,
+                const char *class_name, const char *class_nickname,
                 const char *micro_sym, struct CFCType *type, int inert) {
     CFCVariable *self = (CFCVariable*)CFCBase_allocate(&CFCVARIABLE_META);
-    return CFCVariable_init(self, parcel, exposure, class_name, class_cnick,
+    return CFCVariable_init(self, parcel, exposure, class_name, class_nickname,
                             micro_sym, type, inert);
 }
 
 CFCVariable*
 CFCVariable_init(CFCVariable *self, struct CFCParcel *parcel,
                  const char *exposure, const char *class_name,
-                 const char *class_cnick, const char *micro_sym,
+                 const char *class_nickname, const char *micro_sym,
                  struct CFCType *type, int inert) {
     // Validate params.
     CFCUTIL_NULL_CHECK(type);
@@ -68,7 +68,7 @@ CFCVariable_init(CFCVariable *self, struct CFCParcel *parcel,
     const char *real_exposure = exposure ? exposure : "local";
 
     CFCSymbol_init((CFCSymbol*)self, parcel, real_exposure, class_name,
-                   class_cnick, micro_sym);
+                   class_nickname, micro_sym);
 
     // Assign type, inert.
     self->type = (CFCType*)CFCBase_incref((CFCBase*)type);

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/d0486854/compiler/src/CFCVariable.h
----------------------------------------------------------------------
diff --git a/compiler/src/CFCVariable.h b/compiler/src/CFCVariable.h
index c67d3c6..a7c0c23 100644
--- a/compiler/src/CFCVariable.h
+++ b/compiler/src/CFCVariable.h
@@ -43,17 +43,17 @@ struct CFCType;
  * @param micro_sym The variable's name, without any namespacing prefixes.
  * @param exposure See Clownfish::CFC::Model::Symbol.
  * @param class_name See Clownfish::CFC::Model::Symbol.
- * @param class_cnick See Clownfish::CFC::Model::Symbol.
+ * @param class_nickname See Clownfish::CFC::Model::Symbol.
  */
 CFCVariable*
 CFCVariable_new(struct CFCParcel *parcel, const char *exposure,
-                const char *class_name, const char *class_cnick,
+                const char *class_name, const char *class_nickname,
                 const char *micro_sym, struct CFCType *type, int inert);
 
 CFCVariable*
 CFCVariable_init(CFCVariable *self, struct CFCParcel *parcel,
                  const char *exposure, const char *class_name,
-                 const char *class_cnick, const char *micro_sym,
+                 const char *class_nickname, const char *micro_sym,
                  struct CFCType *type, int inert);
 
 void

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/d0486854/runtime/core/Clownfish/ByteBuf.cfh
----------------------------------------------------------------------
diff --git a/runtime/core/Clownfish/ByteBuf.cfh b/runtime/core/Clownfish/ByteBuf.cfh
index 60b258c..065b1d7 100644
--- a/runtime/core/Clownfish/ByteBuf.cfh
+++ b/runtime/core/Clownfish/ByteBuf.cfh
@@ -20,7 +20,7 @@ parcel Clownfish;
  * Growable buffer holding arbitrary bytes.
  */
 
-class Clownfish::ByteBuf cnick BB inherits Clownfish::Obj {
+class Clownfish::ByteBuf nickname BB inherits Clownfish::Obj {
 
     char    *buf;
     size_t   size;  /* number of valid bytes */
@@ -130,7 +130,7 @@ class Clownfish::ByteBuf cnick BB inherits Clownfish::Obj {
 /**
  * A ByteBuf that doesn't own its own string.
  */
-class Clownfish::ViewByteBuf cnick ViewBB
+class Clownfish::ViewByteBuf nickname ViewBB
     inherits Clownfish::ByteBuf {
 
     /** Return a pointer to a new "view" ByteBuf, offing a persective on the

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/d0486854/runtime/core/Clownfish/CharBuf.cfh
----------------------------------------------------------------------
diff --git a/runtime/core/Clownfish/CharBuf.cfh b/runtime/core/Clownfish/CharBuf.cfh
index 77a6e32..c3c3272 100644
--- a/runtime/core/Clownfish/CharBuf.cfh
+++ b/runtime/core/Clownfish/CharBuf.cfh
@@ -20,7 +20,7 @@ parcel Clownfish;
  * Growable buffer holding Unicode characters.
  */
 
-class Clownfish::CharBuf cnick CB
+class Clownfish::CharBuf nickname CB
     inherits Clownfish::Obj {
 
     char    *ptr;

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/d0486854/runtime/core/Clownfish/LockFreeRegistry.cfh
----------------------------------------------------------------------
diff --git a/runtime/core/Clownfish/LockFreeRegistry.cfh b/runtime/core/Clownfish/LockFreeRegistry.cfh
index 2a3d62a..319935f 100644
--- a/runtime/core/Clownfish/LockFreeRegistry.cfh
+++ b/runtime/core/Clownfish/LockFreeRegistry.cfh
@@ -18,7 +18,7 @@ parcel Clownfish;
 
 /** Specialized lock free hash table for storing VTables.
  */
-class Clownfish::LockFreeRegistry cnick LFReg inherits Clownfish::Obj {
+class Clownfish::LockFreeRegistry nickname LFReg inherits Clownfish::Obj {
 
     size_t  capacity;
     void   *entries;

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/d0486854/runtime/core/Clownfish/Num.cfh
----------------------------------------------------------------------
diff --git a/runtime/core/Clownfish/Num.cfh b/runtime/core/Clownfish/Num.cfh
index 56983ce..cd2780b 100644
--- a/runtime/core/Clownfish/Num.cfh
+++ b/runtime/core/Clownfish/Num.cfh
@@ -132,7 +132,7 @@ class Clownfish::Float64 inherits Clownfish::FloatNum {
 
 /** 32-bit signed integer.
  */
-class Clownfish::Integer32 cnick Int32
+class Clownfish::Integer32 nickname Int32
     inherits Clownfish::IntNum {
 
     int32_t value;
@@ -171,7 +171,7 @@ class Clownfish::Integer32 cnick Int32
 /**
  * 64-bit signed integer.
  */
-class Clownfish::Integer64 cnick Int64
+class Clownfish::Integer64 nickname Int64
     inherits Clownfish::IntNum {
 
     int64_t value;
@@ -217,7 +217,7 @@ class Clownfish::Integer64 cnick Int64
  * There are only two singleton instances of this class: CFISH_TRUE and
  * CFISH_FALSE.
  */
-class Clownfish::BoolNum cnick Bool inherits Clownfish::IntNum {
+class Clownfish::BoolNum nickname Bool inherits Clownfish::IntNum {
     bool value;
     String *string;
 

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/d0486854/runtime/core/Clownfish/String.cfh
----------------------------------------------------------------------
diff --git a/runtime/core/Clownfish/String.cfh b/runtime/core/Clownfish/String.cfh
index 8a065cb..a053e99 100644
--- a/runtime/core/Clownfish/String.cfh
+++ b/runtime/core/Clownfish/String.cfh
@@ -20,7 +20,7 @@ parcel Clownfish;
  * Immutable string holding Unicode characters.
  */
 
-class Clownfish::String cnick Str
+class Clownfish::String nickname Str
     inherits Clownfish::Obj {
 
     const char *ptr;
@@ -280,7 +280,7 @@ class Clownfish::String cnick Str
     StackTail(String *self, void *allocation);
 }
 
-class Clownfish::StackString cnick SStr
+class Clownfish::StackString nickname SStr
     inherits Clownfish::String {
 
     /**
@@ -309,7 +309,7 @@ class Clownfish::StackString cnick SStr
     Destroy(StackString *self);
 }
 
-class Clownfish::StringIterator cnick StrIter
+class Clownfish::StringIterator nickname StrIter
     inherits Clownfish::Obj {
 
     String *string;
@@ -415,7 +415,7 @@ class Clownfish::StringIterator cnick StrIter
     Destroy(StringIterator *self);
 }
 
-class Clownfish::StackStringIterator cnick SStrIter
+class Clownfish::StackStringIterator nickname SStrIter
     inherits Clownfish::StringIterator {
 
     inert incremented StackStringIterator*

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/d0486854/runtime/core/Clownfish/Test/TestByteBuf.cfh
----------------------------------------------------------------------
diff --git a/runtime/core/Clownfish/Test/TestByteBuf.cfh b/runtime/core/Clownfish/Test/TestByteBuf.cfh
index 3335c95..d27e715 100644
--- a/runtime/core/Clownfish/Test/TestByteBuf.cfh
+++ b/runtime/core/Clownfish/Test/TestByteBuf.cfh
@@ -16,7 +16,7 @@
 
 parcel TestClownfish;
 
-class Clownfish::Test::TestByteBuf cnick TestBB
+class Clownfish::Test::TestByteBuf nickname TestBB
     inherits Clownfish::TestHarness::TestBatch {
 
     inert incremented TestByteBuf*

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/d0486854/runtime/core/Clownfish/Test/TestCharBuf.cfh
----------------------------------------------------------------------
diff --git a/runtime/core/Clownfish/Test/TestCharBuf.cfh b/runtime/core/Clownfish/Test/TestCharBuf.cfh
index 3cc5d43..d568c14 100644
--- a/runtime/core/Clownfish/Test/TestCharBuf.cfh
+++ b/runtime/core/Clownfish/Test/TestCharBuf.cfh
@@ -16,7 +16,7 @@
 
 parcel TestClownfish;
 
-class Clownfish::Test::TestCharBuf cnick TestCB
+class Clownfish::Test::TestCharBuf nickname TestCB
     inherits Clownfish::TestHarness::TestBatch {
 
     inert incremented TestCharBuf*

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/d0486854/runtime/core/Clownfish/Test/TestLockFreeRegistry.cfh
----------------------------------------------------------------------
diff --git a/runtime/core/Clownfish/Test/TestLockFreeRegistry.cfh b/runtime/core/Clownfish/Test/TestLockFreeRegistry.cfh
index 80db8af..4f8ae86 100644
--- a/runtime/core/Clownfish/Test/TestLockFreeRegistry.cfh
+++ b/runtime/core/Clownfish/Test/TestLockFreeRegistry.cfh
@@ -16,7 +16,7 @@
 
 parcel TestClownfish;
 
-class Clownfish::Test::TestLockFreeRegistry cnick TestLFReg
+class Clownfish::Test::TestLockFreeRegistry nickname TestLFReg
     inherits Clownfish::TestHarness::TestBatch {
 
     inert incremented TestLockFreeRegistry*

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/d0486854/runtime/core/Clownfish/Test/TestString.cfh
----------------------------------------------------------------------
diff --git a/runtime/core/Clownfish/Test/TestString.cfh b/runtime/core/Clownfish/Test/TestString.cfh
index aaf1289..479df19 100644
--- a/runtime/core/Clownfish/Test/TestString.cfh
+++ b/runtime/core/Clownfish/Test/TestString.cfh
@@ -16,7 +16,7 @@
 
 parcel TestClownfish;
 
-class Clownfish::Test::TestString cnick TestStr
+class Clownfish::Test::TestString nickname TestStr
     inherits Clownfish::TestHarness::TestBatch {
 
     inert incremented TestString*

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/d0486854/runtime/core/Clownfish/Test/Util/TestNumberUtils.cfh
----------------------------------------------------------------------
diff --git a/runtime/core/Clownfish/Test/Util/TestNumberUtils.cfh b/runtime/core/Clownfish/Test/Util/TestNumberUtils.cfh
index cd9e165..e50d81f 100644
--- a/runtime/core/Clownfish/Test/Util/TestNumberUtils.cfh
+++ b/runtime/core/Clownfish/Test/Util/TestNumberUtils.cfh
@@ -16,7 +16,7 @@
 
 parcel TestClownfish;
 
-class Clownfish::Test::Util::TestNumberUtils cnick TestNumUtil
+class Clownfish::Test::Util::TestNumberUtils nickname TestNumUtil
     inherits Clownfish::TestHarness::TestBatch {
 
     inert incremented TestNumberUtils*

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/d0486854/runtime/core/Clownfish/Test/Util/TestStringHelper.cfh
----------------------------------------------------------------------
diff --git a/runtime/core/Clownfish/Test/Util/TestStringHelper.cfh b/runtime/core/Clownfish/Test/Util/TestStringHelper.cfh
index 0f8351a..752c553 100644
--- a/runtime/core/Clownfish/Test/Util/TestStringHelper.cfh
+++ b/runtime/core/Clownfish/Test/Util/TestStringHelper.cfh
@@ -16,7 +16,7 @@
 
 parcel TestClownfish;
 
-class Clownfish::Test::Util::TestStringHelper cnick TestStrHelp
+class Clownfish::Test::Util::TestStringHelper nickname TestStrHelp
     inherits Clownfish::TestHarness::TestBatch {
 
     inert incremented TestStringHelper*

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/d0486854/runtime/core/Clownfish/Util/NumberUtils.cfh
----------------------------------------------------------------------
diff --git a/runtime/core/Clownfish/Util/NumberUtils.cfh b/runtime/core/Clownfish/Util/NumberUtils.cfh
index d6bb791..7589f94 100644
--- a/runtime/core/Clownfish/Util/NumberUtils.cfh
+++ b/runtime/core/Clownfish/Util/NumberUtils.cfh
@@ -21,7 +21,7 @@ parcel Clownfish;
  * Provide utilities for dealing with endian issues, sub-byte-width arrays,
  * compressed integers, and so on.
  */
-inert class Clownfish::Util::NumberUtils cnick NumUtil {
+inert class Clownfish::Util::NumberUtils nickname NumUtil {
 
     inert const uint8_t[8] u1masks;
     inert const uint8_t[4] u2masks;

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/d0486854/runtime/core/Clownfish/Util/SortUtils.cfh
----------------------------------------------------------------------
diff --git a/runtime/core/Clownfish/Util/SortUtils.cfh b/runtime/core/Clownfish/Util/SortUtils.cfh
index a238163..f402f2d 100644
--- a/runtime/core/Clownfish/Util/SortUtils.cfh
+++ b/runtime/core/Clownfish/Util/SortUtils.cfh
@@ -29,7 +29,7 @@ __END_C__
  *
  * SortUtils also provides a quicksort with an additional context argument.
  */
-inert class Clownfish::Util::SortUtils cnick Sort {
+inert class Clownfish::Util::SortUtils nickname Sort {
 
     /** Perform a mergesort.  In addition to providing a contiguous array of
      * elements to be sorted and their count, the caller must also provide a

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/d0486854/runtime/core/Clownfish/Util/StringHelper.cfh
----------------------------------------------------------------------
diff --git a/runtime/core/Clownfish/Util/StringHelper.cfh b/runtime/core/Clownfish/Util/StringHelper.cfh
index 1cbb46a..52f5816 100644
--- a/runtime/core/Clownfish/Util/StringHelper.cfh
+++ b/runtime/core/Clownfish/Util/StringHelper.cfh
@@ -16,7 +16,7 @@
 
 parcel Clownfish;
 
-inert class Clownfish::Util::StringHelper cnick StrHelp {
+inert class Clownfish::Util::StringHelper nickname StrHelp {
 
     /* A table where the values indicate the number of bytes in a UTF-8
      * sequence implied by the leading utf8 byte.

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/d0486854/runtime/core/Clownfish/VArray.cfh
----------------------------------------------------------------------
diff --git a/runtime/core/Clownfish/VArray.cfh b/runtime/core/Clownfish/VArray.cfh
index 6776b57..b5cb20a 100644
--- a/runtime/core/Clownfish/VArray.cfh
+++ b/runtime/core/Clownfish/VArray.cfh
@@ -29,7 +29,7 @@ __END_C__
 
 /** Variable-sized array.
  */
-class Clownfish::VArray cnick VA inherits Clownfish::Obj {
+class Clownfish::VArray nickname VA inherits Clownfish::Obj {
 
     Obj      **elems;
     uint32_t   size;

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/d0486854/runtime/perl/lib/Clownfish.pod
----------------------------------------------------------------------
diff --git a/runtime/perl/lib/Clownfish.pod b/runtime/perl/lib/Clownfish.pod
index 60609c2..456ff59 100644
--- a/runtime/perl/lib/Clownfish.pod
+++ b/runtime/perl/lib/Clownfish.pod
@@ -188,7 +188,7 @@ following form:
     class-declaration = class-exposure-specifier?
                         class-modifier*
                         "class" class-name
-                        ("cnick" class-nickname)?
+                        ("nickname" class-nickname)?
                         ("inherits" class-name)?
                         "{" class-contents "}"
     class-exposure-specifier = "public"
@@ -215,7 +215,7 @@ Example of a class declaration:
 
     parcel Pathfinder;
 
-    public class Pathfinder::Graph::VisibilityGraph cnick VisGraph
+    public class Pathfinder::Graph::VisibilityGraph nickname VisGraph
         extends Clownfish::Obj {
         /* Variables and functions */
     }
@@ -340,7 +340,7 @@ final.
 
 Example:
 
-    public class Pathfinder::Graph::VisibilityGraph cnick VisGraph
+    public class Pathfinder::Graph::VisibilityGraph nickname VisGraph
         extends Clownfish::Obj {
 
         public inert incremented VisibilityGraph*
@@ -390,7 +390,7 @@ created for all subclasses whether they override a method or not.
 
 Example:
 
-    public class Pathfinder::Graph::VisibilityGraph cnick VisGraph
+    public class Pathfinder::Graph::VisibilityGraph nickname VisGraph
         extends Clownfish::Obj {
 
         public void


Mime
View raw message