[stupid-crypto] 4 new revisions pushed by ben@links.org on 2010-05-30 13:44 GMT
stupid...@googlecode.com
Revision: 9a83637cf0
Author: Ben Laurie <b...@links.org>
Date: Sat May 29 13:15:22 2010
Log: Another test passes.
http://code.google.com/p/stupid-crypto/source/detail?r=9a83637cf0
Revision: 998af20352
Author: Ben Laurie <b...@links.org>
Date: Sun May 30 06:08:06 2010
Log: Fix some tests, break some others.
http://code.google.com/p/stupid-crypto/source/detail?r=998af20352
Revision: 8846eceda1
Author: Ben Laurie <b...@links.org>
Date: Sun May 30 06:24:51 2010
Log: Another test passes.
http://code.google.com/p/stupid-crypto/source/detail?r=8846eceda1
Revision: 219527a829
Author: Ben Laurie <b...@links.org>
Date: Sun May 30 06:27:55 2010
Log: Another test passes.
http://code.google.com/p/stupid-crypto/source/detail?r=219527a829
==============================================================================
Revision: 9a83637cf0
Author: Ben Laurie <b...@links.org>
Date: Sat May 29 13:15:22 2010
Log: Another test passes.
http://code.google.com/p/stupid-crypto/source/detail?r=9a83637cf0
Modified:
/src/Stupid2/C.pm
=======================================
--- /src/Stupid2/C.pm Sat May 29 12:59:33 2010
+++ /src/Stupid2/C.pm Sat May 29 13:15:22 2010
@@ -226,6 +226,14 @@
$self->{type}->dereference() if $self->{isReturn};
print $self->{name};
}
+
+sub Stupid2::Variable::emitParameter {
+ my $self = shift;
+
+ $self->{type}->emitParameter()
+ if !$self->{isReturn} && !$self->{isArgument};;
+ print $self->{name};
+}
sub Stupid2::ArrayRef::emitParameter {
my $self = shift;
==============================================================================
Revision: 998af20352
Author: Ben Laurie <b...@links.org>
Date: Sun May 30 06:08:06 2010
Log: Fix some tests, break some others.
http://code.google.com/p/stupid-crypto/source/detail?r=998af20352
Modified:
/src/stupid2.pl
/test2/array-small.stupid
=======================================
--- /src/stupid2.pl Sat May 29 12:59:33 2010
+++ /src/stupid2.pl Sun May 30 06:08:06 2010
@@ -1,7 +1,7 @@
#!/bin/sh
eval 'exec perl -x -w $0 ${1+"$@"}'
-#!perl actually starts here.
+#!perl actually starts here. Note this throws all lines numbers out by 3.
use strict;
@@ -40,6 +40,8 @@
$ptree->deduceWidth();
+use Data::Dumper; $Data::Dumper::Indent=1; print STDERR
Data::Dumper->Dump([\$ptree]) if $debug;
+
my $wrapped = new Stupid::LanguageWrapper($ptree);
$wrapped->{sourceFile} = $sourceFile;
@@ -174,10 +176,19 @@
return $self->{width}->value();
}
+
+sub equals {
+ my $self = shift;
+ my $other = shift;
+
+ return $self->{width} == $other->{width}
+ && $self->{signed} == $other->{signed};
+}
package Stupid2::ArrayWidth;
use strict;
+use Carp;
sub new {
my $class = shift;
@@ -192,6 +203,26 @@
return $self;
}
+
+sub getArrayElementWidth {
+ my $self = shift;
+
+ return $self->{width};
+}
+
+sub merge {
+ my $self = shift;
+ my $other = shift;
+
+ if(ref($other) ne ref($self)) {
+ croak 'Can\'t merge width of type '.ref($other)
+ .' with width of type '.ref($self);
+ }
+ croak 'Array widths differ'
if !$self->{width}->equals($other->{width});
+ $self->{count} = $other->{count} if !defined $self->{count};
+ return if !defined $other->{count};
+ croak 'Array counts differ' if $self->{count} != $other->{count};
+}
package Stupid2::HasWidth;
@@ -207,7 +238,7 @@
sub width {
my $self = shift;
- confess if !defined $self->{width};
+ confess 'No width set' if !defined $self->{width};
return $self->{width};
}
@@ -235,11 +266,13 @@
if(!defined $self->{width}) {
$self->{width} = $width;
- return;
} else {
- croak "Widths don't match" if !$self->{width}->equals($width);
- }
- $self->setChildrensWidth($width);
+ # Note that the width might be compatible but have more or
+ # less info, e.g. an ArrayWidth with no count. If the width
+ # is not compatible, then the callee should croak.
+ $self->{width}->merge($width);
+ }
+ $self->setChildrensWidth();
}
sub maybeSetWidth {
@@ -252,7 +285,7 @@
package Stupid2::HasWidthWithoutDeduction;
-# A base class for things with a width that cannot dedice their width
+# A base class for things with a width that cannot deduce their width
# from their children. Width should be set from on high.
use strict;
@@ -262,6 +295,11 @@
# can't!
}
+sub setChildrensWidth {
+ # if we can't work out our width from our children, then we can't
+ # work out their width from our width. I think.
+}
+
package Stupid2::Type::Int;
use strict;
@@ -719,6 +757,15 @@
$self->{offset}->deduceWidth();
$self->maybeSetWidth($self->{array}->memberWidth());
}
+
+sub setChildrensWidth {
+ my $self = shift;
+
+ # We don't know what the array count is, but we do know what its
+ # width should be.
+ my $array_width = new Stupid2::ArrayWidth(undef, $self->{width});
+ $self->{array}->setWidth($array_width);
+}
package Stupid2::StatementList;
@@ -1469,11 +1516,13 @@
package Stupid2::Type::Array;
use strict;
+use base qw(Stupid2::HasWidthWithoutDeduction);
use Carp;
sub new {
my $class = shift;
my $type = shift;
+ # FIXME: $size should be $count...
my $size = shift;
my $self = {};
@@ -1565,6 +1614,12 @@
return $self->{type}->memberWidth();
}
+
+sub setChildrensWidth {
+ my $self = shift;
+
+ $self->{type}->setWidth($self->{width});
+}
package Stupid::HexValue;
@@ -1655,3 +1710,12 @@
return $self->{values};
}
+
+sub setChildrensWidth {
+ my $self = shift;
+
+ my $child_width = $self->{width}->getArrayElementWidth();
+ foreach my $value (@{$self->{values}}) {
+ $value->setWidth($child_width);
+ }
+}
=======================================
--- /test2/array-small.stupid Sat May 29 08:41:06 2010
+++ /test2/array-small.stupid Sun May 30 06:08:06 2010
@@ -4,5 +4,6 @@
array(int_8u, 3) k = [65,66,67];
-o.put(k[2]);
-}
+"FIXME: should the size of 2 be automagic?";
+o.put(k[2_8]);
+}
==============================================================================
Revision: 8846eceda1
Author: Ben Laurie <b...@links.org>
Date: Sun May 30 06:24:51 2010
Log: Another test passes.
http://code.google.com/p/stupid-crypto/source/detail?r=8846eceda1
Modified:
/src/stupid2.pl
=======================================
--- /src/stupid2.pl Sun May 30 06:08:06 2010
+++ /src/stupid2.pl Sun May 30 06:24:51 2010
@@ -151,6 +151,9 @@
package Stupid2::Bitwidth;
+use strict;
+use Carp;
+
sub new {
my $class = shift;
my $width = shift;
@@ -162,6 +165,11 @@
$self->{width} = $width;
$self->{signed} = $signed;
+ croak 'Weird width'
+ if (!defined($self->{width}) && defined($self->{signed}))
+ || (defined($self->{width}) && !defined($self->{signed}));
+
+
return $self;
}
@@ -176,14 +184,39 @@
return $self->{width}->value();
}
+
+sub asString {
+ my $self = shift;
+
+ if(!defined $self->{width}) {
+ croak if defined $self->{signed};
+ return '[undefined]';
+ }
+
+ my $str = $self->{width}->value();
+ $str .= 'u' if !$self->{signed};
+}
sub equals {
my $self = shift;
my $other = shift;
- return $self->{width} == $other->{width}
+ return $self->{width}->value() == $other->{width}->value()
&& $self->{signed} == $other->{signed};
}
+
+sub merge {
+ my $self = shift;
+ my $other = shift;
+
+ $self->{width} = $other->{width} if !defined $self->{width};
+ $self->{signed} = $other->{signed} if !defined $self->{signed};
+
+ return if !defined $other->{width};
+
+ confess 'Can\'t merge non-identical Bitwidths: '.$self->asString()
+ .'/'.$other->asString() if !$self->equals($other);
+}
package Stupid2::ArrayWidth;
@@ -303,7 +336,7 @@
package Stupid2::Type::Int;
use strict;
-use base qw(Stupid2::HasWidth);
+use base qw(Stupid2::HasWidthWithoutDeduction);
sub new {
my $class = shift;
@@ -327,7 +360,7 @@
my $t = new Stupid2::ArrayValue();
foreach my $c (split //, $str) {
$t->append(new Stupid2::DecimalValue(ord($c),
- new Stupid2::Bitwidth(8, 0)));
+ new Stupid2::Bitwidth(new Stupid2::DecimalValue(8), 0)));
}
return $t;
@@ -903,6 +936,14 @@
$self->{left}->maybeSetWidth($self->{right}->maybeWidth());
$self->{right}->maybeSetWidth($self->{left}->maybeWidth());
}
+
+sub setChildrensWidth {
+ my $self = shift;
+ my $width = shift;
+
+ $self->{left}->setWidth($width);
+ $self->{right}->setWidth($width);
+}
package Stupid2::Set;
==============================================================================
Revision: 219527a829
Author: Ben Laurie <b...@links.org>
Date: Sun May 30 06:27:55 2010
Log: Another test passes.
http://code.google.com/p/stupid-crypto/source/detail?r=219527a829
Modified:
/test2/ostream-singlechar.stupid
=======================================
--- /test2/ostream-singlechar.stupid Sat May 29 09:26:46 2010
+++ /test2/ostream-singlechar.stupid Sun May 30 06:27:55 2010
@@ -1,5 +1,6 @@
"EXPECT:C";
function(ostream out) test() {
- out.put(67);
-}
+ "FIXME: we should be able to deduce the width here";
+ out.put(67_8);
+}