Changeset 22421 for misc

Timestamp:

09/27/08 04:06:40 (3 months ago)

Author:

putter

Message:

[elf] More backend neutrality.

Location:

misc/elf

Files:

• elf_h (modified) (25 diffs)
• elf_h_src/EmitSimpleP5.pm (modified) (7 diffs)
• elf_h_src/IRx1_FromAST.pm (modified) (7 diffs)
• elf_h_src/IRx1_FromAST_create.pl (modified) (7 diffs)
• elf_h_src/IRx1_Nodes.pm (modified) (1 diff)
• elf_h_src/IRx1_nodes_create.pl (modified) (1 diff)
• elf_h_src/Match.pm (modified) (3 diffs)

misc/elf/elf_h

@@ -35 +35 @@
   eval q{package autobox::universal; sub type { autobox->type($_[0]) }};
 }
-{package UNDEF; sub WHAT {"Undef"}}
 {package UNIVERSAL; sub ref {CORE::ref($_[0]) || autobox::universal::type($_[0]) } } # For IRx1_FromAST.pm.
 {package UNIVERSAL; sub WHAT {CORE::ref($_[0]) || autobox::universal::type($_[0]) } }
-
-{ package UNDEF;
-  sub perl { "undef" }
-}
 
 { package Any;
@@ -55 +50 @@
 { package Array; our $_tell_use_base_i_am_not_empty_; }
 { package Hash; our $_tell_use_base_i_am_not_empty_; }
+{ package Undef; our $_tell_use_base_i_am_not_empty_; }
 { package Code; our $_tell_use_base_i_am_not_empty_; }
 
+{package UNDEF;
+ use base "Undef";
+ sub WHAT {"Undef"}
+ sub perl { "undef" }
+}
 no warnings qw(redefine prototype);
 { package STRING;
@@ -67 +68 @@
     @g ? \@g : undef;
   }
+
+  sub re_gsub_inline ($$$) { # slower, but needed for $1 in replacement.
+    eval "\$_[0] =~ s/$_[1]/$_[2]/g";
+    Carp::confess($@) if $@;
+    $_[0]
+  }
+  sub re_gsub ($$$) {
+    $_[0] =~ s/$_[1]/$_[2]/g; $_[0]
+  }
+
+  # unused
+  sub re_sub         {
+    my $expr = "\$_[0] =~ s/$_[1]/$_[2]/".($_[3]||"");
+    eval $expr;
+    Carp::confess($@) if $@;
+    $_[0]
+  }
+
 
   # randomness taken from autobox::Core
@@ -299 +318 @@
 }
 
-{ package STRING;
-  sub re_sub         {
-    my $expr = "\$_[0] =~ s/$_[1]/$_[2]/".($_[3]||"");
-    eval $expr;
-    Carp::confess($@) if $@;
-    $_[0]
-  }
-  sub re_sub_g ($$$) {
-    eval "\$_[0] =~ s/$_[1]/$_[2]/g";
-    Carp::confess($@) if $@;
-    $_[0]
-  }
-  # legacy
-  sub re_gsub ($$$) {$_[0] =~ s/$_[1]/$_[2]/g; $_[0]}
-}
-
 { package GLOBAL;
 
@@ -390 +393 @@
 { package GLOBAL;
   sub fastundump {my($dump)=@_; eval("package Fastundump; ".$dump);}
+  sub mangle_name {my($name)=@_;
+    $name =~ s/([^\w])/"_".CORE::ord($1)/eg;
+    $name;
+  }
 }
 
@@ -780 +787 @@
 ;
 
-{ package ARRAY;
+{ package Array;
 use base "Any";(do{sub match_describe{my $self=CORE::shift;(do{((("\[\
 " . Match->indent($self->map(sub {my($e)=@_;
@@ -789 +796 @@
 ;
 
-{ package HASH;
+{ package Hash;
 use base "Any";(do{sub match_describe{my $self=CORE::shift;(do{my $s = "\{";
 for(($self->keys())->flatten){
@@ -809 +816 @@
 ;
 
-{ package STRING;
+{ package Str;
 use base "Any";(do{sub match_describe{my $self=CORE::shift;(do{(("\'" . $self) . "\'")})}})
 }
 ;
 
-{ package INTEGER;
+{ package Int;
 use base "Any";(do{sub match_describe{my $self=CORE::shift;(do{(("\'" . $self) . "\'")})}})
 }
 ;
 
-{ package FLOAT;
+{ package Num;
 use base "Any";(do{sub match_describe{my $self=CORE::shift;(do{(("\'" . $self) . "\'")})}})
 }
@@ -828 +835 @@
       package Main;
 
-{ package ARRAY;
+{ package Array;
 use base "Any";(do{sub irx1_describe{my $self=CORE::shift;(do{(("\[" . $self->map(sub {my($e)=@_;
 (do{$e->irx1_describe()})})->join("\,")) . "\]")})}})
@@ -834 +841 @@
 ;
 
-{ package STRING;
+{ package Str;
 use base "Any";(do{sub irx1_describe{my $self=CORE::shift;(do{($self . "")})}})
 }
 ;
 
-{ package INTEGER;
+{ package Int;
 use base "Any";(do{sub irx1_describe{my $self=CORE::shift;(do{($self . "")})}})
 }
 ;
 
-{ package FLOAT;
+{ package Num;
 use base "Any";(do{sub irx1_describe{my $self=CORE::shift;(do{($self . "")})}})
 }
 ;
 
-{ package UNDEF;
+{ package Undef;
 use base "Any";(do{sub irx1_describe{my $self=CORE::shift;(do{"undef"})}})
 }
@@ -1937 +1944 @@
 ;
 
-{ package ARRAY;
+{ package Array;
 use base "Any";(do{sub make_ir_from_Match_tree{my $self=CORE::shift;(do{$self->map(sub {my($e)=@_;
 (do{$e->make_ir_from_Match_tree()})})})}})
@@ -1943 +1950 @@
 ;
 
-{ package STRING;
+{ package Str;
 use base "Any";(do{sub make_ir_from_Match_tree{my $self=CORE::shift;(do{$self})}})
 }
 ;
 
-{ package INTEGER;
+{ package Int;
 use base "Any";(do{sub make_ir_from_Match_tree{my $self=CORE::shift;(do{$self})}})
 }
 ;
 
-{ package FLOAT;
+{ package Num;
 use base "Any";(do{sub make_ir_from_Match_tree{my $self=CORE::shift;(do{$self})}})
 }
 ;
 
-{ package UNDEF;
+{ package Undef;
 use base "Any";(do{sub make_ir_from_Match_tree{my $self=CORE::shift;(do{$self})}})
 }
@@ -2046 +2053 @@
 my $ident = ("postcircumfix\:" . $name);
 my $args = irbuild_ir($m->{"hash"}->{"kludge_name"});
-if(($args && (($args->ref() ne "ARRAY")))) {
+if(($args && (($args->WHAT() ne "Array")))) {
 (do{($args = [$args])})
 };
@@ -2055 +2062 @@
 my $ident = ("postcircumfix\:" . $name);
 my $args = irbuild_ir($m->{"hash"}->{"kludge_name"});
-if(($args && (($args->ref() ne "ARRAY")))) {
+if(($args && (($args->WHAT() ne "Array")))) {
 (do{($args = [$args])})
 };
@@ -2119 +2126 @@
 $self->add_constructor("quote\:q", sub {my($m)=@_;
 (do{my $s = irbuild_ir($m->{"hash"}->{"text"});
-$s->re_sub_g("\\\\\(\[\\\\\'\]\)", "\$1");
+$s->re_gsub_inline("\\\\\(\[\\\\\'\]\)", "\$1");
 IRx1::Buf->newp($m, $s)})});
 $self->add_constructor("quote\:qq", sub {my($m)=@_;
@@ -2126 +2133 @@
 ");
 $s->re_gsub("\(\?\<\!\\\\\)\\\\t", "\   ");
-$s->re_sub_g("\\\\\(\.\)", "\$1");
+$s->re_gsub_inline("\\\\\(\.\)", "\$1");
 IRx1::Buf->newp($m, $s)})});
 $self->add_constructor("quote\:regex", sub {my($m)=@_;
@@ -2158 +2165 @@
 (do{my $slf = IRx1::Apply->newp($m, "self", IRx1::Capture->newp($m, []));
 my $args = irbuild_ir($m->{"hash"}->{"postcircumfix"}->{"hash"}->{"kludge_name"});
-if(($args && (($args->ref() ne "ARRAY")))) {
+if(($args && (($args->WHAT() ne "Array")))) {
 (do{($args = [$args])})
 };
@@ -2183 +2190 @@
 my $name = ((GLOBAL::substr($s, 0, 1) . "\ ") . GLOBAL::substr($s, (-1), 1));
 my $args = irbuild_ir($m->{"hash"}->{"kludge_name"});
-if(($args && (($args->ref() ne "ARRAY")))) {
+if(($args && (($args->WHAT() ne "Array")))) {
 (do{($args = [$args])})
 };
@@ -2807 +2814 @@
 \ \ eval\ q\{package\ autobox\:\:universal\;\ sub\ type\ \{\ autobox\-\>type\(\$_\[0\]\)\ \}\}\;\
 \}\
-\{package\ UNDEF\;\ sub\ WHAT\ \{\"Undef\"\}\}\
 \{package\ UNIVERSAL\;\ sub\ ref\ \{CORE\:\:ref\(\$_\[0\]\)\ \|\|\ autobox\:\:universal\:\:type\(\$_\[0\]\)\ \}\ \}\ \#\ For\ IRx1_FromAST\.pm\.\
 \{package\ UNIVERSAL\;\ sub\ WHAT\ \{CORE\:\:ref\(\$_\[0\]\)\ \|\|\ autobox\:\:universal\:\:type\(\$_\[0\]\)\ \}\ \}\
-\
-\{\ package\ UNDEF\;\
-\ \ sub\ perl\ \{\ \"undef\"\ \}\
-\}\
 \
 \{\ package\ Any\;\
@@ -2827 +2829 @@
 \{\ package\ Array\;\ our\ \$_tell_use_base_i_am_not_empty_\;\ \}\
 \{\ package\ Hash\;\ our\ \$_tell_use_base_i_am_not_empty_\;\ \}\
+\{\ package\ Undef\;\ our\ \$_tell_use_base_i_am_not_empty_\;\ \}\
 \{\ package\ Code\;\ our\ \$_tell_use_base_i_am_not_empty_\;\ \}\
 \
+\{package\ UNDEF\;\
+\ use\ base\ \"Undef\"\;\
+\ sub\ WHAT\ \{\"Undef\"\}\
+\ sub\ perl\ \{\ \"undef\"\ \}\
+\}\
 no\ warnings\ qw\(redefine\ prototype\)\;\
 \{\ package\ STRING\;\
@@ -2839 +2847 @@
 \ \ \ \ \@g\ \?\ \\\@g\ \:\ undef\;\
 \ \ \}\
+\
+\ \ sub\ re_gsub_inline\ \(\$\$\$\)\ \{\ \#\ slower\,\ but\ needed\ for\ \$1\ in\ replacement\.\
+\ \ \ \ eval\ \"\\\$_\[0\]\ \=\~\ s\/\$_\[1\]\/\$_\[2\]\/g\"\;\
+\ \ \ \ Carp\:\:confess\(\$\@\)\ if\ \$\@\;\
+\ \ \ \ \$_\[0\]\
+\ \ \}\
+\ \ sub\ re_gsub\ \(\$\$\$\)\ \{\
+\ \ \ \ \$_\[0\]\ \=\~\ s\/\$_\[1\]\/\$_\[2\]\/g\;\ \$_\[0\]\
+\ \ \}\
+\
+\ \ \#\ unused\
+\ \ sub\ re_sub\ \ \ \ \ \ \ \ \ \{\
+\ \ \ \ my\ \$expr\ \=\ \"\\\$_\[0\]\ \=\~\ s\/\$_\[1\]\/\$_\[2\]\/\"\.\(\$_\[3\]\|\|\"\"\)\;\
+\ \ \ \ eval\ \$expr\;\
+\ \ \ \ Carp\:\:confess\(\$\@\)\ if\ \$\@\;\
+\ \ \ \ \$_\[0\]\
+\ \ \}\
+\
 \
 \ \ \#\ randomness\ taken\ from\ autobox\:\:Core\
@@ -3071 +3097 @@
 \}\
 \
-\{\ package\ STRING\;\
-\ \ sub\ re_sub\ \ \ \ \ \ \ \ \ \{\
-\ \ \ \ my\ \$expr\ \=\ \"\\\$_\[0\]\ \=\~\ s\/\$_\[1\]\/\$_\[2\]\/\"\.\(\$_\[3\]\|\|\"\"\)\;\
-\ \ \ \ eval\ \$expr\;\
-\ \ \ \ Carp\:\:confess\(\$\@\)\ if\ \$\@\;\
-\ \ \ \ \$_\[0\]\
-\ \ \}\
-\ \ sub\ re_sub_g\ \(\$\$\$\)\ \{\
-\ \ \ \ eval\ \"\\\$_\[0\]\ \=\~\ s\/\$_\[1\]\/\$_\[2\]\/g\"\;\
-\ \ \ \ Carp\:\:confess\(\$\@\)\ if\ \$\@\;\
-\ \ \ \ \$_\[0\]\
-\ \ \}\
-\ \ \#\ legacy\
-\ \ sub\ re_gsub\ \(\$\$\$\)\ \{\$_\[0\]\ \=\~\ s\/\$_\[1\]\/\$_\[2\]\/g\;\ \$_\[0\]\}\
-\}\
-\
 \{\ package\ GLOBAL\;\
 \
@@ -3162 +3172 @@
 \{\ package\ GLOBAL\;\
 \ \ sub\ fastundump\ \{my\(\$dump\)\=\@_\;\ eval\(\"package\ Fastundump\;\ \"\.\$dump\)\;\}\
+\ \ sub\ mangle_name\ \{my\(\$name\)\=\@_\;\
+\ \ \ \ \$name\ \=\~\ s\/\(\[\^\\w\]\)\/\"_\"\.CORE\:\:ord\(\$1\)\/eg\;\
+\ \ \ \ \$name\;\
+\ \ \}\
 \}\
 \
@@ -3334 +3348 @@
 if(($n->is_context())) {
 (do{my $name = $self->e($n->var());
-$name->re_sub_g("\^\(\.\)\:\:", "\$1");
+$name->re_gsub("\^\(\.\)\:\:", "\$1");
 ((((((("\{package\ main\;\ use\ vars\ \'" . $name) . "\'\}\;") . "local") . "\ ") . $self->e($n->var())) . $default))})
 }elsif(($n->is_temp())) {
@@ -3501 +3515 @@
 }})};
 sub mangle_function_name{my $self=CORE::shift;my($name)=@_;
-(do{$name->re_sub("\^\(\\w\+\)\:\(\?\!\:\)", "\$\{1\}_");
-$name->re_sub("\(\[\^\\w\]\)", "\"_\"\.CORE\:\:ord\(\$1\)", "eg");
+(do{$name->re_gsub_inline("\^\(\\w\+\)\:\(\?\!\:\)", "\$\{1\}_");
+($name = GLOBAL::mangle_name($name));
 $name})};
 sub cb__Apply{my $self=CORE::shift;my($n)=@_;

misc/elf/elf_h_src/EmitSimpleP5.pm

@@ -68 +68 @@
   eval q{package autobox::universal; sub type { autobox->type($_[0]) }};
 }
-{package UNDEF; sub WHAT {"Undef"}}
 {package UNIVERSAL; sub ref {CORE::ref($_[0]) || autobox::universal::type($_[0]) } } # For IRx1_FromAST.pm.
 {package UNIVERSAL; sub WHAT {CORE::ref($_[0]) || autobox::universal::type($_[0]) } }
-
-{ package UNDEF;
-  sub perl { "undef" }
-}
 
 { package Any;
@@ -88 +83 @@
 { package Array; our $_tell_use_base_i_am_not_empty_; }
 { package Hash; our $_tell_use_base_i_am_not_empty_; }
+{ package Undef; our $_tell_use_base_i_am_not_empty_; }
 { package Code; our $_tell_use_base_i_am_not_empty_; }
 
+{package UNDEF;
+ use base "Undef";
+ sub WHAT {"Undef"}
+ sub perl { "undef" }
+}
 no warnings qw(redefine prototype);
 { package STRING;
@@ -100 +101 @@
     @g ? \@g : undef;
   }
+
+  sub re_gsub_inline ($$$) { # slower, but needed for $1 in replacement.
+    eval "\$_[0] =~ s/$_[1]/$_[2]/g";
+    Carp::confess($@) if $@;
+    $_[0]
+  }
+  sub re_gsub ($$$) {
+    $_[0] =~ s/$_[1]/$_[2]/g; $_[0]
+  }
+
+  # unused
+  sub re_sub         {
+    my $expr = "\$_[0] =~ s/$_[1]/$_[2]/".($_[3]||"");
+    eval $expr;
+    Carp::confess($@) if $@;
+    $_[0]
+  }
+
 
   # randomness taken from autobox::Core
@@ -332 +351 @@
 }
 
-{ package STRING;
-  sub re_sub         {
-    my $expr = "\$_[0] =~ s/$_[1]/$_[2]/".($_[3]||"");
-    eval $expr;
-    Carp::confess($@) if $@;
-    $_[0]
-  }
-  sub re_sub_g ($$$) {
-    eval "\$_[0] =~ s/$_[1]/$_[2]/g";
-    Carp::confess($@) if $@;
-    $_[0]
-  }
-  # legacy
-  sub re_gsub ($$$) {$_[0] =~ s/$_[1]/$_[2]/g; $_[0]}
-}
-
 { package GLOBAL;
 
@@ -423 +426 @@
 { package GLOBAL;
   sub fastundump {my($dump)=@_; eval("package Fastundump; ".$dump);}
+  sub mangle_name {my($name)=@_;
+    $name =~ s/([^\w])/"_".CORE::ord($1)/eg;
+    $name;
+  }
 }
 
@@ -566 +573 @@
       if ($n.is_context) { # BOGUS
         my $name = $.e($n.var);
-        $name.re_sub_g('^(.)::','$1');
+        $name.re_gsub('^(.)::','$1');
         ("{package main; use vars '"~$name~"'};"~
          'local'~' '~$.e($n.var)~$default)
@@ -738 +745 @@
   };
   method mangle_function_name($name) {
-     $name.re_sub('^(\w+):(?!:)','${1}_');
-     $name.re_sub('([^\w])','"_".CORE::ord($1)','eg');
+     $name.re_gsub_inline('^(\w+):(?!:)','${1}_');
+     $name = mangle_name($name);
      $name;
   }

misc/elf/elf_h_src/IRx1_FromAST.pm

@@ -25 +25 @@
   }
 };
-class ARRAY {
+class Array {
   method make_ir_from_Match_tree() {
     self.map(sub($e){$e.make_ir_from_Match_tree()})
   }
 };
-class STRING {
+class Str {
   method make_ir_from_Match_tree() {
     self
   }
 };
-class INTEGER {
+class Int {
   method make_ir_from_Match_tree() {
     self
   }
 };
-class FLOAT {
+class Num {
   method make_ir_from_Match_tree() {
     self
   }
 };
-class UNDEF {
+class Undef {
   method make_ir_from_Match_tree() {
     self
@@ -153 +153 @@
 my $ident = "postcircumfix:"~$name;
 my $args = irbuild_ir($m.{'hash'}{'kludge_name'});
-if $args && ($args.ref ne 'ARRAY')  { $args = [$args] }
+if $args && ($args.WHAT ne 'Array')  { $args = [$args] }
 IRx1::Call.newp($m,$blackboard::expect_term_base,$ident,IRx1::Capture.newp($m,$args||[]));
     });
@@ -162 +162 @@
 my $ident = "postcircumfix:"~$name;
 my $args = irbuild_ir($m.{'hash'}{'kludge_name'});
-if $args && ($args.ref ne 'ARRAY')  { $args = [$args] }
+if $args && ($args.WHAT ne 'Array')  { $args = [$args] }
 IRx1::Call.newp($m,$blackboard::expect_term_base,$ident,IRx1::Capture.newp($m,$args||[]));
     });
@@ -251 +251 @@
     $.add_constructor('quote:q', sub ($m) {
       my $s = irbuild_ir($m.{'hash'}{'text'});
-$s.re_sub_g('\\\\([\\\\\'])','$1');
+$s.re_gsub_inline('\\\\([\\\\\'])','$1');
 IRx1::Buf.newp($m,$s);
     });
@@ -259 +259 @@
 $s.re_gsub('(?<!\\\\)\\\\n',"\n");
 $s.re_gsub('(?<!\\\\)\\\\t',"\t");
-$s.re_sub_g('\\\\(.)','$1');
+$s.re_gsub_inline('\\\\(.)','$1');
 IRx1::Buf.newp($m,$s);
     });
@@ -305 +305 @@
   my $slf = IRx1::Apply.newp($m,'self',IRx1::Capture.newp($m,[]));
   my $args = irbuild_ir($m.{'hash'}{'postcircumfix'}.{'hash'}{'kludge_name'});
-  if $args && ($args.ref ne 'ARRAY')  { $args = [$args] }
+  if $args && ($args.WHAT ne 'Array')  { $args = [$args] }
   IRx1::Call.newp($m,$slf,irbuild_ir($m.{'hash'}{'desigilname'}),IRx1::Capture.newp($m,$args||[]))
 } else {
@@ -336 +336 @@
 my $name = substr($s,0,1)~' '~substr($s,-1,1);
 my $args = irbuild_ir($m.{'hash'}{'kludge_name'});
-if $args && ($args.ref ne 'ARRAY')  { $args = [$args] }
+if $args && ($args.WHAT ne 'Array')  { $args = [$args] }
 IRx1::Apply.newp($m,"circumfix:"~$name,IRx1::Capture.newp($m,$args||[]));
     });

misc/elf/elf_h_src/IRx1_FromAST_create.pl

@@ -85 +85 @@
 my $ident = "postcircumfix:"~$name;
 my $args = $m<kludge_name>;
-if $args && ($args.ref ne 'ARRAY')  { $args = [$args] }
+if $args && ($args.WHAT ne 'Array')  { $args = [$args] }
 Call.newp($blackboard::expect_term_base,$ident,Capture.newp($args||[]))
 
@@ -93 +93 @@
 my $ident = "postcircumfix:"~$name;
 my $args = $m<kludge_name>;
-if $args && ($args.ref ne 'ARRAY')  { $args = [$args] }
+if $args && ($args.WHAT ne 'Array')  { $args = [$args] }
 Call.newp($blackboard::expect_term_base,$ident,Capture.newp($args||[]))
 
@@ -170 +170 @@
 quote:q
 my $s = $m<text>;
-$s.re_sub_g('\\\\([\\\\\'])','$1');
+$s.re_gsub_inline('\\\\([\\\\\'])','$1');
 Buf.newp($s)
 
@@ -177 +177 @@
 $s.re_gsub('(?<!\\\\)\\\\n',"\n");
 $s.re_gsub('(?<!\\\\)\\\\t',"\t");
-$s.re_sub_g('\\\\(.)','$1');
+$s.re_gsub_inline('\\\\(.)','$1');
 Buf.newp($s)
 
@@ -217 +217 @@
     my $slf = Apply.newp('self',Capture.newp([]));
     my $args = $m<postcircumfix><kludge_name>;
-    if $args && ($args.ref ne 'ARRAY')  { $args = [$args] }
+    if $args && ($args.WHAT ne 'Array')  { $args = [$args] }
     Call.newp($slf,$m<desigilname>,Capture.newp($args||[]))
   } else {
@@ -244 +244 @@
 my $name = substr($s,0,1)~' '~substr($s,-1,1); # XXX :(
 my $args = $m<kludge_name>;
-if $args && ($args.ref ne 'ARRAY')  { $args = [$args] }
+if $args && ($args.WHAT ne 'Array')  { $args = [$args] }
 Apply.newp("circumfix:"~$name,Capture.newp($args||[]))
 
@@ -588 +588 @@
   }
 };
-class ARRAY {
+class Array {
   method make_ir_from_Match_tree() {
     self.map(sub($e){$e.make_ir_from_Match_tree()})
   }
 };
-class STRING {
+class Str {
   method make_ir_from_Match_tree() {
     self
   }
 };
-class INTEGER {
+class Int {
   method make_ir_from_Match_tree() {
     self
   }
 };
-class FLOAT {
+class Num {
   method make_ir_from_Match_tree() {
     self
   }
 };
-class UNDEF {
+class Undef {
   method make_ir_from_Match_tree() {
     self

misc/elf/elf_h_src/IRx1_Nodes.pm

@@ -1 +1 @@
 # Warning: This file is mechanically written.  Your changes will be overwritten.
-package ARRAY {
+package Array {
   method irx1_describe() {
     '[' ~ self.map(sub($e){$e.irx1_describe}).join(",") ~ ']'
   };
 };
-package STRING {
+package Str {
   method irx1_describe() {
     self ~ ""
   };
 };
-package INTEGER {
+package Int {
   method irx1_describe() {
     self ~ ""
   };
 };
-package FLOAT {
+package Num {
   method irx1_describe() {
     self ~ ""
   };
 };
-package UNDEF {
+package Undef {
   method irx1_describe() {
     'undef'

misc/elf/elf_h_src/IRx1_nodes_create.pl

@@ -172 +172 @@
   my $code = "".unindent(<<'  END');
     # Warning: This file is mechanically written.  Your changes will be overwritten.
-    package ARRAY {
+    package Array {
       method irx1_describe() {
         '[' ~ self.map(sub($e){$e.irx1_describe}).join(",") ~ ']'
       };
     };
-    package STRING {
+    package Str {
       method irx1_describe() {
         self ~ ""
       };
     };
-    package INTEGER {
+    package Int {
       method irx1_describe() {
         self ~ ""
       };
     };
-    package FLOAT {
+    package Num {
       method irx1_describe() {
         self ~ ""
       };
     };
-    package UNDEF {
+    package Undef {
       method irx1_describe() {
         'undef'

misc/elf/elf_h_src/Match.pm

@@ -37 +37 @@
   }
 };
-class ARRAY {
+class Array {
   method match_describe() {
     ("[\n" ~
@@ -44 +44 @@
   }
 };
-class HASH {
+class Hash {
   method match_describe() {
     my $s = "{";
@@ -60 +60 @@
   };
 };