diff options
author | Ron Yorston <rmy@pobox.com> | 2015-07-14 14:12:05 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2015-07-14 14:12:05 +0100 |
commit | 895a1533781ca4713ef92113ab6ac5f2584ddd9d (patch) | |
tree | 49c8602e9cd733e6f6c105e94e614b8236677853 /editors/awk.c | |
parent | 535ec990c50206697852d5c25e94a959f24d86bc (diff) | |
parent | 072fc60f29ee3a4ff38f095a9ef149b2e820c8c0 (diff) | |
download | busybox-w32-895a1533781ca4713ef92113ab6ac5f2584ddd9d.tar.gz busybox-w32-895a1533781ca4713ef92113ab6ac5f2584ddd9d.tar.bz2 busybox-w32-895a1533781ca4713ef92113ab6ac5f2584ddd9d.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'editors/awk.c')
-rw-r--r-- | editors/awk.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/editors/awk.c b/editors/awk.c index 5b8e484a7..b4b6c5f78 100644 --- a/editors/awk.c +++ b/editors/awk.c | |||
@@ -1064,12 +1064,10 @@ static uint32_t next_token(uint32_t expected) | |||
1064 | 1064 | ||
1065 | if (t_rollback) { | 1065 | if (t_rollback) { |
1066 | t_rollback = FALSE; | 1066 | t_rollback = FALSE; |
1067 | |||
1068 | } else if (concat_inserted) { | 1067 | } else if (concat_inserted) { |
1069 | concat_inserted = FALSE; | 1068 | concat_inserted = FALSE; |
1070 | t_tclass = save_tclass; | 1069 | t_tclass = save_tclass; |
1071 | t_info = save_info; | 1070 | t_info = save_info; |
1072 | |||
1073 | } else { | 1071 | } else { |
1074 | p = g_pos; | 1072 | p = g_pos; |
1075 | readnext: | 1073 | readnext: |
@@ -1085,7 +1083,6 @@ static uint32_t next_token(uint32_t expected) | |||
1085 | if (*p == '\0') { | 1083 | if (*p == '\0') { |
1086 | tc = TC_EOF; | 1084 | tc = TC_EOF; |
1087 | debug_printf_parse("%s: token found: TC_EOF\n", __func__); | 1085 | debug_printf_parse("%s: token found: TC_EOF\n", __func__); |
1088 | |||
1089 | } else if (*p == '\"') { | 1086 | } else if (*p == '\"') { |
1090 | /* it's a string */ | 1087 | /* it's a string */ |
1091 | t_string = s = ++p; | 1088 | t_string = s = ++p; |
@@ -1101,7 +1098,6 @@ static uint32_t next_token(uint32_t expected) | |||
1101 | *s = '\0'; | 1098 | *s = '\0'; |
1102 | tc = TC_STRING; | 1099 | tc = TC_STRING; |
1103 | debug_printf_parse("%s: token found:'%s' TC_STRING\n", __func__, t_string); | 1100 | debug_printf_parse("%s: token found:'%s' TC_STRING\n", __func__, t_string); |
1104 | |||
1105 | } else if ((expected & TC_REGEXP) && *p == '/') { | 1101 | } else if ((expected & TC_REGEXP) && *p == '/') { |
1106 | /* it's regexp */ | 1102 | /* it's regexp */ |
1107 | t_string = s = ++p; | 1103 | t_string = s = ++p; |
@@ -1134,7 +1130,6 @@ static uint32_t next_token(uint32_t expected) | |||
1134 | syntax_error(EMSG_UNEXP_TOKEN); | 1130 | syntax_error(EMSG_UNEXP_TOKEN); |
1135 | tc = TC_NUMBER; | 1131 | tc = TC_NUMBER; |
1136 | debug_printf_parse("%s: token found:%f TC_NUMBER\n", __func__, t_double); | 1132 | debug_printf_parse("%s: token found:%f TC_NUMBER\n", __func__, t_double); |
1137 | |||
1138 | } else { | 1133 | } else { |
1139 | /* search for something known */ | 1134 | /* search for something known */ |
1140 | tl = tokenlist; | 1135 | tl = tokenlist; |
@@ -1584,12 +1579,10 @@ static void parse_program(char *p) | |||
1584 | debug_printf_parse("%s: TC_BEGIN\n", __func__); | 1579 | debug_printf_parse("%s: TC_BEGIN\n", __func__); |
1585 | seq = &beginseq; | 1580 | seq = &beginseq; |
1586 | chain_group(); | 1581 | chain_group(); |
1587 | |||
1588 | } else if (tclass & TC_END) { | 1582 | } else if (tclass & TC_END) { |
1589 | debug_printf_parse("%s: TC_END\n", __func__); | 1583 | debug_printf_parse("%s: TC_END\n", __func__); |
1590 | seq = &endseq; | 1584 | seq = &endseq; |
1591 | chain_group(); | 1585 | chain_group(); |
1592 | |||
1593 | } else if (tclass & TC_FUNCDECL) { | 1586 | } else if (tclass & TC_FUNCDECL) { |
1594 | debug_printf_parse("%s: TC_FUNCDECL\n", __func__); | 1587 | debug_printf_parse("%s: TC_FUNCDECL\n", __func__); |
1595 | next_token(TC_FUNCTION); | 1588 | next_token(TC_FUNCTION); |
@@ -1607,7 +1600,6 @@ static void parse_program(char *p) | |||
1607 | seq = &f->body; | 1600 | seq = &f->body; |
1608 | chain_group(); | 1601 | chain_group(); |
1609 | clear_array(ahash); | 1602 | clear_array(ahash); |
1610 | |||
1611 | } else if (tclass & TC_OPSEQ) { | 1603 | } else if (tclass & TC_OPSEQ) { |
1612 | debug_printf_parse("%s: TC_OPSEQ\n", __func__); | 1604 | debug_printf_parse("%s: TC_OPSEQ\n", __func__); |
1613 | rollback_token(); | 1605 | rollback_token(); |
@@ -1622,7 +1614,6 @@ static void parse_program(char *p) | |||
1622 | chain_node(OC_PRINT); | 1614 | chain_node(OC_PRINT); |
1623 | } | 1615 | } |
1624 | cn->r.n = mainseq.last; | 1616 | cn->r.n = mainseq.last; |
1625 | |||
1626 | } else /* if (tclass & TC_GRPSTART) */ { | 1617 | } else /* if (tclass & TC_GRPSTART) */ { |
1627 | debug_printf_parse("%s: TC_GRPSTART(?)\n", __func__); | 1618 | debug_printf_parse("%s: TC_GRPSTART(?)\n", __func__); |
1628 | rollback_token(); | 1619 | rollback_token(); |
@@ -1883,13 +1874,10 @@ static void handle_special(var *v) | |||
1883 | split_f0(); | 1874 | split_f0(); |
1884 | 1875 | ||
1885 | mk_splitter(getvar_s(v), &fsplitter); | 1876 | mk_splitter(getvar_s(v), &fsplitter); |
1886 | |||
1887 | } else if (v == intvar[RS]) { | 1877 | } else if (v == intvar[RS]) { |
1888 | mk_splitter(getvar_s(v), &rsplitter); | 1878 | mk_splitter(getvar_s(v), &rsplitter); |
1889 | |||
1890 | } else if (v == intvar[IGNORECASE]) { | 1879 | } else if (v == intvar[IGNORECASE]) { |
1891 | icase = istrue(v); | 1880 | icase = istrue(v); |
1892 | |||
1893 | } else { /* $n */ | 1881 | } else { /* $n */ |
1894 | n = getvar_i(intvar[NF]); | 1882 | n = getvar_i(intvar[NF]); |
1895 | setvar_i(intvar[NF], n > v-Fields ? n : v-Fields+1); | 1883 | setvar_i(intvar[NF], n > v-Fields ? n : v-Fields+1); |