From 4eb8026cf91d467367c61003d1a9b0c416988b69 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sun, 23 Jun 2013 10:33:43 +0200 Subject: [PATCH] Split VAR_TRAIT_FORMAT into PRINT and WRITE variants --- src/data/variable.c | 8 ++++---- src/data/variable.h | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/data/variable.c b/src/data/variable.c index 16c655b9ba..8b9b8e24b9 100644 --- a/src/data/variable.c +++ b/src/data/variable.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011, 2012, 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 @@ -555,7 +555,7 @@ var_set_print_format (struct variable *v, const struct fmt_spec *print) { struct variable *ov = var_clone (v); var_set_print_format_quiet (v, print); - dict_var_changed (v, VAR_TRAIT_FORMAT, ov); + dict_var_changed (v, VAR_TRAIT_PRINT_FORMAT, ov); } /* Returns V's write format specification. */ @@ -588,7 +588,7 @@ var_set_write_format (struct variable *v, const struct fmt_spec *write) { struct variable *ov = var_clone (v); var_set_write_format_quiet (v, write); - dict_var_changed (v, VAR_TRAIT_FORMAT, ov); + dict_var_changed (v, VAR_TRAIT_WRITE_FORMAT, ov); } @@ -602,7 +602,7 @@ var_set_both_formats (struct variable *v, const struct fmt_spec *format) struct variable *ov = var_clone (v); var_set_print_format_quiet (v, format); var_set_write_format_quiet (v, format); - dict_var_changed (v, VAR_TRAIT_FORMAT, ov); + dict_var_changed (v, VAR_TRAIT_PRINT_FORMAT | VAR_TRAIT_WRITE_FORMAT, ov); } /* Returns the default print and write format for a variable of diff --git a/src/data/variable.h b/src/data/variable.h index 9d348d5920..ee8ee94ac2 100644 --- a/src/data/variable.h +++ b/src/data/variable.h @@ -27,7 +27,7 @@ #define VAR_TRAIT_NAME 0x0001 #define VAR_TRAIT_WIDTH 0x0002 -#define VAR_TRAIT_FORMAT 0x0004 +/* Available for reuse: 0x0004 */ #define VAR_TRAIT_LABEL 0x0008 #define VAR_TRAIT_VALUE_LABELS 0x0010 #define VAR_TRAIT_MISSING_VALUES 0x0020 @@ -37,6 +37,9 @@ #define VAR_TRAIT_LEAVE 0x0200 #define VAR_TRAIT_POSITION 0x0400 #define VAR_TRAIT_ATTRIBUTES 0x0800 +#define VAR_TRAIT_PRINT_FORMAT 0x1000 +#define VAR_TRAIT_WRITE_FORMAT 0x2000 + union value; -- 2.30.2