vcs.slashdirt.org Git - sw/tic2json.git/commitdiff

diff --git a/tic.y b/tic.y

index b2672223b50f91d6285ab898d5556d7966ab31ad..1b20a805b2df2915e985d80ea11ceef75b251932 100644 (file)

--- a/tic.y

+++ b/tic.y

int filter_mode;

static char framedelims[2];

-static int hooked;

static char fdelim;

static int optflags;

static unsigned int skipframes, framecount;

OPT_DESCFORM = 0x04,

OPT_DICTOUT = 0x08,

OPT_LONGDATE = 0x10,

+

+ OPT_HOOKED = 0x80, // hijack optflags for hook marker

};

static const char * tic_units[] = {

const char *format;

// filters

- if (framecount ||

+ if (framecount || !(optflags & OPT_HOOKED) ||

((optflags & OPT_MASKZEROES) && (T_STRING != (field->etiq.unittype & 0xF0)) && (0 == field->data.i)) ||

(etiq_en && !etiq_en[field->etiq.tok]))

return;

/* stream processing */

frames:

- frame

+ frame // single/first frame is always ignored

| frames frame

{

- if (hooked && !framecount--) {

+ if ((optflags & OPT_HOOKED) && !framecount--) {

framecount = skipframes;

printf ("%c\n%c", framedelims[1], framedelims[0]);

}

;

frame:

- TOK_STX datasets TOK_ETX { if (!hooked) { hooked=1; putchar(framedelims[0]); } }

+ TOK_STX datasets TOK_ETX { if (!(optflags & OPT_HOOKED)) { (optflags |= OPT_HOOKED); putchar(framedelims[0]); } }

| error TOK_ETX { fprintf(stderr, "frame error\n"); yyerrok; }

;

;

dataset:

- FIELD_START field FIELD_OK { if (hooked) { print_field(&2ドル); } free_field(&2ドル); }

+ FIELD_START field FIELD_OK { print_field(&2ドル); free_field(&2ドル); }

| FIELD_START field FIELD_KO { fprintf(stderr, "dataset invalid checksum\n"); free_field(&2ドル); }

| FIELD_START error FIELD_OK { fprintf(stderr, "unrecognized dataset\n"); yyerrok; }

;

{

int ch;

- hooked = 0;

framedelims[0] = '['; framedelims[1] = ']';

fdelim = ' ';

optflags = 0;