02110-1301, USA. */
#include <config.h>
+
#include <assert.h>
#include <ctype.h>
#include <stdio.h>
#include <stdarg.h>
#include <time.h>
#include <errno.h>
-#if HAVE_UNISTD_H
#include <unistd.h>
-#endif
-#include "compiler.h"
-#include "str.h"
-
-
-/* Brokenness. */
-#ifndef EXIT_SUCCESS
-#define EXIT_SUCCESS 0
-#endif
+#include <libpspp/compiler.h>
+#include <libpspp/str.h>
+#include "exit.h"
-#ifndef EXIT_FAILURE
-#define EXIT_FAILURE 1
-#endif
-
-/*
-#if !HAVE_STRERROR
-#include "misc/strerror.c"
-#endif
-*/
-#include "debug-print.h"
-
/* Max length of an input line. */
#define MAX_LINE_LEN 1024
return iter;
}
-#if DEBUGGING
+#if DUMP_TOKENS
/* Writes a printable representation of the current token to
stdout. */
static void
printf ("PUNCT\t%c\n", token);
}
}
-#endif /* DEBUGGING */
+#endif /* DUMP_TOKENS */
/* Reads a token from the input file. */
static int
else
token = *cp++;
-#if DEBUGGING
+#if DUMP_TOKENS
dump_token ();
#endif
outdent ();
}
dump (0, "free(p->s_%s);", st_lower(sbc->name) );
- dump (0, "p->s_%s = xstrdup (ds_c_str (&tokstr));",
+ dump (0, "p->s_%s = ds_xstrdup (&tokstr);",
st_lower (sbc->name));
dump (0, "lex_get ();");
if (sbc->restriction)
indent = 0;
dump (0, "#include <stdlib.h>");
- dump (0, "#include \"alloc.h\"");
- dump (0, "#include \"message.h\"");
- dump (0, "#include \"lexer.h\"");
- dump (0, "#include \"settings.h\"");
- dump (0, "#include \"str.h\"");
- dump (0, "#include \"subcommand-list.h\"");
- dump (0, "#include \"variable.h\"");
+ dump (0, "#include <libpspp/alloc.h>");
+ dump (0, "#include <libpspp/message.h>");
+ dump (0, "#include <language/lexer/lexer.h>");
+ dump (0, "#include <data/settings.h>");
+ dump (0, "#include <libpspp/str.h>");
+ dump (0, "#include <language/lexer/subcommand-list.h>");
+ dump (0, "#include <data/variable.h>");
dump (0, nullstr);
dump (0, "#include \"gettext.h\"");