mirror of
https://github.com/git/git.git
synced 2026-01-09 01:34:00 +00:00
8d4725e48e
A comment in diff.c claimed that bits up to 12th (counting from 0th) are whitespace rules, and 13th thru 15th are for new/old/context, but it turns out it was miscounting. Correct them, and clarify where the whitespace rule bits come from in the comment. Extend bit assignment comments to cover bits used for color-moved, which weren't described. Also update the way these bit constants are defined to use (1 << N) notation, instead of octal constants, as it tends to make it easier to notice a breakage like this. Sprinkle a few blank lines between logically distinct groups of CPP macro definitions to make them easier to read. Signed-off-by: Junio C Hamano <gitster@pobox.com>
37 lines
1.3 KiB
C
37 lines
1.3 KiB
C
#ifndef WS_H
|
|
#define WS_H
|
|
|
|
struct index_state;
|
|
struct strbuf;
|
|
|
|
/*
|
|
* whitespace rules.
|
|
* used by both diff and apply
|
|
* last two octal-digits are tab width (we support only up to 63).
|
|
*/
|
|
#define WS_BLANK_AT_EOL (1<<6)
|
|
#define WS_SPACE_BEFORE_TAB (1<<7)
|
|
#define WS_INDENT_WITH_NON_TAB (1<<8)
|
|
#define WS_CR_AT_EOL (1<<9)
|
|
#define WS_BLANK_AT_EOF (1<<10)
|
|
#define WS_TAB_IN_INDENT (1<<11)
|
|
|
|
#define WS_TRAILING_SPACE (WS_BLANK_AT_EOL|WS_BLANK_AT_EOF)
|
|
#define WS_DEFAULT_RULE (WS_TRAILING_SPACE|WS_SPACE_BEFORE_TAB|8)
|
|
#define WS_TAB_WIDTH_MASK ((1<<6)-1)
|
|
|
|
/* All WS_* -- when extended, adapt constants defined after diff.c:diff_symbol */
|
|
#define WS_RULE_MASK ((1<<12)-1)
|
|
|
|
extern unsigned whitespace_rule_cfg;
|
|
unsigned whitespace_rule(struct index_state *, const char *);
|
|
unsigned parse_whitespace_rule(const char *);
|
|
unsigned ws_check(const char *line, int len, unsigned ws_rule);
|
|
void ws_check_emit(const char *line, int len, unsigned ws_rule, FILE *stream, const char *set, const char *reset, const char *ws);
|
|
char *whitespace_error_string(unsigned ws);
|
|
void ws_fix_copy(struct strbuf *, const char *, int, unsigned, int *);
|
|
int ws_blank_line(const char *line, int len);
|
|
#define ws_tab_width(rule) ((rule) & WS_TAB_WIDTH_MASK)
|
|
|
|
#endif /* WS_H */
|