aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/storycode.c35
-rw-r--r--src/storycode.h12
-rw-r--r--tests/storycode_test.c4
3 files changed, 34 insertions, 17 deletions
diff --git a/src/storycode.c b/src/storycode.c
index b6bed3c..b9dfb20 100644
--- a/src/storycode.c
+++ b/src/storycode.c
@@ -36,8 +36,9 @@
struct _scblocklist
{
int n_blocks;
- char **blocks;
int max_blocks;
+
+ struct scblock *blocks;
};
@@ -49,13 +50,12 @@ struct _scblocklistiterator
static int allocate_blocks(SCBlockList *bl)
{
- char **blocks_new;
+ struct scblock *blocks_new;
- blocks_new = realloc(bl->blocks, bl->max_blocks*sizeof(char *));
+ blocks_new = realloc(bl->blocks, bl->max_blocks*sizeof(struct scblock));
if ( blocks_new == NULL ) {
return 1;
}
-
bl->blocks = blocks_new;
return 0;
@@ -81,20 +81,22 @@ SCBlockList *sc_block_list_new()
}
-
void sc_block_list_free(SCBlockList *bl)
{
int i;
for ( i=0; i<bl->n_blocks; i++ ) {
- free(bl->blocks[i]);
+ free(bl->blocks[i].name);
+ free(bl->blocks[i].options);
+ free(bl->blocks[i].contents);
}
free(bl->blocks);
free(bl);
}
-char *sc_block_list_first(SCBlockList *bl, SCBlockListIterator **piter)
+struct scblock *sc_block_list_first(SCBlockList *bl,
+ SCBlockListIterator **piter)
{
SCBlockListIterator *iter;
@@ -106,11 +108,11 @@ char *sc_block_list_first(SCBlockList *bl, SCBlockListIterator **piter)
iter->pos = 0;
*piter = iter;
- return bl->blocks[0];
+ return &bl->blocks[0];
}
-char *sc_block_list_next(SCBlockList *bl, SCBlockListIterator *iter)
+struct scblock *sc_block_list_next(SCBlockList *bl, SCBlockListIterator *iter)
{
iter->pos++;
if ( iter->pos == bl->n_blocks ) {
@@ -118,18 +120,21 @@ char *sc_block_list_next(SCBlockList *bl, SCBlockListIterator *iter)
return NULL;
}
- return bl->blocks[iter->pos];
+ return &bl->blocks[iter->pos];
}
-static int sc_block_list_add(SCBlockList *bl, char *text)
+static int sc_block_list_add(SCBlockList *bl,
+ char *name, char *options, char *contents)
{
if ( bl->n_blocks == bl->max_blocks ) {
bl->max_blocks += 64;
if ( allocate_blocks(bl) ) return 1;
}
- bl->blocks[bl->n_blocks] = text;
+ bl->blocks[bl->n_blocks].name = name;
+ bl->blocks[bl->n_blocks].options = options;
+ bl->blocks[bl->n_blocks].contents = contents;
bl->n_blocks++;
return 0;
}
@@ -186,7 +191,11 @@ SCBlockList *sc_find_blocks(const char *sc, const char *blockname)
return NULL;
}
- if ( sc_block_list_add(bl, strndup(pos, i)) ) {
+ /* FIXME: Find options */
+
+ if ( sc_block_list_add(bl, strdup(blockname), NULL,
+ strndup(pos, i)) )
+ {
fprintf(stderr, "Failed to add block.\n");
sc_block_list_free(bl);
return NULL;
diff --git a/src/storycode.h b/src/storycode.h
index 240900d..6ba5e45 100644
--- a/src/storycode.h
+++ b/src/storycode.h
@@ -30,8 +30,16 @@
typedef struct _scblocklist SCBlockList;
typedef struct _scblocklistiterator SCBlockListIterator;
-char *sc_block_list_first(SCBlockList *bl, SCBlockListIterator **piter);
-char *sc_block_list_next(SCBlockList *bl, SCBlockListIterator *iter);
+struct scblock
+{
+ char *name;
+ char *options;
+ char *contents;
+};
+
+struct scblock *sc_block_list_first(SCBlockList *bl,
+ SCBlockListIterator **piter);
+struct scblock *sc_block_list_next(SCBlockList *bl, SCBlockListIterator *iter);
extern SCBlockList *sc_find_blocks(const char *sc, const char *blockname);
extern void sc_block_list_free(SCBlockList *bl);
diff --git a/tests/storycode_test.c b/tests/storycode_test.c
index 4ffc08c..a39fa72 100644
--- a/tests/storycode_test.c
+++ b/tests/storycode_test.c
@@ -34,7 +34,7 @@ int main(int argc, char *argv[])
{
SCBlockList *bl;
SCBlockListIterator *iter;
- char *b;
+ struct scblock *b;
bl = sc_find_blocks("\\bg{wibble \\f{wobble}}\\bg{rwawr}Wobble", "bg");
@@ -42,7 +42,7 @@ int main(int argc, char *argv[])
b != NULL;
b = sc_block_list_next(bl, iter) )
{
- printf("'%s'\n", b);
+ printf("'%s'\n", b->contents);
}
sc_block_list_free(bl);