diff options
Diffstat (limited to 'regcomp_trie.c')
| -rw-r--r-- | regcomp_trie.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/regcomp_trie.c b/regcomp_trie.c index 8a6b4b639a..1096a25fcd 100644 --- a/regcomp_trie.c +++ b/regcomp_trie.c @@ -481,11 +481,11 @@ is the recommended Unicode-aware way of saying U16 set_before_paren; \ U16 set_after_paren; \ if (OP(cur) == BRANCH) { \ - set_before_paren = ARGa(cur); \ - set_after_paren = ARGb(cur); \ + set_before_paren = ARG1a(cur); \ + set_after_paren = ARG1b(cur); \ } else { \ - set_before_paren = ARG2La(cur); \ - set_after_paren = ARG2Lb(cur); \ + set_before_paren = ARG2a(cur); \ + set_after_paren = ARG2b(cur); \ } \ trie->j_before_paren[curword] = set_before_paren; \ trie->j_after_paren[curword] = set_after_paren; \ @@ -817,12 +817,12 @@ Perl_make_trie(pTHX_ RExC_state_t *pRExC_state, regnode *startbranch, } } /* end first pass */ trie->before_paren = OP(first) == BRANCH - ? ARGa(first) - : ARG2La(first); /* BRANCHJ */ + ? ARG1a(first) + : ARG2a(first); /* BRANCHJ */ trie->after_paren = OP(lastbranch) == BRANCH - ? ARGb(lastbranch) - : ARG2Lb(lastbranch); /* BRANCHJ */ + ? ARG1b(lastbranch) + : ARG2b(lastbranch); /* BRANCHJ */ DEBUG_TRIE_COMPILE_r( Perl_re_indentf( aTHX_ "TRIE(%s): W:%d C:%d Uq:%d Min:%d Max:%d\n", @@ -1492,7 +1492,7 @@ Perl_make_trie(pTHX_ RExC_state_t *pRExC_state, regnode *startbranch, jumper = last; if ( trie->maxlen ) { NEXT_OFF( convert ) = (U16)(tail - convert); - ARG_SET( convert, data_slot ); + ARG1u_SET( convert, data_slot ); /* Store the offset to the first unabsorbed branch in jump[0], which is otherwise unused by the jump logic. We use this when dumping a trie and during optimisation. */ @@ -1614,7 +1614,7 @@ Perl_construct_ahocorasick_from_trie(pTHX_ RExC_state_t *pRExC_state, regnode *s 'cdgu'. */ /* add a fail transition */ - const U32 trie_offset = ARG(source); + const U32 trie_offset = ARG1u(source); reg_trie_data *trie=(reg_trie_data *)RExC_rxi->data->data[trie_offset]; U32 *q; const U32 ucharcount = trie->uniquecharcount; @@ -1649,7 +1649,7 @@ Perl_construct_ahocorasick_from_trie(pTHX_ RExC_state_t *pRExC_state, regnode *s } OP(stclass)+=2; /* convert the TRIE type to its AHO-CORASICK equivalent */ - ARG_SET( stclass, data_slot ); + ARG1u_SET( stclass, data_slot ); aho = (reg_ac_data *) PerlMemShared_calloc( 1, sizeof(reg_ac_data) ); RExC_rxi->data->data[ data_slot ] = (void*)aho; aho->trie=trie_offset; |