archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dungeon now outputs just database.h

Browse source 
Added macro DEFINE_GLOBALS_FROM_INCLUDES to main.c
Makefile no longer has to deal with database.c and database.o
This commit is contained in:
Bob Little 2017-06-14 21:54:49 -04:00
parent 1322a347ae
commit c4c28e10db
3 changed files with 440 additions and 453 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Makefile
View file

@ -35,30 +35,27 @@ SOURCES=$(OBJS:.o=.c) dungeon.c advent.h common.h adventure.text Makefile contro
.c.o:
$(CC) $(CCFLAGS) $(DBX) -c $<
advent: $(OBJS) database.o linenoise.o newdb.o
$(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) database.o newdb.o linenoise.o $(LDFLAGS) $(LIBS)
advent: $(OBJS) linenoise.o newdb.o
$(CC) $(CCFLAGS) $(DBX) -o advent $(OBJS) newdb.o linenoise.o $(LDFLAGS) $(LIBS)
main.o: advent.h database.h database.c common.h newdb.h
main.o: advent.h database.h common.h newdb.h
init.o: advent.h database.h database.c common.h newdb.h
init.o: advent.h database.h common.h newdb.h
actions.o: advent.h database.h database.c common.h
actions.o: advent.h database.h common.h
score.o: advent.h database.h database.c common.h newdb.h
score.o: advent.h database.h common.h newdb.h
misc.o: advent.h database.h database.c common.h newdb.h
misc.o: advent.h database.h common.h newdb.h
saveresume.o: advent.h database.h database.c common.h
saveresume.o: advent.h database.h common.h
common.o: common.h
database.o: database.c database.h common.h
$(CC) $(CCFLAGS) $(DBX) -c database.c
newdb.o: newdb.c newdb.h
$(CC) $(CCFLAGS) $(DBX) -c newdb.c
database.c database.h: dungeon
database.h: dungeon
./dungeon
newdb.c newdb.h:
@ -71,7 +68,7 @@ dungeon: dungeon.o common.o
$(CC) $(CCFLAGS) -o $@ dungeon.o common.o
clean:
rm -f *.o advent *.html database.[ch] dungeon *.gcno *.gcda
rm -f *.o advent *.html database.h dungeon *.gcno *.gcda
rm -f newdb.c newdb.h
rm -f README advent.6 MANIFEST *.tar.gz
rm -f *~

499
dungeon.c
View file

@ -59,33 +59,16 @@ long FIXD[NOBJECTS+1];
long ACTSPK[VRBSIZ + 1];
long HINTS[HNTSIZ + 1][HINTLEN];
bool is_set(long, long);
long GETTXT(long, long, long);
void BUG(long);
void MAPLIN(FILE*);
long GETNUM(FILE*);
int read_database(FILE*);
void read_messages(FILE*, long);
void read_section3_stuff(FILE*);
void read_vocabulary(FILE*);
void read_initial_locations(FILE*);
void read_action_verb_message_nr(FILE*);
void read_conditions(FILE*);
void read_hints(FILE*);
void read_sound_text(FILE*);
void write_0d(FILE*, FILE*, long, char*);
void write_1d(FILE*, FILE*, long[], long, char*);
void write_hints(FILE*, FILE*, long[][HINTLEN], long, long, char*);
void write_files(FILE*, FILE*);
bool is_set(long var, long position)
static bool is_set(long var, long position)
{
long mask = 1l << position;
bool result = (var & mask) == mask;
return(result);
}
long GETTXT(long SKIP,long ONEWRD, long UPPER) {
static long GETTXT(long SKIP,long ONEWRD, long UPPER)
{
/* Take characters from an input line and pack them into 30-bit words.
* Skip says to skip leading blanks. ONEWRD says stop if we come to a
* blank. UPPER says to map all letters to uppercase. If we reach the
@ -134,7 +117,7 @@ long GETTXT(long SKIP,long ONEWRD, long UPPER) {
return(TEXT);
}
void BUG(long NUM) {
static void BUG(long NUM) {
/* The following conditions are currently considered fatal bugs. Numbers < 20
* are detected while reading the database; the others occur at "run time".
@ -165,7 +148,8 @@ void BUG(long NUM) {
exit(EXIT_FAILURE);
}
void MAPLIN(FILE *OPENED) {
static void MAPLIN(FILE *OPENED) {
size_t i;
/* Read a line of input, from the specified input source,
* translate the chars to integers in the range 0-126 and store
* them in the common array "INLINE". Integer values are as follows:
@ -192,12 +176,14 @@ void MAPLIN(FILE *OPENED) {
* to do so. */
do {
fgets(INLINE + 1, sizeof(INLINE) - 1, OPENED);
if (NULL == fgets(INLINE + 1, sizeof(INLINE) - 1, OPENED)) {
printf("Failed fgets()\n");
}
}
while (!feof(OPENED) && INLINE[1] == '#');
LNLENG = 0;
for (size_t i = 1; i < sizeof(INLINE) && INLINE[i] != 0; ++i)
for (i = 1; i < sizeof(INLINE) && INLINE[i] != 0; ++i)
{
char val = INLINE[i];
INLINE[i] = ascii_to_advent[(unsigned)val];
@ -207,14 +193,14 @@ void MAPLIN(FILE *OPENED) {
LNPOSN = 1;
}
long GETNUM(FILE *source) {
static long GETNUM(FILE *source) {
/* Obtain the next integer from an input line. If K>0, we first read a
* new input line from a file; if K<0, we read a line from the keyboard;
* if K=0 we use a line that has already been read (and perhaps partially
* scanned). If we're at the end of the line or encounter an illegal
* character (not a digit, hyphen, or blank), we return 0. */
long GETNUM, SIGN;
long DIGIT, GETNUM, SIGN;
if(source != NULL) MAPLIN(source);
GETNUM = 0;
@ -235,7 +221,7 @@ long GETNUM(FILE *source) {
}
while (!(LNPOSN > LNLENG || INLINE[LNPOSN] == 0))
{
long DIGIT=INLINE[LNPOSN]-64;
DIGIT=INLINE[LNPOSN]-64;
if(DIGIT < 0 || DIGIT > 9)
{
GETNUM=0;
@ -250,7 +236,186 @@ long GETNUM(FILE *source) {
return(GETNUM);
}
int read_database(FILE* database) {
/* Sections 1, 2, 5, 6, 10, 14. Read messages and set up pointers. */
static void read_messages(FILE* database, long sect)
{
long KK=LINUSE;
while(true)
{
long loc;
LINUSE=KK;
loc=GETNUM(database);
if(LNLENG >= LNPOSN+70)BUG(0);
if(loc == -1) return;
if(LNLENG < LNPOSN)BUG(1);
do {
KK=KK+1;
if(KK >= LINSIZ)BUG(2);
LINES[KK]=GETTXT(false,false,false);
}
while(LINES[KK] != -1);
LINES[LINUSE]=KK;
if(loc == OLDLOC) continue;
OLDLOC=loc;
LINES[LINUSE]= -KK;
if(sect == 14)
{
TRNVLS=TRNVLS+1;
if(TRNVLS > TRNSIZ)BUG(11);
TTEXT[TRNVLS]=LINUSE;
TRNVAL[TRNVLS]=loc;
continue;
}
if(sect == 10)
{
CLSSES=CLSSES+1;
if(CLSSES > CLSMAX)BUG(11);
CTEXT[CLSSES]=LINUSE;
CVAL[CLSSES]=loc;
continue;
}
if(sect == 6)
{
if(loc > RTXSIZ)BUG(6);
RTEXT[loc]=LINUSE;
continue;
}
if(sect == 5)
{
if(loc > 0 && loc <= NOBJECTS)PTEXT[loc]=LINUSE;
continue;
}
if(loc > LOCSIZ)BUG(10);
if(sect == 1)
{
LTEXT[loc]=LINUSE;
continue;
}
STEXT[loc]=LINUSE;
}
}
/* The stuff for section 3 is encoded here. Each "from-location" gets a
* contiguous section of the "TRAVEL" array. Each entry in travel is
* newloc*1000 + KEYWORD (from section 4, motion verbs), and is negated if
* this is the last entry for this location. KEY(N) is the index in travel
* of the first option at location N. */
static void read_section3_stuff(FILE* database)
{
long loc;
while((loc=GETNUM(database)) != -1)
{
long newloc=GETNUM(NULL);
long L;
if(KEY[loc] == 0)
{
KEY[loc]=TRVS;
}
else
{
TRAVEL[TRVS-1]= -TRAVEL[TRVS-1];
}
while((L=GETNUM(NULL)) != 0)
{
TRAVEL[TRVS]=newloc*1000+L;
TRVS=TRVS+1;
if(TRVS == TRVSIZ)BUG(3);
}
TRAVEL[TRVS-1]= -TRAVEL[TRVS-1];
}
}
/* Here we read in the vocabulary. KTAB(N) is the word number, ATAB(N) is
* the corresponding word. The -1 at the end of section 4 is left in KTAB
* as an end-marker. */
static void read_vocabulary(FILE* database)
{
for (TABNDX=1; TABNDX<=TABSIZ; TABNDX++)
{
KTAB[TABNDX]=GETNUM(database);
if(KTAB[TABNDX] == -1) return;
ATAB[TABNDX]=GETTXT(true,true,true);
} /* end loop */
BUG(4);
}
/* Read in the initial locations for each object. Also the immovability info.
* plac contains initial locations of objects. FIXD is -1 for immovable
* objects (including the snake), or = second loc for two-placed objects. */
static void read_initial_locations(FILE* database)
{
long OBJ;
while((OBJ=GETNUM(database)) != -1)
{
PLAC[OBJ]=GETNUM(NULL);
FIXD[OBJ]=GETNUM(NULL);
}
}
/* Read default message numbers for action verbs, store in ACTSPK. */
static void read_action_verb_message_nr(FILE* database)
{
long verb;
while((verb=GETNUM(database)) != -1)
{
ACTSPK[verb]=GETNUM(NULL);
}
}
/* Read info about available liquids and other conditions, store in COND. */
static void read_conditions(FILE* database)
{
long K;
while((K=GETNUM(database)) != -1)
{
long loc;
while((loc=GETNUM(NULL)) != 0)
{
if(is_set(COND[loc],K)) BUG(8);
COND[loc]=COND[loc] + (1l << K);
}
}
}
/* Read data for hints. */
static void read_hints(FILE* database)
{
long K;
HNTMAX=0;
while((K=GETNUM(database)) != -1)
{
if(K <= 0 || K > HNTSIZ)BUG(7);
for (int I=1; I<=4; I++)
{
HINTS[K][I] =GETNUM(NULL);
} /* end loop */
HNTMAX=(HNTMAX>K ? HNTMAX : K);
}
}
/* Read the sound/text info, store in OBJSND, OBJTXT, LOCSND. */
static void read_sound_text(FILE* database)
{
long K;
while((K=GETNUM(database)) != -1)
{
long KK=GETNUM(NULL);
long I=GETNUM(NULL);
if(I != 0)
{
OBJSND[K]=(KK>0 ? KK : 0);
OBJTXT[K]=(I>0 ? I : 0);
continue;
}
LOCSND[K]=KK;
}
}
static int read_database(FILE* database) {
/* Clear out the various text-pointer arrays. All text is stored in array
* lines; each line is preceded by a word pointing to the next pointer (i.e.
@ -314,191 +479,6 @@ int read_database(FILE* database) {
}
}
/* Sections 1, 2, 5, 6, 10, 14. Read messages and set up pointers. */
void read_messages(FILE* database, long sect)
{
long KK=LINUSE;
while(true)
{
long loc;
LINUSE=KK;
loc=GETNUM(database);
if(LNLENG >= LNPOSN+70)BUG(0);
if(loc == -1) return;
if(LNLENG < LNPOSN)BUG(1);
do {
KK=KK+1;
if(KK >= LINSIZ)BUG(2);
LINES[KK]=GETTXT(false,false,false);
}
while(LINES[KK] != -1);
LINES[LINUSE]=KK;
if(loc == OLDLOC) continue;
OLDLOC=loc;
LINES[LINUSE]= -KK;
if(sect == 14)
{
TRNVLS=TRNVLS+1;
if(TRNVLS > TRNSIZ)BUG(11);
TTEXT[TRNVLS]=LINUSE;
TRNVAL[TRNVLS]=loc;
continue;
}
if(sect == 10)
{
CLSSES=CLSSES+1;
if(CLSSES > CLSMAX)BUG(11);
CTEXT[CLSSES]=LINUSE;
CVAL[CLSSES]=loc;
continue;
}
if(sect == 6)
{
if(loc > RTXSIZ)BUG(6);
RTEXT[loc]=LINUSE;
continue;
}
if(sect == 5)
{
if(loc > 0 && loc <= NOBJECTS)PTEXT[loc]=LINUSE;
continue;
}
if(loc > LOCSIZ)BUG(10);
if(sect == 1)
{
LTEXT[loc]=LINUSE;
continue;
}
STEXT[loc]=LINUSE;
}
}
/* The stuff for section 3 is encoded here. Each "from-location" gets a
* contiguous section of the "TRAVEL" array. Each entry in travel is
* newloc*1000 + KEYWORD (from section 4, motion verbs), and is negated if
* this is the last entry for this location. KEY(N) is the index in travel
* of the first option at location N. */
void read_section3_stuff(FILE* database)
{
long loc;
while((loc=GETNUM(database)) != -1)
{
long newloc=GETNUM(NULL);
long L;
if(KEY[loc] == 0)
{
KEY[loc]=TRVS;
}
else
{
TRAVEL[TRVS-1]= -TRAVEL[TRVS-1];
}
while((L=GETNUM(NULL)) != 0)
{
TRAVEL[TRVS]=newloc*1000+L;
TRVS=TRVS+1;
if(TRVS == TRVSIZ)BUG(3);
}
TRAVEL[TRVS-1]= -TRAVEL[TRVS-1];
}
}
/* Here we read in the vocabulary. KTAB(N) is the word number, ATAB(N) is
* the corresponding word. The -1 at the end of section 4 is left in KTAB
* as an end-marker. */
void read_vocabulary(FILE* database)
{
for (TABNDX=1; TABNDX<=TABSIZ; TABNDX++)
{
KTAB[TABNDX]=GETNUM(database);
if(KTAB[TABNDX] == -1) return;
ATAB[TABNDX]=GETTXT(true,true,true);
} /* end loop */
BUG(4);
}
/* Read in the initial locations for each object. Also the immovability info.
* plac contains initial locations of objects. FIXD is -1 for immovable
* objects (including the snake), or = second loc for two-placed objects. */
void read_initial_locations(FILE* database)
{
long OBJ;
while((OBJ=GETNUM(database)) != -1)
{
PLAC[OBJ]=GETNUM(NULL);
FIXD[OBJ]=GETNUM(NULL);
}
}
/* Read default message numbers for action verbs, store in ACTSPK. */
void read_action_verb_message_nr(FILE* database)
{
long verb;
while((verb=GETNUM(database)) != -1)
{
ACTSPK[verb]=GETNUM(NULL);
}
}
/* Read info about available liquids and other conditions, store in COND. */
void read_conditions(FILE* database)
{
long K;
while((K=GETNUM(database)) != -1)
{
long loc;
while((loc=GETNUM(NULL)) != 0)
{
if(is_set(COND[loc],K)) BUG(8);
COND[loc]=COND[loc] + (1l << K);
}
}
}
/* Read data for hints. */
void read_hints(FILE* database)
{
long K;
HNTMAX=0;
while((K=GETNUM(database)) != -1)
{
if(K <= 0 || K > HNTSIZ)BUG(7);
for (int I=1; I<=4; I++)
{
HINTS[K][I] =GETNUM(NULL);
} /* end loop */
HNTMAX=(HNTMAX>K ? HNTMAX : K);
}
}
/* Read the sound/text info, store in OBJSND, OBJTXT, LOCSND. */
void read_sound_text(FILE* database)
{
long K;
while((K=GETNUM(database)) != -1)
{
long KK=GETNUM(NULL);
long I=GETNUM(NULL);
if(I != 0)
{
OBJSND[K]=(KK>0 ? KK : 0);
OBJTXT[K]=(I>0 ? I : 0);
continue;
}
LOCSND[K]=KK;
}
}
/* Finish constructing internal data format */
/* Having read in the database, certain things are now constructed.
@ -511,46 +491,43 @@ void read_sound_text(FILE* database)
* whether the abbreviated description is printed. Counts modulo 5
* unless "LOOK" is used. */
void write_0d(FILE* c_file, FILE* header_file, long single, char* varname)
static void write_0d(FILE* header_file, long single, char* varname)
{
fprintf(c_file, "long %s = %ld;\n", varname, single);
fprintf(header_file, "extern long %s;\n", varname);
fprintf(header_file, "LOCATION long %s INITIALIZE(= %ld);\n", varname, single);
}
void write_1d(FILE* c_file, FILE* header_file, long array[], long dim, char* varname)
static void write_1d(FILE* header_file, long array[], long dim, char* varname)
{
fprintf(c_file, "long %s[] = {\n", varname);
fprintf(header_file, "LOCATION long %s[] INITIALIZE(= {\n", varname);
for (int i = 0; i < dim; ++i)
{
if (i % 10 == 0)
{
if (i > 0)
fprintf(c_file, "\n");
fprintf(c_file, " ");
fprintf(header_file, "\n");
fprintf(header_file, " ");
}
fprintf(c_file, "%ld, ", array[i]);
fprintf(header_file, "%ld, ", array[i]);
}
fprintf(c_file, "\n};\n");
fprintf(header_file, "extern long %s[%ld];\n", varname, dim);
fprintf(header_file, "\n});\n");
}
void write_hints(FILE* c_file, FILE* header_file, long matrix[][HINTLEN], long dim1, long dim2, char* varname)
static void write_hints(FILE* header_file, long matrix[][HINTLEN], long dim1, long dim2, char* varname)
{
fprintf(c_file, "long %s[][%ld] = {\n", varname, dim2);
fprintf(header_file, "LOCATION long %s[][%ld] INITIALIZE(= {\n", varname, dim2);
for (int i = 0; i < dim1; ++i)
{
fprintf(c_file, " {");
fprintf(header_file, " {");
for (int j = 0; j < dim2; ++j)
{
fprintf(c_file, "%ld, ", matrix[i][j]);
fprintf(header_file, "%ld, ", matrix[i][j]);
}
fprintf(c_file, "},\n");
fprintf(header_file, "},\n");
}
fprintf(c_file, "};\n");
fprintf(header_file, "extern long %s[%ld][%ld];\n", varname, dim1, dim2);
fprintf(header_file, "});\n");
}
void write_files(FILE* c_file, FILE* header_file)
static void write_file(FILE* header_file)
{
int i, MAXDIE;
for (i=0; i<=4; i++) {
@ -559,7 +536,11 @@ void write_files(FILE* c_file, FILE* header_file)
MAXDIE=i+1;
}
// preprocessor defines for the header
fprintf(header_file, "#ifndef DATABASE_H\n");
fprintf(header_file, "#define DATABASE_H\n");
fprintf(header_file, "\n");
fprintf(header_file, "#include \"common.h\"\n");
fprintf(header_file, "#define TABSIZ 330\n");
fprintf(header_file, "#define HNTSIZ 20\n");
@ -567,39 +548,47 @@ void write_files(FILE* c_file, FILE* header_file)
fprintf(header_file, "#define MAXDIE %d\n", MAXDIE);
fprintf(header_file, "\n");
// include the header in the C file
fprintf(c_file, "#include \"database.h\"\n");
fprintf(c_file, "\n");
fprintf(header_file, "\n");
fprintf(header_file, "#ifdef DEFINE_GLOBALS_FROM_INCLUDES\n");
fprintf(header_file, "#define LOCATION\n");
fprintf(header_file, "#define INITIALIZE(...) __VA_ARGS__\n");
fprintf(header_file, "#else\n");
fprintf(header_file, "#define LOCATION extern\n");
fprintf(header_file, "#define INITIALIZE(...)\n");
fprintf(header_file, "#endif\n");
fprintf(header_file, "\n");
// content variables
write_0d(c_file, header_file, TRNVLS, "TRNVLS");
write_0d(c_file, header_file, HNTMAX, "HNTMAX");
write_1d(c_file, header_file, OBJSND, NOBJECTS + 1, "OBJSND");
write_1d(c_file, header_file, OBJTXT, NOBJECTS + 1, "OBJTXT");
write_1d(c_file, header_file, COND, LOCSIZ + 1, "COND");
write_1d(c_file, header_file, KEY, LOCSIZ + 1, "KEY");
write_1d(c_file, header_file, LOCSND, LOCSIZ + 1, "LOCSND");
write_1d(c_file, header_file, CVAL, CLSMAX + 1, "CVAL");
write_1d(c_file, header_file, TRNVAL, TRNSIZ + 1, "TRNVAL");
write_1d(c_file, header_file, TRAVEL, TRVSIZ + 1, "TRAVEL");
write_1d(c_file, header_file, KTAB, TABSIZ + 1, "KTAB");
write_1d(c_file, header_file, ATAB, TABSIZ + 1, "ATAB");
write_1d(c_file, header_file, PLAC, NOBJECTS + 1, "PLAC");
write_1d(c_file, header_file, FIXD, NOBJECTS + 1, "FIXD");
write_1d(c_file, header_file, ACTSPK, VRBSIZ + 1, "ACTSPK");
write_hints(c_file, header_file, HINTS, HNTSIZ + 1, 5, "HINTS");
write_0d(header_file, TRNVLS, "TRNVLS");
write_0d(header_file, HNTMAX, "HNTMAX");
write_1d(header_file, OBJSND, NOBJECTS + 1, "OBJSND");
write_1d(header_file, OBJTXT, NOBJECTS + 1, "OBJTXT");
write_1d(header_file, COND, LOCSIZ + 1, "COND");
write_1d(header_file, KEY, LOCSIZ + 1, "KEY");
write_1d(header_file, LOCSND, LOCSIZ + 1, "LOCSND");
write_1d(header_file, CVAL, CLSMAX + 1, "CVAL");
write_1d(header_file, TRNVAL, TRNSIZ + 1, "TRNVAL");
write_1d(header_file, TRAVEL, TRVSIZ + 1, "TRAVEL");
write_1d(header_file, KTAB, TABSIZ + 1, "KTAB");
write_1d(header_file, ATAB, TABSIZ + 1, "ATAB");
write_1d(header_file, PLAC, NOBJECTS + 1, "PLAC");
write_1d(header_file, FIXD, NOBJECTS + 1, "FIXD");
write_1d(header_file, ACTSPK, VRBSIZ + 1, "ACTSPK");
write_hints(header_file, HINTS, HNTSIZ + 1, 5, "HINTS");
fprintf(header_file, "#undef LOCATION\n");
fprintf(header_file, "#undef INITIALIZE\n");
fprintf(header_file, "#endif\n");
}
int main()
int main(void)
{
FILE* database = fopen("adventure.text", "r");
read_database(database);
fclose(database);
FILE* c_file = fopen("database.c", "w");
FILE* header_file = fopen("database.h", "w");
write_files(c_file, header_file);
fclose(c_file);
write_file(header_file);
fclose(header_file);
return(EXIT_SUCCESS);

1
main.c
View file

@ -13,6 +13,7 @@
* and for the offensive globals. Applying the Structured Program
* Theorem can be hard.
*/
#define DEFINE_GLOBALS_FROM_INCLUDES
#include <stdlib.h>
#include <stdio.h>
#include <stdbool.h>