if (!strncmp (argv [curarg], "--python", 8)) {
curarg++;
if (curarg < argc) {
- pythonfp = fopen (argv[curarg], "w");
+ if (!strcmp(argv[curarg], "-")) {
+ pythonfp = stdout;
+ } else {
+ pythonfp = fopen(argv[curarg], "w");
+ pythonfile = argv[curarg];
+ }
if (pythonfp == NULL) {
fprintf (stderr, "Couldn't open python output file %s\n",
argv[curarg]);
exit (1);
}
- pythonfile = argv[curarg];
curarg++;
} else {
fprintf(stderr, "Missing filename after --python\n");
}
else {
fclose (ifp);
- fclose (ofp);
+ if (ofp)
+ fclose (ofp);
if (ofile) {
printf ("Removing %s\n", ofile);
unlink (ofile);
static char namebuf [MAXNAME];
+static inline char
+getc_char (FILE *ifp)
+{
+ return ((char)(getc(ifp) & 0x7f));
+}
+
/*
* yylex (well, yylex_1: The real yylex below does crc-hackery)
*/
{
int nameidx=0;
char c;
- int at_bol=1;
enum { LP_INITIAL_WHITESPACE, LP_LINE_NUMBER,
LP_PRE_FILENAME_WHITESPACE, LP_FILENAME,
LP_POST_FILENAME,
* START state -- looking for something interesting
*/
case START_STATE:
- c = getc (ifp);
+ c = getc_char (ifp);
if (feof (ifp))
return (EOF);
switch (c) {
case '\n':
the_lexer_linenumber++;
- at_bol=1;
goto again;
case '#':
- if (!at_bol) {
- fprintf (stderr, "unknown token /%c at line %d\n",
- c, the_lexer_linenumber);
- return (BARF);
- }
-
the_lexer_state = LINE_PRAGMA_STATE;
lp_substate = LP_INITIAL_WHITESPACE;
goto again;
goto again;
case '/':
- c = getc (ifp);
+ c = getc_char (ifp);
if (feof (ifp))
return (EOF);
}
case '\\':
- c = getc (ifp);
+ c = getc_char (ifp);
if (feof (ifp))
return (EOF);
* NAME state -- eat the rest of a name
*/
case NAME_STATE:
- c = getc (ifp);
+ c = getc_char (ifp);
if (feof (ifp))
return (EOF);
* NUMBER state -- eat the rest of a number
*/
case NUMBER_STATE:
- c = getc (ifp);
+ c = getc_char (ifp);
if (feof (ifp))
return (EOF);
* C_COMMENT state -- eat a peach
*/
case C_COMMENT_STATE:
- c = getc (ifp);
+ c = getc_char (ifp);
if (feof (ifp))
return (EOF);
if (c == '*') {
- c = getc (ifp);
+ c = getc_char (ifp);
if (feof (ifp))
return (EOF);
if (c == '/') {
*/
case CPP_COMMENT_STATE:
- c = getc (ifp);
+ c = getc_char (ifp);
if (feof (ifp))
return (EOF);
if (c == '\n') {
goto again;
case STRING_STATE:
- c = getc (ifp);
+ c = getc_char (ifp);
if (feof (ifp))
return (EOF);
switch (c) {
case '\\':
- c = getc (ifp);
+ c = getc_char (ifp);
if (feof (ifp))
return (EOF);
namebuf[nameidx++] = c;
break;
case HELPER_STATE:
- c = getc (ifp);
+ c = getc_char (ifp);
if (feof (ifp))
return (EOF);
switch (c) {
case '\\':
- c = getc (ifp);
+ c = getc_char (ifp);
if (feof (ifp))
return (EOF);
namebuf[nameidx] = c;
switch (lp_substate) {
case LP_INITIAL_WHITESPACE: /* no number seen yet */
- c = getc(ifp);
+ c = getc_char(ifp);
if (feof(ifp))
return(EOF);
if (c >= '0' && c <= '9') {
goto again;
case LP_LINE_NUMBER: /* eating linenumber */
- c = getc(ifp);
+ c = getc_char(ifp);
if (feof(ifp))
return(EOF);
if (c >= '0' && c <= '9') {
goto again;
case LP_PRE_FILENAME_WHITESPACE: /* awaiting filename */
- c = getc(ifp);
+ c = getc_char(ifp);
if (feof(ifp))
return(EOF);
goto again;
case LP_FILENAME: /* eating filename */
- c = getc(ifp);
+ c = getc_char(ifp);
if (feof(ifp))
return(EOF);
case LP_POST_FILENAME: /* ignoring rest of line */
case LP_OTHER:
- c = getc(ifp);
+ c = getc_char(ifp);
if (feof(ifp))
return(EOF);
}
lp_end_of_line:
the_lexer_state = START_STATE;
- at_bol = 1;
nameidx = 0;
}
goto again;
char *rv;
rv = (char *) malloc (len+1);
+ if (rv == 0) {
+ fprintf(stderr, "Out of memory...");
+ exit (1);
+ }
+
strcpy (rv, s);
return (rv);
}