collabvm/r3
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

change: rename OP_EXPECT_NOLINEBREAKS to OP_GREEDY_ANY.

Browse source
This commit is contained in:
Yuansheng 2019-07-20 22:49:25 +08:00
parent d516237aab
commit db91289ab6
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/r3.h
View file

@ -209,7 +209,7 @@ int r3_pattern_to_opcode(const char * pattern, unsigned int len);
enum { NODE_COMPARE_STR, NODE_COMPARE_PCRE, NODE_COMPARE_OPCODE }; enum { NODE_COMPARE_STR, NODE_COMPARE_PCRE, NODE_COMPARE_OPCODE };
enum { OP_EXPECT_MORE_DIGITS = 1, OP_EXPECT_MORE_WORDS, OP_EXPECT_NOSLASH, enum { OP_EXPECT_MORE_DIGITS = 1, OP_EXPECT_MORE_WORDS, OP_EXPECT_NOSLASH,
OP_EXPECT_NODASH, OP_EXPECT_MORE_ALPHA, OP_EXPECT_NOLINEBREAKS}; OP_EXPECT_NODASH, OP_EXPECT_MORE_ALPHA, OP_GREEDY_ANY};

4
src/node.c
View file

@ -312,13 +312,13 @@ R3Node * r3_tree_matchl(const R3Node * n, const char * path, unsigned int path_l
case OP_EXPECT_NODASH: case OP_EXPECT_NODASH:
while (*pp != '-' && pp < pp_end) pp++; while (*pp != '-' && pp < pp_end) pp++;
break; break;
case OP_EXPECT_NOLINEBREAKS: case OP_GREEDY_ANY:
while (*pp != '\n' && pp < pp_end) pp++; while (*pp != '\n' && pp < pp_end) pp++;
break; break;
} }
// check match // check match
if (e->opcode != OP_EXPECT_NOLINEBREAKS) { if (e->opcode != OP_GREEDY_ANY) {
if ((pp - path) > 0) { if ((pp - path) > 0) {
if (entry) { if (entry) {
str_array_append(&entry->vars , path, pp - path); str_array_append(&entry->vars , path, pp - path);

2
src/str.c
View file

@ -44,7 +44,7 @@ int r3_pattern_to_opcode(const char * pattern, unsigned int len) {
return OP_EXPECT_NODASH; return OP_EXPECT_NODASH;
} }
if ( strncmp(pattern, ".*", len) == 0 ) { if ( strncmp(pattern, ".*", len) == 0 ) {
return OP_EXPECT_NOLINEBREAKS; return OP_GREEDY_ANY;
} }
return 0; return 0;
} }