variable: Complete renaming of ROLE_OUTPUT to ROLE_TARGET.

Commit 47d59628a7d51a (psppire-var-sheet: Rename references to the icons
for align, measure and role icons) renamed some but not all uses of
ROLE_OUTPUT, breaking the build.  This commit completes the rename.

According to Bastián Díaz, "target" is better than "output" because it
is "a broader concept for function".

diff --git a/src/data/sys-file-reader.c b/src/data/sys-file-reader.c
index 5949ee209c3c877fb22ed3b092d58a582d702e4e..d553b3a0e5796b4393a4f37d03c38057a14501c8 100644 (file)
--- a/src/data/sys-file-reader.c
+++ b/src/data/sys-file-reader.c
@@ -1958,7 +1958,7 @@ assign_variable_roles (struct sfm_reader *r, struct dictionary *dict)
               break;
 
             case 1:
-              role = ROLE_OUTPUT;
+              role = ROLE_TARGET;
               break;
 
             case 2:

diff --git a/src/data/sys-file-writer.c b/src/data/sys-file-writer.c
index 32326e13f2047142e0b8b8b247a193a8974182a9..4cf5c0893abecb203f8c128886ae56d31f76002d 100644 (file)
--- a/src/data/sys-file-writer.c
+++ b/src/data/sys-file-writer.c
@@ -706,7 +706,7 @@ add_role_attribute (enum var_role role, struct attrset *attrs)
       s = "0";
       break;
 
-    case ROLE_OUTPUT:
+    case ROLE_TARGET:
       s = "1";
       break;
 

diff --git a/src/data/variable.c b/src/data/variable.c
index 72dd2d8ef6b698fb44c417fe4e1691ca3a13ad9f..c4bab00fc36081b15aa368ec5b57dc89b7088dfe 100644 (file)
--- a/src/data/variable.c
+++ b/src/data/variable.c
@@ -892,7 +892,7 @@ var_role_is_valid (enum var_role role)
     {
     case ROLE_NONE:
     case ROLE_INPUT:
-    case ROLE_OUTPUT:
+    case ROLE_TARGET:
     case ROLE_BOTH:
     case ROLE_PARTITION:
     case ROLE_SPLIT:
@@ -912,7 +912,7 @@ var_role_to_string (enum var_role role)
     case ROLE_INPUT:
       return _("Input");
 
-    case ROLE_OUTPUT:
+    case ROLE_TARGET:
       return _("Output");
 
     case ROLE_BOTH:
@@ -941,7 +941,7 @@ var_role_to_syntax (enum var_role role)
     case ROLE_INPUT:
       return "INPUT";
 
-    case ROLE_OUTPUT:
+    case ROLE_TARGET:
       return "TARGET";
 
     case ROLE_BOTH:

diff --git a/src/data/variable.h b/src/data/variable.h
index 3210a78f9a8456e483f7684208622e2d6339b640..d77a289afaefe897c0ef7ffcffffd4691c628a67 100644 (file)
--- a/src/data/variable.h
+++ b/src/data/variable.h
@@ -146,7 +146,7 @@ enum measure var_default_measure (enum val_type);
 enum var_role
   {
     ROLE_INPUT,
-    ROLE_OUTPUT,
+    ROLE_TARGET,
     ROLE_BOTH,
     ROLE_NONE,
     ROLE_PARTITION,

diff --git a/src/language/dictionary/variable-display.c b/src/language/dictionary/variable-display.c
index 63bc6d472c6f4c8b01ac221b339ab6e5d518a3e9..67c2e13d637ac31cd3f1bc4682381cec531d68ea 100644 (file)
--- a/src/language/dictionary/variable-display.c
+++ b/src/language/dictionary/variable-display.c
@@ -198,7 +198,7 @@ cmd_variable_role (struct lexer *lexer, struct dataset *ds)
       if ( lex_match_id (lexer, "INPUT"))
         role = ROLE_INPUT;
       else if ( lex_match_id (lexer, "TARGET"))
-        role = ROLE_OUTPUT;
+        role = ROLE_TARGET;
       else if ( lex_match_id (lexer, "BOTH"))
         role = ROLE_BOTH;
       else if ( lex_match_id (lexer, "NONE"))