Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'kill-useless-defaults'
Conflicts:
	src/PAST/NQP.pir
	tools/build/PARROT_REVISION
  • Loading branch information
Tadeusz Sośnierz committed Oct 1, 2011
2 parents 422048a + 2ea19fd commit a430d8d
Show file tree
Hide file tree
Showing 10 changed files with 15,879 additions and 15,266 deletions.
2 changes: 1 addition & 1 deletion src/HLL/SerializationContextBuilder.pm
Expand Up @@ -48,7 +48,7 @@ class HLL::Compiler::SerializationContextBuilder {
# in the context.
has %!addr_to_slot;
sub addr($obj) {
pir::get_addr__IP($obj)
pir::get_id__IP($obj)
}

# The event stream that builds or fixes up objects.
Expand Down
4 changes: 2 additions & 2 deletions src/Regex/Cursor-protoregex-peek.pir
Expand Up @@ -75,7 +75,7 @@ Perform a match for protoregex C<name>.
$I0 = isa rx, ['ResizablePMCArray']
if $I0 goto rx_array
.local int rxaddr
rxaddr = get_addr rx
rxaddr = get_id rx
$P0 = mcalled[rxaddr]
unless null $P0 goto token_next
result = self.rx()
Expand All @@ -88,7 +88,7 @@ Perform a match for protoregex C<name>.
cand_loop:
unless rx_it goto cand_done
rx = shift rx_it
rxaddr = get_addr rx
rxaddr = get_id rx
$P0 = mcalled[rxaddr]
unless null $P0 goto cand_loop
result = self.rx()
Expand Down
3,470 changes: 1,735 additions & 1,735 deletions src/stage0/HLL-s0.pir

Large diffs are not rendered by default.

0 comments on commit a430d8d

Please sign in to comment.