Skip to content
This repository
Browse code

Remove usage of deprecated concat_s_s op

  • Loading branch information...
commit e9206071d9129a45723c654bb6c41c1bed3a6c00 1 parent c4c31a1
Vasily Chekalkin authored
2  src/HLL/Actions.pm
@@ -48,7 +48,7 @@ our sub ints_to_string($ints) {
48 48
         $P0 = shift ints_it
49 49
         $I0 = $P0.'ast'()
50 50
         $S0 = chr $I0
51  
-        concat result, $S0
  51
+        result = concat result, $S0
52 52
         goto ints_loop
53 53
       ints_1:
54 54
         $I0 = ints.'ast'()
20  src/PAST/Compiler-Regex.pir
@@ -49,7 +49,7 @@ Return the POST representation of the regex AST rooted by C<node>.
49 49
 
50 50
     .local string prefix, rname, rtype
51 51
     prefix = self.'unique'('rx')
52  
-    concat prefix, '_'
  52
+    prefix = concat prefix, '_'
53 53
     $P0 = split ' ', 'tgt string pos int off int eos int rep int cur pmc debug pmc'
54 54
     $P1 = iter $P0
55 55
   iter_loop:
@@ -117,11 +117,11 @@ Return the POST representation of the regex AST rooted by C<node>.
117 117
   peek_done:
118 118
 
119 119
     $S0 = concat '(', cur
120  
-    concat $S0, ', '
121  
-    concat $S0, pos
122  
-    concat $S0, ', '
123  
-    concat $S0, tgt
124  
-    concat $S0, ', $I10)'
  120
+    $S0 = concat $S0, ', '
  121
+    $S0 = concat $S0, pos
  122
+    $S0 = concat $S0, ', '
  123
+    $S0 = concat $S0, tgt
  124
+    $S0 = concat $S0, ', $I10)'
125 125
     ops.'push_pirop'('callmethod', '"!cursor_start"', 'self', 'result'=>$S0)
126 126
     unless caparray goto caparray_skip
127 127
     self.'!cursorop'(ops, '!cursor_caparray', 0, caparray :flat)
@@ -208,7 +208,7 @@ are passed to the function as input arguments.
208 208
     .local string result
209 209
     result = join ', ', retargs
210 210
     result = concat '(', result
211  
-    concat result, ')'
  211
+    result = concat result, ')'
212 212
   result_done:
213 213
 
214 214
     .local pmc cur
@@ -320,7 +320,7 @@ given, then "concat" is assumed.
320 320
 
321 321
     .local string name
322 322
     name = self.'unique'('alt')
323  
-    concat name, '_'
  323
+    name = concat name, '_'
324 324
 
325 325
     .local pmc ops, iter
326 326
     ops = self.'post_new'('Ops', 'node'=>node, 'result'=>cur)
@@ -399,7 +399,7 @@ Match various anchor points, including ^, ^^, $, $$.
399 399
 
400 400
     .local pmc donelabel
401 401
     $S0 = self.'unique'('rxanchor')
402  
-    concat $S0, '_done'
  402
+    $S0 = concat $S0, '_done'
403 403
     donelabel = self.'post_new'('Label', 'result'=>$S0)
404 404
 
405 405
     if subtype == 'bol' goto anchor_bol
@@ -650,7 +650,7 @@ Handle a concatenation of regexes.
650 650
 
651 651
     .local string name
652 652
     name = self.'unique'('conj')
653  
-    concat name, '_'
  653
+    name = concat name, '_'
654 654
 
655 655
     .local pmc ops, iter
656 656
     ops = self.'post_new'('Ops', 'node'=>node, 'result'=>cur)
12  src/Regex/Dumper.pir
@@ -133,8 +133,8 @@ An alternate dump output for a Match object and all of its subcaptures.
133 133
     unless spi < spc goto subrules
134 134
     prefix1 = concat prefix, b1
135 135
     $S0 = spi
136  
-    concat prefix1, $S0
137  
-    concat prefix1, b2
  136
+    prefix1 = concat prefix1, $S0
  137
+    prefix1 = concat prefix1, b2
138 138
     $I0 = defined capt[spi]
139 139
     unless $I0 goto subpats_2
140 140
     $P0 = capt[spi]
@@ -151,8 +151,8 @@ An alternate dump output for a Match object and all of its subcaptures.
151 151
     unless it goto end
152 152
     $S0 = shift it
153 153
     prefix1 = concat prefix, '<'
154  
-    concat prefix1, $S0
155  
-    concat prefix1, ">"
  154
+    prefix1 = concat prefix1, $S0
  155
+    prefix1 = concat prefix1, ">"
156 156
     $I0 = defined capt[$S0]
157 157
     unless $I0 goto subrules_1
158 158
     $P0 = capt[$S0]
@@ -175,8 +175,8 @@ An alternate dump output for a Match object and all of its subcaptures.
175 175
     $P1 = $P0[$I0]
176 176
     prefix2 = concat prefix1, b1
177 177
     $S0 = $I0
178  
-    concat prefix2, $S0
179  
-    concat prefix2, b2
  178
+    prefix2 = concat prefix2, $S0
  179
+    prefix2 = concat prefix2, b2
180 180
     $S0 = $P1.'dump_str'(prefix2, b1, b2)
181 181
     out .= $S0
182 182
     inc $I0

0 notes on commit e920607

Please sign in to comment.
Something went wrong with that request. Please try again.