Ben Pfaff [Wed, 29 Sep 2010 04:19:59 +0000 (21:19 -0700)]
syntax-file: Open syntax files immediately, instead of delaying.
Until now, syntax files have been opened only when the first line needs to
be read. This commit changes behavior to open syntax files as soon as the
syntax file source is created.
This fixes the behavior INSERT CD=YES when a relative file path is
specified. Without this commit, INSERT checks that the file exists, then
it creates the syntax file source, then it chdirs into the syntax file's
directory, and then the syntax file source tries to open the file, which
fails because the relative path is no longer correct. With this commit,
the file gets opened before the chdir, so it succeeds.
The following commit will add a test to prevent regression.
Ben Pfaff [Tue, 28 Sep 2010 01:51:22 +0000 (18:51 -0700)]
lexer: Properly initialize lexer->prog when lex_get_line_raw() fails.
lex_get_line(), the main caller of lex_get_line_raw(), set lexer->prog to
NULL when reading failed, but other callers need to do the same thing too,
otherwise e.g. DO REPEAT accesses invalid storage when there is a missing
END REPEAT.
Ben Pfaff [Fri, 24 Sep 2010 04:03:36 +0000 (21:03 -0700)]
data-in: Get rid of first_column, last_column arguments.
Most callers can't provide this arguments, and so in the interest of
making the data_in() interface simpler, it seems better to put the
callers in charge of dealing with error messages, since they better
know their own context.
Ben Pfaff [Mon, 20 Sep 2010 04:36:58 +0000 (21:36 -0700)]
data-in: Make data_in() parameters more uniform.
data_in() essentially takes an input encoding and an output encoding but
the parameters were in inconsistent order, inconsistently named, and had
inconsistent types. This commit changes all that to, I hope, be easier to
understand.
Ben Pfaff [Fri, 24 Sep 2010 03:56:50 +0000 (20:56 -0700)]
data-in: Rewrite logic for recoding input, and get rid of src_enc member.
The logic used here seemed actually wrong for non-binary numeric formats
and AHEX format: we want these translated into the native encoding so that
we can interpret digits and letters properly without additional work.
The only case where we care about the output encoding is A format.
Ben Pfaff [Sun, 19 Sep 2010 18:07:09 +0000 (11:07 -0700)]
message: Add column range to struct msg_locator.
data_in() can specify a range of columns for the messages that it outputs,
but until now these were not output in the format specified by the GNU
Coding Standards. This commit fixes that.
Ben Pfaff [Sun, 19 Sep 2010 18:04:41 +0000 (11:04 -0700)]
message: Consistently initialize locator; use 0 for "no line number".
A few of the callers of msg_emit() did not initialize the "where" member
of the struct msg, because they expect that msg_emit() will do it for them.
This is currently correct, but I intend to soon introduce the ability for
msg_emit()'s caller to specify a location. With that change, it will be
important for the caller to initialize this member, so this commit makes
sure of that.
At the same time, some callers were using -1 as the default value that
means "no line number" and others were using 0. This commit standardizes
on the latter.
Ben Pfaff [Sat, 11 Sep 2010 20:54:25 +0000 (13:54 -0700)]
lexer: Improve translatability of lex_error().
In general I believe that it is easier to translate full sentences or
clauses. It seems likely that "Syntax error %s at %s." where the first
%s is an arbitrary English phrase would be impossible to translate
grammatically into some languages, so this changes the general form to
"Syntax error at %s: %s." which seems more likely to be translatable while
not changing the English meaning.
Ben Pfaff [Tue, 6 Jul 2010 23:17:19 +0000 (16:17 -0700)]
HOST: Use more modern syntax.
An old SPSS paper manual I have describes the syntax that PSPP
implemented for HOST up until this commit, but newer versions
describe the syntax that this commit adopts.
Ben Pfaff [Fri, 17 Sep 2010 23:50:44 +0000 (16:50 -0700)]
syntax-string-source: Fix format string problems.
create_syntax_string_source() treated its argument as a printf-style format
string but wasn't annotated properly. Most of the callers did not pass
string literals and were not escaped, so change it not to format its string
and add a new function create_syntax_format_source() with the previous
behavior.
Ben Pfaff [Tue, 21 Sep 2010 05:42:17 +0000 (22:42 -0700)]
i18n: Handle EINVAL more gracefully.
EINVAL indicates an invalid multibyte sequence at the end of buffer. It
seems to me that there is no point in swallowing up a single byte and going
on at that point; instead, one might as well just declare the conversion
done after adding the fallback character. This is what this commit does.
Ben Pfaff [Tue, 21 Sep 2010 05:15:38 +0000 (22:15 -0700)]
i18n: Properly restart conversion when output buffer overflows.
The E2BIG case tries to restart the whole conversion, by reinitializing
all variables to their initial states. However the value of 'text' might
already have been advanced somewhat if there was a previous loop for e.g.
an invalid character. This commit fixes the problem by keeping the
original 'text' around and using a moving input pointer instead.
Ben Pfaff [Sat, 18 Sep 2010 04:25:19 +0000 (21:25 -0700)]
linreg: Delete unused static function.
This function drew attention to itself through a warning about a missing
return type, but it isn't used so just delete it instead of adding a
return type
Ben Pfaff [Sat, 18 Sep 2010 04:03:57 +0000 (21:03 -0700)]
Suppress warnings about conversions between char * and unsigned char *.
For some time PSPP has used "unsigned char *" for string data and "char *"
for most other strings. Transforming between these properly generally
involves recoding, and there are some places where this is possibly
missing. The usual way to "fix" these warnings would be to insert casts,
but this would not fix the problem, just suppress the warnings, and it is
difficult to "grep" for casts so they would be hard to find for fixing
later.
This commit doesn't actually fix the problems, but it does suppress the
warnings while making them easy to find later: just grep for CHAR_CAST_BUG.
John Darrington [Wed, 15 Sep 2010 12:53:41 +0000 (14:53 +0200)]
Consolidate quoting style in printed strings.
The GNU coding standards say to use `xxxx' for quoted
strings. Previously we've been using a mixture of that style
and "xxxx". This change substitutes all instances of the latter
with the former.
Ben Pfaff [Sun, 29 Aug 2010 21:55:41 +0000 (14:55 -0700)]
settings: Avoid using a pointer and global data for algorithms.
Until now the difference between the current and global settings for
the algorithms in uses has been maintained as two values plus a pointer
to the setting actually in use. Using global data like that makes it
harder to save and restore settings, so this commit adopt an alternate
method that avoids using global data or pointers.
projects / pspp / log