This ticket was updated to reflect that both scheme and Tcl still used Perl*
pmcs.
Attached is a patch for scheme that removes the Perl* from it.
FYI, the following two tests fail before and after my patch. (Updated
LANGUAGES.STATUS to reflect this.)
Failed Test Stat Wstat Total Fail Failed List of Failed
-------------------------------------------------------------------------------
scheme/t/logic/defines.t 2 512 12 2 16.67% 9-10
Leaving this for the Scheme mainters to apply.
Regards.
Index: Scheme/Generator.pm
===================================================================
--- Scheme/Generator.pm (revision 8308)
+++ Scheme/Generator.pm (working copy)
@@ -192,10 +192,10 @@
if ($from =~ /P/) {
$self->_add_inst ('', 'clone',[$to,$from]);
} elsif ($from =~ /I/) {
- $self->_add_inst ('', 'new',[$to,'.PerlInt']);
+ $self->_add_inst ('', 'new',[$to,'.Integer']);
$self->_add_inst ('', 'set',[$to,$from]);
} elsif ($from =~ /N/) {
- $self->_add_inst ('', 'new',[$to,'.PerlNum']);
+ $self->_add_inst ('', 'new',[$to,'.Float']);
$self->_add_inst ('', 'set',[$to,$from]);
}
}
@@ -209,22 +209,22 @@
if (exists $node->{value}) {
my $value = $node->{value};
if ($value =~ /^[-+]?\d+$/) {
- $self->_add_inst ('', 'new',[$return,'.PerlInt']);
+ $self->_add_inst ('', 'new',[$return,'.Integer']);
$self->_add_inst ('', 'set',[$return,$value]);
}
elsif ($value =~ /^[-+]?((\d+\.\d*)|(\.d+))([eE][-+]?\d+)?$/) {
- $self->_add_inst ('', 'new',[$return,'.PerlNum']);
+ $self->_add_inst ('', 'new',[$return,'.Float']);
$self->_add_inst ('', 'set',[$return,$value]);
}
else { # assume its a symbol
- $self->_add_inst ('', 'new',[$return,'.PerlString']);
+ $self->_add_inst ('', 'new',[$return,'.String']);
$self->_add_inst ('', 'set',[$return,"\"$value\""]);
}
}
elsif (exists $node->{children}) {
my $children = $node->{children};
- $self->_add_inst ('', 'new', [$return,'.PerlUndef']);
+ $self->_add_inst ('', 'new', [$return,'.Undef']);
for (reverse @$children) {
if (exists $_->{children}) {
my $arg0 = _get_arg($_, 0);
@@ -314,7 +314,7 @@
# check for empty list
$self->_add_inst('', 'typeof', [$type, $list]);
- $self->_add_inst('', 'eq', [$type,'.PerlUndef',"DONE_$label"]);
+ $self->_add_inst('', 'eq', [$type,'.Undef',"DONE_$label"]);
my $copy = $self->_new_pair;
@@ -328,7 +328,7 @@
$self->_add_inst('', 'set', [$list,$list.'[1]']);
$self->_add_inst('', 'typeof', [$type,$list]);
- $self->_add_inst('', 'eq', [$type,'.PerlUndef',"FINISH_$label"]);
+ $self->_add_inst('', 'eq', [$type,'.Undef',"FINISH_$label"]);
$temp = $self->_new_pair;
$self->_add_inst('', 'set', [$copy.'[1]',$temp]);
@@ -724,7 +724,7 @@
my $temp = $self->_generate(_get_arg($node,1));
$self->_add_inst ('', 'typeof',[$return,$temp]);
- $self->_add_inst ('', 'ne', [$return,'.PerlUndef',"FAIL_$label"]);
+ $self->_add_inst ('', 'ne', [$return,'.Undef',"FAIL_$label"]);
$self->_add_inst ('', 'set', [$return,1]);
$self->_add_inst ('', 'branch', ["DONE_$label"]);
$self->_add_inst ("FAIL_$label", 'set', [$return,0]);
@@ -742,7 +742,7 @@
my $label = $self->_gensym ();
my $return = $self->_save_1 ('P');
- $self->_add_inst ('', 'new',[$return,'.PerlUndef']);
+ $self->_add_inst ('', 'new',[$return,'.Undef']);
my @reverse = reverse _get_args($node);
@@ -774,7 +774,7 @@
$self->_add_inst ('', 'set',[$return,'0']);
my $type = $self->_save_1 ('I');
$self->_add_inst ("NEXT_$label", 'typeof',[$type,$list]);
- $self->_add_inst ('', 'eq',[$type,'.PerlUndef', "DONE_$label"]);
+ $self->_add_inst ('', 'eq',[$type,'.Undef', "DONE_$label"]);
$self->_add_inst ('', 'ne',[$type,'.Array', "ERR_$label"]);
$self->_add_inst ('', 'inc',[$return]);
$self->_add_inst ('', 'set',[$list,$list.'[1]']);
Index: Scheme/Builtins.pm
===================================================================
--- Scheme/Builtins.pm (revision 8308)
+++ Scheme/Builtins.pm (working copy)
@@ -10,7 +10,7 @@
write =>
[['# Write function', ''],
['write_ENTRY', 'typeof', 'I0', 'P5'],
- ['', 'ne', 'I0', '.PerlUndef', 'write_N_UNDEF'],
+ ['', 'ne', 'I0', '.Undef', 'write_N_UNDEF'],
['', 'print', '"()"'],
['', 'branch', 'write_RET'],
['write_N_UNDEF','ne', 'I0', '.Scratchpad', 'write_N_LAMBDA'],
@@ -31,7 +31,7 @@
['', 'restore', 'P6'],
['', 'set', 'P5', 'P6[1]'],
['', 'typeof', 'I0', 'P5'],
- ['', 'eq', 'I0', '.PerlUndef', 'write_KET'],
+ ['', 'eq', 'I0', '.Undef', 'write_KET'],
['', 'ne', 'I0', '.Array', 'write_DOT'],
['', 'print', '" "'],
['', 'branch', 'write_NEXT'],
@@ -49,42 +49,42 @@
['', 'typeof', 'I16', 'P16'],
['', 'set', 'I1', 0],
['', 'set', 'I2', 0],
- ['', 'eq', 'I16', '.PerlUndef', 'apply_CALL'],
+ ['', 'eq', 'I16', '.Undef', 'apply_CALL'],
['', 'set', 'P5', 'P16[0]'],
['', 'bsr', 'apply_HELP'],
- ['', 'eq', 'I16', '.PerlUndef', 'apply_CALL'],
+ ['', 'eq', 'I16', '.Undef', 'apply_CALL'],
['', 'set', 'P6', 'P16[0]'],
['', 'bsr', 'apply_HELP'],
- ['', 'eq', 'I16', '.PerlUndef', 'apply_CALL'],
+ ['', 'eq', 'I16', '.Undef', 'apply_CALL'],
['', 'set', 'P7', 'P16[0]'],
['', 'bsr', 'apply_HELP'],
- ['', 'eq', 'I16', '.PerlUndef', 'apply_CALL'],
+ ['', 'eq', 'I16', '.Undef', 'apply_CALL'],
['', 'set', 'P8', 'P16[0]'],
['', 'bsr', 'apply_HELP'],
- ['', 'eq', 'I16', '.PerlUndef', 'apply_CALL'],
+ ['', 'eq', 'I16', '.Undef', 'apply_CALL'],
['', 'set', 'P9', 'P16[0]'],
['', 'bsr', 'apply_HELP'],
- ['', 'eq', 'I16', '.PerlUndef', 'apply_CALL'],
+ ['', 'eq', 'I16', '.Undef', 'apply_CALL'],
['', 'set', 'P10', 'P16[0]'],
['', 'bsr', 'apply_HELP'],
- ['', 'eq', 'I16', '.PerlUndef', 'apply_CALL'],
+ ['', 'eq', 'I16', '.Undef', 'apply_CALL'],
['', 'set', 'P11', 'P16[0]'],
['', 'bsr', 'apply_HELP'],
- ['', 'eq', 'I16', '.PerlUndef', 'apply_CALL'],
+ ['', 'eq', 'I16', '.Undef', 'apply_CALL'],
['', 'set', 'P12', 'P16[0]'],
['', 'bsr', 'apply_HELP'],
- ['', 'eq', 'I16', '.PerlUndef', 'apply_CALL'],
+ ['', 'eq', 'I16', '.Undef', 'apply_CALL'],
['', 'set', 'P13', 'P16[0]'],
['', 'bsr', 'apply_HELP'],
- ['', 'eq', 'I16', '.PerlUndef', 'apply_CALL'],
+ ['', 'eq', 'I16', '.Undef', 'apply_CALL'],
['', 'set', 'P14', 'P16[0]'],
['', 'bsr', 'apply_HELP'],
- ['', 'eq', 'I16', '.PerlUndef', 'apply_CALL'],
+ ['', 'eq', 'I16', '.Undef', 'apply_CALL'],
['', 'set', 'P15', 'P16[0]'],
['', 'bsr', 'apply_HELP'],
- ['', 'eq', 'I16', '.PerlUndef', 'apply_CALL'],
+ ['', 'eq', 'I16', '.Undef', 'apply_CALL'],
['', 'set', 'P17', 'P16'],
- ['apply_COUNT', 'ne', 'I16', '.PerlUndef', 'apply_ARRAY'],
+ ['apply_COUNT', 'ne', 'I16', '.Undef', 'apply_ARRAY'],
['', 'inc', 'I2'],
['', 'set', 'P17', 'P17[1]'],
['', 'typeof', 'I16', 'P17'],
