Mercurial > vim

comparison src/eval.c @ 7963:d96e38f35e2d v7.4.1277

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/a6f72ba7c6cadd37be38d92008d10a3025fdc5ec Author: Bram Moolenaar <Bram@vim.org> Date: Sun Feb 7 15:57:00 2016 +0100 patch 7.4.1277 Problem: Compiler can complain about missing enum value in switch with some combination of features. Solution: Remove #ifdefs around case statements.
author Christian Brabandt <cb@256bit.org>
date Sun, 07 Feb 2016 16:00:05 +0100
parents fc9ba91a6533
children 45ea5ebf3a98
comparison
equal deleted inserted replaced
7962:3e5cb57171f2 7963:d96e38f35e2d
19867 case VAR_NUMBER: n = 0; break; 19867 case VAR_NUMBER: n = 0; break;
19868 case VAR_STRING: n = 1; break; 19868 case VAR_STRING: n = 1; break;
19869 case VAR_FUNC: n = 2; break; 19869 case VAR_FUNC: n = 2; break;
19870 case VAR_LIST: n = 3; break; 19870 case VAR_LIST: n = 3; break;
19871 case VAR_DICT: n = 4; break; 19871 case VAR_DICT: n = 4; break;
19872 #ifdef FEAT_FLOAT
19873 case VAR_FLOAT: n = 5; break; 19872 case VAR_FLOAT: n = 5; break;
19874 #endif
19875 case VAR_SPECIAL: 19873 case VAR_SPECIAL:
19876 if (argvars[0].vval.v_number == VVAL_FALSE 19874 if (argvars[0].vval.v_number == VVAL_FALSE
19877 || argvars[0].vval.v_number == VVAL_TRUE) 19875 || argvars[0].vval.v_number == VVAL_TRUE)
19878 n = 6; 19876 n = 6;
19879 else 19877 else
19880 n = 7; 19878 n = 7;
19881 break; 19879 break;
19882 #ifdef FEAT_JOB
19883 case VAR_JOB: n = 8; break; 19880 case VAR_JOB: n = 8; break;
19884 #endif
19885 case VAR_UNKNOWN: 19881 case VAR_UNKNOWN:
19886 EMSG2(_(e_intern2), "f_type(UNKNOWN)"); 19882 EMSG2(_(e_intern2), "f_type(UNKNOWN)");
19887 n = -1; 19883 n = -1;
19888 break; 19884 break;
19889 } 19885 }
24902 { 24898 {
24903 switch (this_var->di_tv.v_type) 24899 switch (this_var->di_tv.v_type)
24904 { 24900 {
24905 case VAR_STRING: s = "STR"; break; 24901 case VAR_STRING: s = "STR"; break;
24906 case VAR_NUMBER: s = "NUM"; break; 24902 case VAR_NUMBER: s = "NUM"; break;
24907 #ifdef FEAT_FLOAT
24908 case VAR_FLOAT: s = "FLO"; break; 24903 case VAR_FLOAT: s = "FLO"; break;
24909 #endif
24910 case VAR_DICT: s = "DIC"; break; 24904 case VAR_DICT: s = "DIC"; break;
24911 case VAR_LIST: s = "LIS"; break; 24905 case VAR_LIST: s = "LIS"; break;
24912 case VAR_SPECIAL: s = "XPL"; break; 24906 case VAR_SPECIAL: s = "XPL"; break;
24913 24907
24914 case VAR_UNKNOWN: 24908 case VAR_UNKNOWN: