X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Flexer%2Fq2c.c;h=1b12c269a140c80e91738c1de2f0e348a2a2dd11;hb=81fff61a96bece351e381ad3fef8ab1248a952ba;hp=acf08db8f1d72ce61ea280e00a8fa8902343edcc;hpb=2322678e8fddbbf158b01b2720db2636404bba3b;p=pspp

diff --git a/src/language/lexer/q2c.c b/src/language/lexer/q2c.c
index acf08db8f1..1b12c269a1 100644
--- a/src/language/lexer/q2c.c
+++ b/src/language/lexer/q2c.c
@@ -18,6 +18,7 @@
    02110-1301, USA. */
 
 #include <config.h>
+
 #include <assert.h>
 #include <ctype.h>
 #include <stdio.h>
@@ -25,30 +26,12 @@
 #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
 
@@ -342,7 +325,7 @@ find_symbol (int x)
   return iter;
 }
 
-#if DEBUGGING 
+#if DUMP_TOKENS 
 /* Writes a printable representation of the current token to
    stdout. */
 static void
@@ -360,7 +343,7 @@ dump_token (void)
       printf ("PUNCT\t%c\n", token);
     }
 }
-#endif /* DEBUGGING */
+#endif /* DUMP_TOKENS */
 
 /* Reads a token from the input file. */
 static int
@@ -410,7 +393,7 @@ lex_get (void)
   else
     token = *cp++;
   
-#if DEBUGGING
+#if DUMP_TOKENS
   dump_token ();
 #endif
   
@@ -1942,7 +1925,7 @@ dump_free (int persistent)
 	  switch (sbc->type) 
 	    {
             case SBC_VARLIST:
-	      dump (0, "free (p->v_variables);");
+	      dump (0, "free (p->v_%s);", st_lower (sbc->name));
               break;
 	    case SBC_STRING:
 	      dump (0, "free (p->s_%s);", st_lower (sbc->name));
@@ -2044,13 +2027,13 @@ main (int argc, char *argv[])
 	  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\"");