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/10/19 05:39:23 UTC
[lucy-commits] svn commit: r1185954 - in
/incubator/lucy/branches/clownfish_lemon/clownfish/src: CFCLexHeader.l
CFCParseHeader.y CFCParser.c CFCParser.h
Author: marvin
Date: Wed Oct 19 03:39:22 2011
New Revision: 1185954
URL: http://svn.apache.org/viewvc?rev=1185954&view=rev
Log:
Merge CFCParserState into CFCParser.
Modified:
incubator/lucy/branches/clownfish_lemon/clownfish/src/CFCLexHeader.l
incubator/lucy/branches/clownfish_lemon/clownfish/src/CFCParseHeader.y
incubator/lucy/branches/clownfish_lemon/clownfish/src/CFCParser.c
incubator/lucy/branches/clownfish_lemon/clownfish/src/CFCParser.h
Modified: incubator/lucy/branches/clownfish_lemon/clownfish/src/CFCLexHeader.l
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/clownfish_lemon/clownfish/src/CFCLexHeader.l?rev=1185954&r1=1185953&r2=1185954&view=diff
==============================================================================
--- incubator/lucy/branches/clownfish_lemon/clownfish/src/CFCLexHeader.l (original)
+++ incubator/lucy/branches/clownfish_lemon/clownfish/src/CFCLexHeader.l Wed Oct 19 03:39:22 2011
@@ -20,7 +20,7 @@
void
CFCParseHeader(void *header_parser, int token_type, CFCBase *value,
- CFCParserState *state);
+ CFCParser *state);
/* Invoke Lemon-generated parser. */
#define PARSE(token_type) \
CFCParseHeader(CFCParser_current_parser, token_type, NULL, \
Modified: incubator/lucy/branches/clownfish_lemon/clownfish/src/CFCParseHeader.y
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/clownfish_lemon/clownfish/src/CFCParseHeader.y?rev=1185954&r1=1185953&r2=1185954&view=diff
==============================================================================
--- incubator/lucy/branches/clownfish_lemon/clownfish/src/CFCParseHeader.y (original)
+++ incubator/lucy/branches/clownfish_lemon/clownfish/src/CFCParseHeader.y Wed Oct 19 03:39:22 2011
@@ -20,7 +20,7 @@
%token_destructor { CFCBase_decref((CFCBase*)$$); }
%token_prefix CFC_TOKENTYPE_
-%extra_argument { CFCParserState *state }
+%extra_argument { CFCParser *state }
%include {
#include <stdio.h>
Modified: incubator/lucy/branches/clownfish_lemon/clownfish/src/CFCParser.c
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/clownfish_lemon/clownfish/src/CFCParser.c?rev=1185954&r1=1185953&r2=1185954&view=diff
==============================================================================
--- incubator/lucy/branches/clownfish_lemon/clownfish/src/CFCParser.c (original)
+++ incubator/lucy/branches/clownfish_lemon/clownfish/src/CFCParser.c Wed Oct 19 03:39:22 2011
@@ -35,7 +35,7 @@ void*
CFCParseHeaderAlloc(void * (*allocate)(size_t));
void
CFCParseHeader(void *header_parser, int token_type, CFCBase *value,
- CFCParserState *state);
+ CFCParser *state);
void
CFCParseHeaderFree(void *header_parser, void(*freemem)(void*));
void
@@ -44,10 +44,6 @@ CFCParseHeaderTrace(FILE *trace, char *l
struct CFCParser {
CFCBase base;
void *header_parser;
-};
-
-struct CFCParserState
-{
struct CFCBase *result;
int errors;
char *text;
@@ -78,8 +74,8 @@ CFCParser_destroy(CFCParser *self) {
CFCBase_destroy((CFCBase*)self);
}
-static CFCParserState state;
-CFCParserState *CFCParser_current_state = &state;
+static CFCParser state;
+CFCParser *CFCParser_current_state = &state;
void *CFCParser_current_parser = NULL;
CFCParcel *CFCParser_current_parcel = NULL;
@@ -104,20 +100,20 @@ CFCParser_parse(CFCParser *self, const c
}
void
-CFCParser_set_result(CFCParserState *self, CFCBase *result)
+CFCParser_set_result(CFCParser *self, CFCBase *result)
{
CFCBase_decref(self->result);
self->result = CFCBase_incref(result);
}
void
-CFCParser_set_errors(CFCParserState *self, int errors)
+CFCParser_set_errors(CFCParser *self, int errors)
{
self->errors = errors;
}
void
-CFCParser_set_text(CFCParserState *self, const char *text, size_t len) {
+CFCParser_set_text(CFCParser *self, const char *text, size_t len) {
if (text) {
if (len >= self->cap) {
self->cap = len + 1;
@@ -134,7 +130,7 @@ CFCParser_set_text(CFCParserState *self,
}
const char*
-CFCParser_get_text(CFCParserState *self) {
+CFCParser_get_text(CFCParser *self) {
return self->text;
}
@@ -151,34 +147,34 @@ CFCParser_get_parcel(void) {
}
void
-CFCParser_set_class_name(CFCParserState *state, const char *class_name) {
- FREEMEM(state->class_name);
+CFCParser_set_class_name(CFCParser *self, const char *class_name) {
+ FREEMEM(self->class_name);
if (class_name) {
- state->class_name = CFCUtil_strdup(class_name);
+ self->class_name = CFCUtil_strdup(class_name);
}
else {
- state->class_name = NULL;
+ self->class_name = NULL;
}
}
const char*
-CFCParser_get_class_name(CFCParserState *state) {
- return state->class_name;
+CFCParser_get_class_name(CFCParser *self) {
+ return self->class_name;
}
void
-CFCParser_set_class_cnick(CFCParserState *state, const char *class_cnick) {
- FREEMEM(state->class_cnick);
+CFCParser_set_class_cnick(CFCParser *self, const char *class_cnick) {
+ FREEMEM(self->class_cnick);
if (class_cnick) {
- state->class_cnick = CFCUtil_strdup(class_cnick);
+ self->class_cnick = CFCUtil_strdup(class_cnick);
}
else {
- state->class_cnick = NULL;
+ self->class_cnick = NULL;
}
}
const char*
-CFCParser_get_class_cnick(CFCParserState *state) {
- return state->class_cnick;
+CFCParser_get_class_cnick(CFCParser *self) {
+ return self->class_cnick;
}
Modified: incubator/lucy/branches/clownfish_lemon/clownfish/src/CFCParser.h
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/clownfish_lemon/clownfish/src/CFCParser.h?rev=1185954&r1=1185953&r2=1185954&view=diff
==============================================================================
--- incubator/lucy/branches/clownfish_lemon/clownfish/src/CFCParser.h (original)
+++ incubator/lucy/branches/clownfish_lemon/clownfish/src/CFCParser.h Wed Oct 19 03:39:22 2011
@@ -25,10 +25,8 @@ typedef struct CFCParser CFCParser;
struct CFCBase;
struct CFCParcel;
-typedef struct CFCParserState CFCParserState;
-
-extern CFCParserState *CFCParser_current_state;
-extern void *CFCParser_current_parser;
+extern CFCParser *CFCParser_current_state;
+extern void *CFCParser_current_parser;
CFCParser*
CFCParser_new(void);
@@ -43,16 +41,16 @@ struct CFCBase*
CFCParser_parse(CFCParser *self, const char *string);
void
-CFCParser_set_result(CFCParserState *self, struct CFCBase *result);
+CFCParser_set_result(CFCParser *self, struct CFCBase *result);
void
-CFCParser_set_errors(CFCParserState *self, int errors);
+CFCParser_set_errors(CFCParser *self, int errors);
void
-CFCParser_set_text(CFCParserState *self, const char *text, size_t len);
+CFCParser_set_text(CFCParser *self, const char *text, size_t len);
const char*
-CFCParser_get_text(CFCParserState *state);
+CFCParser_get_text(CFCParser *self);
void
CFCParser_set_parcel(struct CFCParcel *parcel);
@@ -61,16 +59,16 @@ struct CFCParcel*
CFCParser_get_parcel(void);
void
-CFCParser_set_class_name(CFCParserState *state, const char *class_name);
+CFCParser_set_class_name(CFCParser *self, const char *class_name);
const char*
-CFCParser_get_class_name(CFCParserState *state);
+CFCParser_get_class_name(CFCParser *self);
void
-CFCParser_set_class_cnick(CFCParserState *state, const char *class_cnick);
+CFCParser_set_class_cnick(CFCParser *self, const char *class_cnick);
const char*
-CFCParser_get_class_cnick(CFCParserState *state);
+CFCParser_get_class_cnick(CFCParser *self);
#ifdef __cplusplus
}