diff options
Diffstat (limited to 'editors')
-rw-r--r-- | editors/awk.c | 12 | ||||
-rw-r--r-- | editors/ed.c | 1 | ||||
-rw-r--r-- | editors/vi.c | 1 |
3 files changed, 0 insertions, 14 deletions
diff --git a/editors/awk.c b/editors/awk.c index f487163af..9c6819ad2 100644 --- a/editors/awk.c +++ b/editors/awk.c | |||
@@ -1060,12 +1060,10 @@ static uint32_t next_token(uint32_t expected) | |||
1060 | 1060 | ||
1061 | if (t_rollback) { | 1061 | if (t_rollback) { |
1062 | t_rollback = FALSE; | 1062 | t_rollback = FALSE; |
1063 | |||
1064 | } else if (concat_inserted) { | 1063 | } else if (concat_inserted) { |
1065 | concat_inserted = FALSE; | 1064 | concat_inserted = FALSE; |
1066 | t_tclass = save_tclass; | 1065 | t_tclass = save_tclass; |
1067 | t_info = save_info; | 1066 | t_info = save_info; |
1068 | |||
1069 | } else { | 1067 | } else { |
1070 | p = g_pos; | 1068 | p = g_pos; |
1071 | readnext: | 1069 | readnext: |
@@ -1081,7 +1079,6 @@ static uint32_t next_token(uint32_t expected) | |||
1081 | if (*p == '\0') { | 1079 | if (*p == '\0') { |
1082 | tc = TC_EOF; | 1080 | tc = TC_EOF; |
1083 | debug_printf_parse("%s: token found: TC_EOF\n", __func__); | 1081 | debug_printf_parse("%s: token found: TC_EOF\n", __func__); |
1084 | |||
1085 | } else if (*p == '\"') { | 1082 | } else if (*p == '\"') { |
1086 | /* it's a string */ | 1083 | /* it's a string */ |
1087 | t_string = s = ++p; | 1084 | t_string = s = ++p; |
@@ -1097,7 +1094,6 @@ static uint32_t next_token(uint32_t expected) | |||
1097 | *s = '\0'; | 1094 | *s = '\0'; |
1098 | tc = TC_STRING; | 1095 | tc = TC_STRING; |
1099 | debug_printf_parse("%s: token found:'%s' TC_STRING\n", __func__, t_string); | 1096 | debug_printf_parse("%s: token found:'%s' TC_STRING\n", __func__, t_string); |
1100 | |||
1101 | } else if ((expected & TC_REGEXP) && *p == '/') { | 1097 | } else if ((expected & TC_REGEXP) && *p == '/') { |
1102 | /* it's regexp */ | 1098 | /* it's regexp */ |
1103 | t_string = s = ++p; | 1099 | t_string = s = ++p; |
@@ -1130,7 +1126,6 @@ static uint32_t next_token(uint32_t expected) | |||
1130 | syntax_error(EMSG_UNEXP_TOKEN); | 1126 | syntax_error(EMSG_UNEXP_TOKEN); |
1131 | tc = TC_NUMBER; | 1127 | tc = TC_NUMBER; |
1132 | debug_printf_parse("%s: token found:%f TC_NUMBER\n", __func__, t_double); | 1128 | debug_printf_parse("%s: token found:%f TC_NUMBER\n", __func__, t_double); |
1133 | |||
1134 | } else { | 1129 | } else { |
1135 | /* search for something known */ | 1130 | /* search for something known */ |
1136 | tl = tokenlist; | 1131 | tl = tokenlist; |
@@ -1580,12 +1575,10 @@ static void parse_program(char *p) | |||
1580 | debug_printf_parse("%s: TC_BEGIN\n", __func__); | 1575 | debug_printf_parse("%s: TC_BEGIN\n", __func__); |
1581 | seq = &beginseq; | 1576 | seq = &beginseq; |
1582 | chain_group(); | 1577 | chain_group(); |
1583 | |||
1584 | } else if (tclass & TC_END) { | 1578 | } else if (tclass & TC_END) { |
1585 | debug_printf_parse("%s: TC_END\n", __func__); | 1579 | debug_printf_parse("%s: TC_END\n", __func__); |
1586 | seq = &endseq; | 1580 | seq = &endseq; |
1587 | chain_group(); | 1581 | chain_group(); |
1588 | |||
1589 | } else if (tclass & TC_FUNCDECL) { | 1582 | } else if (tclass & TC_FUNCDECL) { |
1590 | debug_printf_parse("%s: TC_FUNCDECL\n", __func__); | 1583 | debug_printf_parse("%s: TC_FUNCDECL\n", __func__); |
1591 | next_token(TC_FUNCTION); | 1584 | next_token(TC_FUNCTION); |
@@ -1603,7 +1596,6 @@ static void parse_program(char *p) | |||
1603 | seq = &f->body; | 1596 | seq = &f->body; |
1604 | chain_group(); | 1597 | chain_group(); |
1605 | clear_array(ahash); | 1598 | clear_array(ahash); |
1606 | |||
1607 | } else if (tclass & TC_OPSEQ) { | 1599 | } else if (tclass & TC_OPSEQ) { |
1608 | debug_printf_parse("%s: TC_OPSEQ\n", __func__); | 1600 | debug_printf_parse("%s: TC_OPSEQ\n", __func__); |
1609 | rollback_token(); | 1601 | rollback_token(); |
@@ -1618,7 +1610,6 @@ static void parse_program(char *p) | |||
1618 | chain_node(OC_PRINT); | 1610 | chain_node(OC_PRINT); |
1619 | } | 1611 | } |
1620 | cn->r.n = mainseq.last; | 1612 | cn->r.n = mainseq.last; |
1621 | |||
1622 | } else /* if (tclass & TC_GRPSTART) */ { | 1613 | } else /* if (tclass & TC_GRPSTART) */ { |
1623 | debug_printf_parse("%s: TC_GRPSTART(?)\n", __func__); | 1614 | debug_printf_parse("%s: TC_GRPSTART(?)\n", __func__); |
1624 | rollback_token(); | 1615 | rollback_token(); |
@@ -1879,13 +1870,10 @@ static void handle_special(var *v) | |||
1879 | split_f0(); | 1870 | split_f0(); |
1880 | 1871 | ||
1881 | mk_splitter(getvar_s(v), &fsplitter); | 1872 | mk_splitter(getvar_s(v), &fsplitter); |
1882 | |||
1883 | } else if (v == intvar[RS]) { | 1873 | } else if (v == intvar[RS]) { |
1884 | mk_splitter(getvar_s(v), &rsplitter); | 1874 | mk_splitter(getvar_s(v), &rsplitter); |
1885 | |||
1886 | } else if (v == intvar[IGNORECASE]) { | 1875 | } else if (v == intvar[IGNORECASE]) { |
1887 | icase = istrue(v); | 1876 | icase = istrue(v); |
1888 | |||
1889 | } else { /* $n */ | 1877 | } else { /* $n */ |
1890 | n = getvar_i(intvar[NF]); | 1878 | n = getvar_i(intvar[NF]); |
1891 | setvar_i(intvar[NF], n > v-Fields ? n : v-Fields+1); | 1879 | setvar_i(intvar[NF], n > v-Fields ? n : v-Fields+1); |
diff --git a/editors/ed.c b/editors/ed.c index 3087fb0b9..f0e5e4d5d 100644 --- a/editors/ed.c +++ b/editors/ed.c | |||
@@ -732,7 +732,6 @@ static int readLines(const char *file, int num) | |||
732 | cc = safe_read(fd, bufPtr, bufSize - bufUsed); | 732 | cc = safe_read(fd, bufPtr, bufSize - bufUsed); |
733 | bufUsed += cc; | 733 | bufUsed += cc; |
734 | bufPtr = bufBase; | 734 | bufPtr = bufBase; |
735 | |||
736 | } while (cc > 0); | 735 | } while (cc > 0); |
737 | 736 | ||
738 | if (cc < 0) { | 737 | if (cc < 0) { |
diff --git a/editors/vi.c b/editors/vi.c index 6ce513c0c..3db597ae1 100644 --- a/editors/vi.c +++ b/editors/vi.c | |||
@@ -411,7 +411,6 @@ struct globals { | |||
411 | char undo_text[1]; // text that was deleted (if deletion) | 411 | char undo_text[1]; // text that was deleted (if deletion) |
412 | } *undo_stack_tail; | 412 | } *undo_stack_tail; |
413 | #endif /* ENABLE_FEATURE_VI_UNDO */ | 413 | #endif /* ENABLE_FEATURE_VI_UNDO */ |
414 | |||
415 | }; | 414 | }; |
416 | #define G (*ptr_to_globals) | 415 | #define G (*ptr_to_globals) |
417 | #define text (G.text ) | 416 | #define text (G.text ) |