X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Ftests%2Fpaper-size.c;h=0322f5728b80209a165a55693afdc42da4364e63;hb=9ade26c8349b4434008c46cf09bc7473ec743972;hp=d8c49a595c0250a30155080a5372c629a2da598f;hpb=873165af1d9ae450483816b892aa17afd669a7c0;p=pspp-builds.git

diff --git a/src/language/tests/paper-size.c b/src/language/tests/paper-size.c
index d8c49a59..0322f572 100644
--- a/src/language/tests/paper-size.c
+++ b/src/language/tests/paper-size.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2010, 2011 Free Software Foundation, Inc.
 
    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
@@ -18,22 +18,25 @@
 
 #include <stdio.h>
 
-#include <language/command.h>
-#include <language/lexer/lexer.h>
-#include <libpspp/assertion.h>
-#include <output/output.h>
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/assertion.h"
+#include "libpspp/string-map.h"
+#include "output/measure.h"
 
 /* Executes the DEBUG PAPER SIZE command. */
 int
 cmd_debug_paper_size (struct lexer *lexer, struct dataset *ds UNUSED)
 {
+  const char *paper_size;
   int h, v;
 
   if (!lex_force_string (lexer))
     return CMD_FAILURE;
+  paper_size = lex_tokcstr (lexer);
 
-  printf ("\"%s\" => ", ds_cstr (lex_tokstr (lexer)));
-  if (outp_get_paper_size (ds_cstr (lex_tokstr (lexer)), &h, &v))
+  printf ("\"%s\" => ", paper_size);
+  if (measure_paper (paper_size, &h, &v))
     printf ("%.1f x %.1f in, %.0f x %.0f mm\n",
             h / 72000., v / 72000.,
             h / (72000 / 25.4), v / (72000 / 25.4));
@@ -41,5 +44,5 @@ cmd_debug_paper_size (struct lexer *lexer, struct dataset *ds UNUSED)
     printf ("error\n");
   lex_get (lexer);
 
-  return lex_end_of_command (lexer);
+  return CMD_SUCCESS;
 }