X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fnumeric.c;h=a2b6d8047f748739a6ad1d23df118a45c8854e36;hb=3c2526641a2e88ff6dec7ea6ae5ffc063daf6957;hp=b97410a51bc234ffb826e06d6705f339ea56e6eb;hpb=18febf84744dc7ab4248542c2f88d91c01ef3fa1;p=pspp diff --git a/src/numeric.c b/src/numeric.c index b97410a51b..a2b6d8047f 100644 --- a/src/numeric.c +++ b/src/numeric.c @@ -14,18 +14,22 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. */ #include -#include +#include "error.h" #include #include "command.h" +#include "dictionary.h" #include "error.h" #include "lexer.h" #include "str.h" #include "var.h" +#include "gettext.h" +#define _(msgid) gettext (msgid) + #include "debug-print.h" /* Parses the NUMERIC command. */ @@ -42,7 +46,6 @@ cmd_numeric (void) be used. */ struct fmt_spec f; - lex_match_id ("NUMERIC"); do { if (!parse_DATA_LIST_vars (&v, &nv, PV_NONE)) @@ -116,7 +119,6 @@ cmd_string (void) /* Width of variables to create. */ int width; - lex_match_id ("STRING"); do { if (!parse_DATA_LIST_vars (&v, &nv, PV_NONE)) @@ -148,6 +150,7 @@ cmd_string (void) break; default: assert (0); + abort (); } /* Create each variable. */ @@ -188,7 +191,6 @@ cmd_leave (void) int i; - lex_match_id ("LEAVE"); if (!parse_variables (default_dict, &v, &nv, PV_NONE)) return CMD_FAILURE; for (i = 0; i < nv; i++)