Apple-2-SW/dos33fsprogs
1
0
Fork 0
mirror of https://github.com/deater/dos33fsprogs.git synced 2024-07-06 22:29:00 +00:00
Code Issues Projects Releases Wiki Activity

shape_table: add some debugging

Browse Source 
was trying to find a problem with the converter but it turns
out that the sample presentation shapetable was missing
a linefeed at the end of the file.
This commit is contained in:
Vince Weaver 2018-07-15 12:21:08 -04:00
parent f5fef31726
commit e44d0f5e26
2 changed files with 44 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asoft_presenter/presenter_demo/num.table
View File

@ -155,4 +155,4 @@ RT
UP UP
# #
UP UP
STOP STOP

54
hgr-utils/shape_table.c
View File

@ -59,9 +59,11 @@ static int get_token(char *token, FILE *fff) {
ch=fgetc(fff); ch=fgetc(fff);
if (ch<0) return -1; if (ch<0) return -1;
/* Skip comment to end of line */
if (ch=='#') { if (ch=='#') {
while(ch!='\n') ch=fgetc(fff); while(ch!='\n') ch=fgetc(fff);
} }
if ((ch==' ') || (ch=='\t') || (ch=='\n')) { if ((ch==' ') || (ch=='\t') || (ch=='\n')) {
if (ch=='\n') line++; if (ch=='\n') line++;
continue; continue;
@ -119,6 +121,9 @@ int main(int argc, char **argv) {
case 'a': case 'a':
output_binary=0; output_binary=0;
break; break;
case 'd':
debug=1;
break;
default: default:
printf("Unknown options %s\n",argv[1]); printf("Unknown options %s\n",argv[1]);
print_usage(argv[0]); print_usage(argv[0]);
@ -154,13 +159,17 @@ int main(int argc, char **argv) {
while(1) { while(1) {
result=get_token(string,stdin); result=get_token(string,stdin);
if (result<0) { if (result<0) {
fprintf(stderr,"Unexpected EOF!\n"); fprintf(stderr,"Unexpected EOF, no START!\n");
return -1; return -1;
} }
if (!strcmp(string,"START")) { if (!strcmp(string,"START")) {
if (debug) fprintf(stderr,"START\n"); if (debug) {
fprintf(stderr,"STARTING SHAPE %d\n",
current_shape);
}
break; break;
} }
} }
@ -170,7 +179,7 @@ int main(int argc, char **argv) {
while(1) { while(1) {
result=get_token(string,stdin); result=get_token(string,stdin);
if (result<0) { if (result<0) {
fprintf(stderr,"Unexpected end of file!\n"); fprintf(stderr,"Unexpected end of file! No STOP\n");
return -2; return -2;
} }
@ -181,18 +190,41 @@ int main(int argc, char **argv) {
/* yes, this is inefficient... */ /* yes, this is inefficient... */
if (!strcmp(string,"NUP")) command=0; if (!strcmp(string,"NUP")) {
else if (!strcmp(string,"NRT")) command=1; if (debug) fprintf(stderr,"NUP\n");
else if (!strcmp(string,"NDN")) command=2; command=0;
else if (!strcmp(string,"NLT")) command=3; }
else if (!strcmp(string,"UP")) command=4; else if (!strcmp(string,"NRT")) {
if (debug) fprintf(stderr,"NRT\n");
command=1;
}
else if (!strcmp(string,"NDN")) {
if (debug) fprintf(stderr,"NDN\n");
command=2;
}
else if (!strcmp(string,"NLT")) {
if (debug) fprintf(stderr,"NLT\n");
command=3;
}
else if (!strcmp(string,"UP")) {
if (debug) fprintf(stderr,"UP\n");
command=4;
}
else if (!strcmp(string,"RT")) { else if (!strcmp(string,"RT")) {
if (debug) fprintf(stderr,"RT\n"); if (debug) fprintf(stderr,"RT\n");
command=5; command=5;
} }
else if (!strcmp(string,"DN")) command=6; else if (!strcmp(string,"DN")) {
else if (!strcmp(string,"LT")) command=7; if (debug) fprintf(stderr,"DN\n");
else fprintf(stderr,"Unknown command '%s'",string); command=6;
}
else if (!strcmp(string,"LT")) {
if (debug) fprintf(stderr,"LT\n");
command=7;
}
else {
fprintf(stderr,"Unknown command '%s'",string);
}
if (sub_pointer==LOC_A) { if (sub_pointer==LOC_A) {
table[current_offset]=(command&0x7); table[current_offset]=(command&0x7);