mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-16 00:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix lint error

Browse Source
This commit is contained in:
watiko
2016-01-21 22:34:29 +09:00
parent fa924f4604
commit 228d236bdf
2 changed files with 59 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/nvim/ops.c
View File

@@ -87,34 +87,34 @@ struct block_def {
*/ */
static char opchars[][3] = static char opchars[][3] =
{ {
{NUL, NUL, FALSE}, /* OP_NOP */ { NUL, NUL, false }, // OP_NOP
{'d', NUL, FALSE}, /* OP_DELETE */ { 'd', NUL, false }, // OP_DELETE
{'y', NUL, FALSE}, /* OP_YANK */ { 'y', NUL, false }, // OP_YANK
{'c', NUL, FALSE}, /* OP_CHANGE */ { 'c', NUL, false }, // OP_CHANGE
{'<', NUL, TRUE}, /* OP_LSHIFT */ { '<', NUL, true }, // OP_LSHIFT
{'>', NUL, TRUE}, /* OP_RSHIFT */ { '>', NUL, true }, // OP_RSHIFT
{'!', NUL, TRUE}, /* OP_FILTER */ { '!', NUL, true }, // OP_FILTER
{'g', '~', FALSE}, /* OP_TILDE */ { 'g', '~', false }, // OP_TILDE
{'=', NUL, TRUE}, /* OP_INDENT */ { '=', NUL, true }, // OP_INDENT
{'g', 'q', TRUE}, /* OP_FORMAT */ { 'g', 'q', true }, // OP_FORMAT
{':', NUL, TRUE}, /* OP_COLON */ { ':', NUL, true }, // OP_COLON
{'g', 'U', FALSE}, /* OP_UPPER */ { 'g', 'U', false }, // OP_UPPER
{'g', 'u', FALSE}, /* OP_LOWER */ { 'g', 'u', false }, // OP_LOWER
{'J', NUL, TRUE}, /* DO_JOIN */ { 'J', NUL, true }, // DO_JOIN
{'g', 'J', TRUE}, /* DO_JOIN_NS */ { 'g', 'J', true }, // DO_JOIN_NS
{'g', '?', FALSE}, /* OP_ROT13 */ { 'g', '?', false }, // OP_ROT13
{'r', NUL, FALSE}, /* OP_REPLACE */ { 'r', NUL, false }, // OP_REPLACE
{'I', NUL, FALSE}, /* OP_INSERT */ { 'I', NUL, false }, // OP_INSERT
{'A', NUL, FALSE}, /* OP_APPEND */ { 'A', NUL, false }, // OP_APPEND
{'z', 'f', TRUE}, /* OP_FOLD */ { 'z', 'f', true }, // OP_FOLD
{'z', 'o', TRUE}, /* OP_FOLDOPEN */ { 'z', 'o', true }, // OP_FOLDOPEN
{'z', 'O', TRUE}, /* OP_FOLDOPENREC */ { 'z', 'O', true }, // OP_FOLDOPENREC
{'z', 'c', TRUE}, /* OP_FOLDCLOSE */ { 'z', 'c', true }, // OP_FOLDCLOSE
{'z', 'C', TRUE}, /* OP_FOLDCLOSEREC */ { 'z', 'C', true }, // OP_FOLDCLOSEREC
{'z', 'd', TRUE}, /* OP_FOLDDEL */ { 'z', 'd', true }, // OP_FOLDDEL
{'z', 'D', TRUE}, /* OP_FOLDDELREC */ { 'z', 'D', true }, // OP_FOLDDELREC
{'g', 'w', TRUE}, /* OP_FORMAT2 */ { 'g', 'w', true }, // OP_FORMAT2
{'g', '@', FALSE}, /* OP_FUNCTION */ { 'g', '@', false }, // OP_FUNCTION
{ Ctrl_A, NUL, false }, // OP_NR_ADD { Ctrl_A, NUL, false }, // OP_NR_ADD
{ Ctrl_X, NUL, false }, // OP_NR_SUB { Ctrl_X, NUL, false }, // OP_NR_SUB
}; };

60
src/nvim/ops.h
View File

@@ -35,37 +35,35 @@ typedef int (*Indenter)(void);
#define PLUS_REGISTER 38 #define PLUS_REGISTER 38
#define NUM_REGISTERS 39 #define NUM_REGISTERS 39
/* // Operator IDs; The order must correspond to opchars[] in ops.c!
* Operator IDs; The order must correspond to opchars[] in ops.c! #define OP_NOP 0 // no pending operation
*/ #define OP_DELETE 1 // "d" delete operator
#define OP_NOP 0 /* no pending operation */ #define OP_YANK 2 // "y" yank operator
#define OP_DELETE 1 /* "d" delete operator */ #define OP_CHANGE 3 // "c" change operator
#define OP_YANK 2 /* "y" yank operator */ #define OP_LSHIFT 4 // "<" left shift operator
#define OP_CHANGE 3 /* "c" change operator */ #define OP_RSHIFT 5 // ">" right shift operator
#define OP_LSHIFT 4 /* "<" left shift operator */ #define OP_FILTER 6 // "!" filter operator
#define OP_RSHIFT 5 /* ">" right shift operator */ #define OP_TILDE 7 // "g~" switch case operator
#define OP_FILTER 6 /* "!" filter operator */ #define OP_INDENT 8 // "=" indent operator
#define OP_TILDE 7 /* "g~" switch case operator */ #define OP_FORMAT 9 // "gq" format operator
#define OP_INDENT 8 /* "=" indent operator */ #define OP_COLON 10 // ":" colon operator
#define OP_FORMAT 9 /* "gq" format operator */ #define OP_UPPER 11 // "gU" make upper case operator
#define OP_COLON 10 /* ":" colon operator */ #define OP_LOWER 12 // "gu" make lower case operator
#define OP_UPPER 11 /* "gU" make upper case operator */ #define OP_JOIN 13 // "J" join operator, only for Visual mode
#define OP_LOWER 12 /* "gu" make lower case operator */ #define OP_JOIN_NS 14 // "gJ" join operator, only for Visual mode
#define OP_JOIN 13 /* "J" join operator, only for Visual mode */ #define OP_ROT13 15 // "g?" rot-13 encoding
#define OP_JOIN_NS 14 /* "gJ" join operator, only for Visual mode */ #define OP_REPLACE 16 // "r" replace chars, only for Visual mode
#define OP_ROT13 15 /* "g?" rot-13 encoding */ #define OP_INSERT 17 // "I" Insert column, only for Visual mode
#define OP_REPLACE 16 /* "r" replace chars, only for Visual mode */ #define OP_APPEND 18 // "A" Append column, only for Visual mode
#define OP_INSERT 17 /* "I" Insert column, only for Visual mode */ #define OP_FOLD 19 // "zf" define a fold
#define OP_APPEND 18 /* "A" Append column, only for Visual mode */ #define OP_FOLDOPEN 20 // "zo" open folds
#define OP_FOLD 19 /* "zf" define a fold */ #define OP_FOLDOPENREC 21 // "zO" open folds recursively
#define OP_FOLDOPEN 20 /* "zo" open folds */ #define OP_FOLDCLOSE 22 // "zc" close folds
#define OP_FOLDOPENREC 21 /* "zO" open folds recursively */ #define OP_FOLDCLOSEREC 23 // "zC" close folds recursively
#define OP_FOLDCLOSE 22 /* "zc" close folds */ #define OP_FOLDDEL 24 // "zd" delete folds
#define OP_FOLDCLOSEREC 23 /* "zC" close folds recursively */ #define OP_FOLDDELREC 25 // "zD" delete folds recursively
#define OP_FOLDDEL 24 /* "zd" delete folds */ #define OP_FORMAT2 26 // "gw" format operator, keeps cursor pos
#define OP_FOLDDELREC 25 /* "zD" delete folds recursively */ #define OP_FUNCTION 27 // "g@" call 'operatorfunc'
#define OP_FORMAT2 26 /* "gw" format operator, keeps cursor pos */
#define OP_FUNCTION 27 /* "g@" call 'operatorfunc' */
#define OP_NR_ADD 28 // "<C-A>" Add to the number or alphabetic #define OP_NR_ADD 28 // "<C-A>" Add to the number or alphabetic
// character (OP_ADD conflicts with Perl) // character (OP_ADD conflicts with Perl)
#define OP_NR_SUB 29 // "<C-X>" Subtract from the number or #define OP_NR_SUB 29 // "<C-X>" Subtract from the number or