static void
fatal_expected_char (FILE *infile, int expected_c, int actual_c)
{
- fatal_with_file_and_line (infile, "expected character `%c', found `%c'",
- expected_c, actual_c);
+ if (actual_c == EOF)
+ fatal_with_file_and_line (infile, "expected character `%c', found EOF",
+ expected_c);
+ else
+ fatal_with_file_and_line (infile, "expected character `%c', found `%c'",
+ expected_c, actual_c);
}
/* Implementations of the iterator_group callbacks for modes. */
if (cond2 == 0 || cond2[0] == 0)
return cond1;
+ if (strcmp (cond1, cond2) == 0)
+ return cond1;
+
result = concat ("(", cond1, ") && (", cond2, ")", NULL);
obstack_ptr_grow (&joined_conditions_obstack, result);
obstack_ptr_grow (&joined_conditions_obstack, cond1);