X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Flexer%2Fformat-parser.c;h=1730b4936c69590d7157655eca72d11671043c86;hb=740218f508466f16a79939cd97027b99f589d682;hp=9adbeb1552bd13a398cb39ccc2b67777080aeaaf;hpb=32c8a9891f2c0bdc9e1cda13f1313843bc4e6044;p=pspp diff --git a/src/language/lexer/format-parser.c b/src/language/lexer/format-parser.c index 9adbeb1552..1730b4936c 100644 --- a/src/language/lexer/format-parser.c +++ b/src/language/lexer/format-parser.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 2010 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 @@ -47,12 +47,12 @@ parse_abstract_format_specifier__ (struct lexer *lexer, /* Extract pieces. */ s = ds_ss (lex_tokstr (lexer)); - ss_get_chars (&s, ss_span (s, ss_cstr (CC_LETTERS)), &type_ss); - ss_get_chars (&s, ss_span (s, ss_cstr (CC_DIGITS)), &width_ss); - if (ss_match_char (&s, '.')) + ss_get_bytes (&s, ss_span (s, ss_cstr (CC_LETTERS)), &type_ss); + ss_get_bytes (&s, ss_span (s, ss_cstr (CC_DIGITS)), &width_ss); + if (ss_match_byte (&s, '.')) { has_decimals = true; - ss_get_chars (&s, ss_span (s, ss_cstr (CC_DIGITS)), &decimals_ss); + ss_get_bytes (&s, ss_span (s, ss_cstr (CC_DIGITS)), &decimals_ss); } else has_decimals = false;