From 0d3393ebee2cfa97cd7b51daf0448992df758594 Mon Sep 17 00:00:00 2001 From: "Jason S. Ninneman" Date: Wed, 2 Aug 2017 19:22:52 -0700 Subject: [PATCH] Datatype definition for command word types. --- advent.h | 6 +++--- misc.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/advent.h b/advent.h index ce763fa..2e07c7e 100644 --- a/advent.h +++ b/advent.h @@ -87,7 +87,7 @@ enum termination {endgame, quitgame, scoregame}; enum speechpart {unknown, intransitive, transitive}; -enum wordtype {NO_WORD_TYPE, MOTION, OBJECT, ACTION, NUMERIC}; +typedef enum {NO_WORD_TYPE, MOTION, OBJECT, ACTION, NUMERIC} word_type_t; typedef enum scorebonus {none, splatter, defeat, victory} score_t; @@ -188,8 +188,8 @@ struct command_t { enum speechpart part; vocab_t id1; vocab_t id2; - enum wordtype type1; - enum wordtype type2; + word_type_t type1; + word_type_t type2; verb_t verb; obj_t obj; }; diff --git a/misc.c b/misc.c index ba2e2af..23c053f 100644 --- a/misc.c +++ b/misc.c @@ -413,7 +413,7 @@ static bool is_valid_int(const char *str) return true; } -static void get_vocab_metadata(const char* word, vocab_t* id, enum wordtype* type) +static void get_vocab_metadata(const char* word, vocab_t* id, word_type_t* type) { /* Check for an empty string */ if (strncmp(word, "", sizeof("")) == 0) { -- 2.31.1