Permalink
Browse files

Remove usage of deprecated concat_s_s op

  • Loading branch information...
1 parent c4c31a1 commit e9206071d9129a45723c654bb6c41c1bed3a6c00 @bacek bacek committed Dec 25, 2010
Showing with 17 additions and 17 deletions.
  1. +1 −1 src/HLL/Actions.pm
  2. +10 −10 src/PAST/Compiler-Regex.pir
  3. +6 −6 src/Regex/Dumper.pir
View
2 src/HLL/Actions.pm
@@ -48,7 +48,7 @@ our sub ints_to_string($ints) {
$P0 = shift ints_it
$I0 = $P0.'ast'()
$S0 = chr $I0
- concat result, $S0
+ result = concat result, $S0
goto ints_loop
ints_1:
$I0 = ints.'ast'()
View
20 src/PAST/Compiler-Regex.pir
@@ -49,7 +49,7 @@ Return the POST representation of the regex AST rooted by C<node>.
.local string prefix, rname, rtype
prefix = self.'unique'('rx')
- concat prefix, '_'
+ prefix = concat prefix, '_'
$P0 = split ' ', 'tgt string pos int off int eos int rep int cur pmc debug pmc'
$P1 = iter $P0
iter_loop:
@@ -117,11 +117,11 @@ Return the POST representation of the regex AST rooted by C<node>.
peek_done:
$S0 = concat '(', cur
- concat $S0, ', '
- concat $S0, pos
- concat $S0, ', '
- concat $S0, tgt
- concat $S0, ', $I10)'
+ $S0 = concat $S0, ', '
+ $S0 = concat $S0, pos
+ $S0 = concat $S0, ', '
+ $S0 = concat $S0, tgt
+ $S0 = concat $S0, ', $I10)'
ops.'push_pirop'('callmethod', '"!cursor_start"', 'self', 'result'=>$S0)
unless caparray goto caparray_skip
self.'!cursorop'(ops, '!cursor_caparray', 0, caparray :flat)
@@ -208,7 +208,7 @@ are passed to the function as input arguments.
.local string result
result = join ', ', retargs
result = concat '(', result
- concat result, ')'
+ result = concat result, ')'
result_done:
.local pmc cur
@@ -320,7 +320,7 @@ given, then "concat" is assumed.
.local string name
name = self.'unique'('alt')
- concat name, '_'
+ name = concat name, '_'
.local pmc ops, iter
ops = self.'post_new'('Ops', 'node'=>node, 'result'=>cur)
@@ -399,7 +399,7 @@ Match various anchor points, including ^, ^^, $, $$.
.local pmc donelabel
$S0 = self.'unique'('rxanchor')
- concat $S0, '_done'
+ $S0 = concat $S0, '_done'
donelabel = self.'post_new'('Label', 'result'=>$S0)
if subtype == 'bol' goto anchor_bol
@@ -650,7 +650,7 @@ Handle a concatenation of regexes.
.local string name
name = self.'unique'('conj')
- concat name, '_'
+ name = concat name, '_'
.local pmc ops, iter
ops = self.'post_new'('Ops', 'node'=>node, 'result'=>cur)
View
12 src/Regex/Dumper.pir
@@ -133,8 +133,8 @@ An alternate dump output for a Match object and all of its subcaptures.
unless spi < spc goto subrules
prefix1 = concat prefix, b1
$S0 = spi
- concat prefix1, $S0
- concat prefix1, b2
+ prefix1 = concat prefix1, $S0
+ prefix1 = concat prefix1, b2
$I0 = defined capt[spi]
unless $I0 goto subpats_2
$P0 = capt[spi]
@@ -151,8 +151,8 @@ An alternate dump output for a Match object and all of its subcaptures.
unless it goto end
$S0 = shift it
prefix1 = concat prefix, '<'
- concat prefix1, $S0
- concat prefix1, ">"
+ prefix1 = concat prefix1, $S0
+ prefix1 = concat prefix1, ">"
$I0 = defined capt[$S0]
unless $I0 goto subrules_1
$P0 = capt[$S0]
@@ -175,8 +175,8 @@ An alternate dump output for a Match object and all of its subcaptures.
$P1 = $P0[$I0]
prefix2 = concat prefix1, b1
$S0 = $I0
- concat prefix2, $S0
- concat prefix2, b2
+ prefix2 = concat prefix2, $S0
+ prefix2 = concat prefix2, b2
$S0 = $P1.'dump_str'(prefix2, b1, b2)
out .= $S0
inc $I0

0 comments on commit e920607

Please sign in to comment.