diff options
Diffstat (limited to 'src/lexgrog.l')
| -rw-r--r-- | src/lexgrog.l | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/src/lexgrog.l b/src/lexgrog.l index 7f78df9c..3c297172 100644 --- a/src/lexgrog.l +++ b/src/lexgrog.l @@ -48,6 +48,7 @@ #include <sys/stat.h> #include <errno.h> +#include <stdbool.h> #include <string.h> #include <stdlib.h> #include <unistd.h> @@ -243,8 +244,8 @@ static char *p_name; static const char *fname; static char filters[MAX_FILTERS]; -static int fill_mode; -static int waiting_for_quote; +static bool fill_mode; +static bool waiting_for_quote; static decompress *decomp; @@ -311,7 +312,7 @@ comment ['.]\\{dbl_quote} */ ar_name (اﻹسم|الإسم) /* ИМЕ also works for mk */ -bg_name ИМЕ +bg_name И(М|м)(Е|е) cs_name (J[Mm](É|é|\\\('[Ee]|E|e)[Nn][Oo]|N(Á|á)[Zz][Ee][Vv]) da_name N[Aa][Vv][Nn] de_name B[Ee][Zz][Ee][Ii][Cc][Hh][Nn][Uu][Nn][Gg] @@ -328,19 +329,19 @@ it_name N[Oo][Mm][Ee] ja_name (名|̾)(前|称) ko_name (이름|명칭) latin_name N[Oo][Mm][Ee][Nn] -lt_name PAVADINIMAS +lt_name P[Aa][Vv][Aa][Dd][Ii][Nn][Ii][Mm][Aa][Ss] nl_name N[Aa][Aa][Mm] pl_name N[Aa][Zz][Ww][Aa] ro_name N[Uu][Mm][Ee] -ru_name (ИМЯ|НАЗВАНИЕ|НАИМЕНОВАНИЕ) +ru_name (И(М|м)(Я|я)|Н(А|а)(З|з)(В|в)(А|а)(Н|н)(И|и)(Е|е)|Н(А|а)(И|и)(М|м)(Е|е)(Н|н)(О|о)(В|в)(А|а)(Н|н)(И|и)(Е|е)) sk_name M[Ee][Nn][Oo] -sr_name (ИМЕ|НАЗИВ) -srlatin_name (IME|NAZIV) +sr_name (И(М|м)(Е|е)|Н(А|а)(З|з)(И|и)(В|в)) +srlatin_name (I[Mm][Ee]|N[Aa][Zz][Ii][Vv]) sv_name N[Aa][Mm][Nn] ta_name பெய -tr_name (İ|i)S(İ|i)M -uk_name НАЗВА -vi_name TÊN +tr_name (A[Dd]|(İ|i)S(İ|i)M) +uk_name Н(А|а)(З|з)(В|в)(А|а) +vi_name T(Ê|ê)[Nn] zh_CN_name 名{blank}?(称|字){blank}?.* zh_TW_name (名{blank}?(稱|字)|命令名){blank}?.* name ({ar_name}|{bg_name}|{cs_name}|{da_name}|{de_name}|{en_name}|{eo_name}|{es_name}|{fa_name}|{fi_name}|{fr_name}|{hu_name}|{id_name}|{it_name}|{ja_name}|{ko_name}|{latin_name}|{lt_name}|{nl_name}|{pl_name}|{ro_name}|{ru_name}|{sk_name}|{sr_name}|{srlatin_name}|{sv_name}|{ta_name}|{tr_name}|{uk_name}|{vi_name}|{zh_CN_name}|{zh_TW_name}) @@ -457,7 +458,7 @@ vgrind_request \.vS /* some include quoting; dealing with this is unpleasant */ {bol}{typeface}{blank}+\" { newline_found (); - waiting_for_quote = 1; + waiting_for_quote = true; } {bol}{typeface}{blank}+ | /* type face commands */ @@ -481,8 +482,8 @@ vgrind_request \.vS /* Toggle fill mode */ <MAN_NAME,MAN_DESC>{ - {bol}\.nf.* fill_mode = 0; - {bol}\.fi.* fill_mode = 1; + {bol}\.nf.* fill_mode = false; + {bol}\.fi.* fill_mode = true; } <CAT_NAME>-{eol}{blank_eol}* /* strip continuations */ @@ -748,7 +749,7 @@ static void add_char_to_whatis (unsigned char c) if (p_name - newname + 1 >= MAX_NAME) too_big (); else if (waiting_for_quote && c == '"') - waiting_for_quote = 0; + waiting_for_quote = false; else *p_name++ = c; } @@ -846,7 +847,7 @@ static void newline_found (void) BEGIN (MAN_NAME); } } - waiting_for_quote = 0; + waiting_for_quote = false; } int find_name (const char *file, const char *filename, lexgrog *p_lg, @@ -936,8 +937,8 @@ int find_name_decompressed (decompress *d, const char *filename, lexgrog *p_lg) *(p_name = newname) = '\0'; memset (filters, '_', sizeof (filters)); - fill_mode = 1; - waiting_for_quote = 0; + fill_mode = true; + waiting_for_quote = false; if (p_lg->type == CATPAGE) BEGIN (CAT_FILE); |