diff -cr ick24/feh.c ick24k/feh.c *** ick24/feh.c 2003-03-08 16:40:24.000000000 -0800 --- ick24k/feh.c 2010-07-17 12:16:59.000000000 -0700 *************** *** 729,735 **** (void) fprintf(fp, " if ("); if (tn->exechance < 100) (void) fprintf(fp, "roll(%d) && ", tn->exechance); ! (void) fprintf(fp, "!abstained[%d]) {\n", (int)(tn - tuples)); } void emit(tuple *tn, FILE *fp) --- 729,735 ---- (void) fprintf(fp, " if ("); if (tn->exechance < 100) (void) fprintf(fp, "roll(%d) && ", tn->exechance); ! (void) fprintf(fp, "OK(%d)) {\n", (int)(tn - tuples)); } void emit(tuple *tn, FILE *fp) diff -cr ick24/ick.y ick24k/ick.y *** ick24/ick.y 2003-03-08 16:40:26.000000000 -0800 --- ick24k/ick.y 2010-07-16 23:32:50.000000000 -0700 *************** *** 100,107 **** %type perform %type please preftype - %nonassoc HIGHPREC %nonassoc EARS SPARK %% /* beginning of rules section */ --- 100,107 ---- %type perform %type please preftype %nonassoc EARS SPARK + %nonassoc HIGHPREC %% /* beginning of rules section */ diff -cr ick24/lexer.l ick24k/lexer.l *** ick24/lexer.l 1999-09-15 12:52:44.000000000 -0700 --- ick24k/lexer.l 2010-07-16 17:15:40.000000000 -0700 *************** *** 38,47 **** } #endif /* yywrap */ - #ifdef YYLINENO_BY_HAND - int yylineno = 1; - #endif /* YYLINENO_BY_HAND */ - #ifdef MAIN YYSTYPE yylval; #endif /* MAIN */ --- 38,43 ----