X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fsource-init-opts.c;h=c5f5b4d4576934b8a9a315afbd92f7ece59f0b08;hb=refs%2Fheads%2Fctables7;hp=a984b3d099546d59b09b1487e1ec0e832ed3cb67;hpb=173d1687aea88e0e5e1b1d8615ed68ebefb15d08;p=pspp

diff --git a/src/ui/source-init-opts.c b/src/ui/source-init-opts.c
index a984b3d099..c5f5b4d457 100644
--- a/src/ui/source-init-opts.c
+++ b/src/ui/source-init-opts.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2008, 2010  Free Software Foundation
+   Copyright (C) 2008, 2010, 2014  Free Software Foundation
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,15 +22,11 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "data/file-name.h"
-#include "data/por-file-reader.h"
 #include "data/settings.h"
-#include "data/sys-file-reader.h"
-#include "language/syntax-file.h"
-#include "language/syntax-string-source.h"
+#include "language/lexer/include-path.h"
+#include "language/lexer/lexer.h"
 #include "libpspp/assertion.h"
 #include "libpspp/argv-parser.h"
-#include "libpspp/getl.h"
 #include "libpspp/llx.h"
 #include "libpspp/message.h"
 #include "ui/syntax-gen.h"
@@ -62,10 +58,8 @@ static const struct argv_option source_init_options[N_SOURCE_INIT_OPTIONS] =
   };
 
 static void
-source_init_option_callback (int id, void *ss_)
+source_init_option_callback (int id, void *aux UNUSED)
 {
-  struct source_stream *ss = ss_;
-
   switch (id)
     {
     case OPT_ALGORITHM:
@@ -74,21 +68,19 @@ source_init_option_callback (int id, void *ss_)
       else if (!strcmp (optarg, "enhanced"))
 	settings_set_algorithm (ENHANCED);
       else
-        /* TRANSLATORS: Leave the words `compatible' and `enhanced' in their
-	original English. */
         error (1, 0,
-               _("Algorithm must be either `compatible' or `enhanced'."));
+               _("Algorithm must be either `%s' or `%s'."), "compatible", "enhanced");
       break;
 
     case OPT_INCLUDE:
       if (!strcmp (optarg, "-"))
-	getl_clear_include_path (ss);
+        include_path_clear ();
       else
-	getl_add_include_dir (ss, optarg);
+        include_path_add (optarg);
       break;
 
     case OPT_NO_INCLUDE:
-      getl_clear_include_path (ss);
+      include_path_clear ();
       break;
 
     case OPT_SAFER:
@@ -96,15 +88,13 @@ source_init_option_callback (int id, void *ss_)
       break;
 
     case OPT_SYNTAX:
-      if (!strcmp (optarg, "compatible") )
+      if (!strcmp (optarg, "compatible"))
 	settings_set_syntax (COMPATIBLE);
       else if (!strcmp (optarg, "enhanced"))
 	settings_set_syntax (ENHANCED);
       else
-        /* TRANSLATORS: Leave the words `compatible' and `enhanced' in their
-	original English. */
         error (1, 0,
-               _("Syntax must be either `compatible' or `enhanced'."));
+               _("Syntax must be either `%s' or `%s'."), "compatible", "enhanced");
       break;
 
     default:
@@ -113,9 +103,8 @@ source_init_option_callback (int id, void *ss_)
 }
 
 void
-source_init_register_argv_parser (struct argv_parser *ap,
-                                  struct source_stream *ss)
+source_init_register_argv_parser (struct argv_parser *ap)
 {
   argv_parser_add_options (ap, source_init_options, N_SOURCE_INIT_OPTIONS,
-                           source_init_option_callback, ss);
+                           source_init_option_callback, NULL);
 }