cvs commit: parrot assemble.pl

[jgoff]

cvsuser     02/06/01 20:40:41

  Modified:    .        assemble.pl
  Log:
  The following key types are now supported:
  
  P1[32],P4[-0x32],P17[-0b01010],P31["foo"]
  
  Revision  Changes    Path
  1.55      +22 -9     parrot/assemble.pl
  
  Index: assemble.pl
  ===================================================================
  RCS file: /cvs/public/parrot/assemble.pl,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -w -r1.54 -r1.55
  --- assemble.pl       1 Jun 2002 08:06:53 -0000       1.54
  +++ assemble.pl       2 Jun 2002 03:40:41 -0000       1.55
  @@ -446,7 +446,7 @@
   sub _collect_labels {
     my $self = shift;
   
  -  my $label_re = qr([a-zA-Z0-9_]+);
  +  my $label_re = qr([a-zA-Z_][a-zA-Z0-9_]+);
   
     #
     # Collect label definition points first
  @@ -654,7 +654,7 @@
     my $str_re = qr(\"(?:[^\\\"]*(?:\\.[^\\\"]*)*)\" |
                     \'(?:[^\\\']*(?:\\.[^\\\']*)*)\'
                    )x;
  -  my $label_re = qr([a-zA-Z][a-zA-Z0-9_]*);
  +  my $label_re = qr([a-zA-Z_][a-zA-Z0-9_]*);
     my $pc = 0;
   
     $self->_collect_labels(); # Collect labels in a separate pass
  @@ -676,9 +676,9 @@
           $_->[0][0] .= "_".lc(substr($1,0,1));
           push @{$_->[0]}, [lc(substr($1,0,1)),$1];
         }
  -      elsif($temp=~s/^\[($reg_re)\]//) {
  -        $_->[0][0] .= "_".lc(substr($1,0,1));
  -        push @{$_->[0]}, [lc(substr($1,0,1)),$1];
  +      elsif($temp=~s/^\[(S\d+)\]//) { # The only key register should be Sn
  +        $_->[0][0] .= "_s";
  +        push @{$_->[0]}, ['s',$1];
         }
         elsif($temp=~s/^($flt_re)//) {
           $_->[0][0] .= "_nc";
  @@ -688,20 +688,33 @@
           $_->[0][0] .= "_sc";
           push @{$_->[0]}, $self->_string_constant($1);
         }
  -      elsif($temp=~s/^($bin_re)//) {
  +      elsif($temp=~s/^\[($bin_re)\]//) { # P3[0b11101]
  +        my $val = $1;$val=~s/0b//;
  +        $_->[0][0] .= "_ic";
  +        push @{$_->[0]}, ['ic',(strtol($val,2))[0]];
  +      }
  +      elsif($temp=~s/^\[($hex_re)\]//) { # P7[0x1234]
  +        $_->[0][0] .= "_ic";
  +        push @{$_->[0]}, ['ic',(strtol($1,16))[0]];
  +      }
  +      elsif($temp=~s/^\[($dec_re)\]//) { # P14[3]
  +        $_->[0][0] .= "_ic";
  +        push @{$_->[0]}, ['ic',0+$1];
  +      }
  +      elsif($temp=~s/^($bin_re)//) {     # 0b1101
           my $val = $1;$val=~s/0b//;
           $_->[0][0] .= "_ic";
           push @{$_->[0]}, ['ic',(strtol($val,2))[0]];
         }
  -      elsif($temp=~s/^($hex_re)//) {
  +      elsif($temp=~s/^($hex_re)//) {     # 0x12aF
           $_->[0][0] .= "_ic";
           push @{$_->[0]}, ['ic',(strtol($1,16))[0]];
         }
  -      elsif($temp=~s/^($dec_re)//) {
  +      elsif($temp=~s/^($dec_re)//) {     # -32
           $_->[0][0] .= "_ic";
           push @{$_->[0]}, ['ic',0+$1];
         }
  -      elsif($temp=~s/^($str_re)//) {
  +      elsif($temp=~s/^($str_re)//) {     # "Hello World"
           $_->[0][0] .= "_sc";
           push @{$_->[0]}, $self->_string_constant($1);
         }