/* PSPP - a program for statistical analysis.
- Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 2010, 2011, 2013 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
int
main (int argc, char *argv[])
{
- struct segment
- {
- enum segment_type type;
- struct substring string;
- };
-
- size_t offset;
const char *file_name;
- char *input;
- struct segmenter s;
- struct segment *segs;
- size_t n_segs, allocated_segs;
size_t length;
- size_t i;
- int n;
+ char *input;
+
+ struct string_lexer slex;
+ bool more;
set_program_name (argv[0]);
file_name = parse_options (argc, argv);
input[length++] = '\n';
input[length++] = '\0';
- segs = NULL;
- n_segs = allocated_segs = 0;
-
- segmenter_init (&s, mode);
- for (offset = 0; offset < length; offset += n)
+ string_lexer_init (&slex, input, mode);
+ do
{
- enum segment_type type;
-
- n = segmenter_push (&s, input + offset, length - offset, &type);
- assert (n >= 0);
- assert (offset + n <= length);
-
- if (n_segs >= allocated_segs)
- segs = x2nrealloc (segs, &allocated_segs, sizeof *segs);
-
- segs[n_segs].type = type;
- segs[n_segs].string.string = input + offset;
- segs[n_segs].string.length = n;
- n_segs++;
- }
-
- for (i = 0; i < n_segs; )
- {
- enum scan_result result;
- struct scanner scanner;
struct token token;
- int saved = -1;
-
- scanner_init (&scanner, &token);
- do
- {
- struct segment *seg;
-
- assert (i < n_segs);
- seg = &segs[i++];
- result = scanner_push (&scanner, seg->type, seg->string, &token);
- if (result == SCAN_SAVE)
- saved = i;
- }
- while (result == SCAN_MORE || result == SCAN_SAVE);
-
- if (result == SCAN_BACK)
- {
- assert (saved >= 0);
- i = saved;
- }
+ more = string_lexer_next (&slex, &token);
printf ("%s", scan_type_to_string (token.type));
if (token.number != 0.0)
{
- char s[DBL_BUFSIZE_BOUND];
+ double x = token.number;
- dtoastr (s, sizeof s, 0, 0, token.number);
- printf (" %s", s);
+ if (x > LONG_MIN && x <= LONG_MAX && floor (x) == x)
+ printf (" %ld", (long int) x);
+ else
+ printf (" %.3g", x);
}
if (token.string.string != NULL || token.string.length > 0)
printf (" \"%.*s\"", (int) token.string.length, token.string.string);
token_destroy (&token);
}
+ while (more);
free (input);