Merge branch 'master' of github.com:jnthn/6model

jnthn · Dec 4, 2010 · 512cfdb · 512cfdb
2 parents 8fbb45c + d08fd86
commit 512cfdb
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 15 deletions.
diff --git a/common/NQP/P6Objects.pm b/common/NQP/P6Objects.pm
@@ -23,7 +23,7 @@ class Mu {
     }
 
     method isa($type) {
-        return self.HOW.isa(self, $type);
+        self.HOW.isa(self, $type)
     }
 
     method Bool() {

diff --git a/dotnet/LHF.txt b/dotnet/LHF.txt
@@ -47,3 +47,17 @@ foundation for getting that in place. To do this:
    RakudoObject).
 3) Edit Actions.pm and make .WHO use the get_who op (see .WHAT and
    .HOW for examples).
+
+Constant Table Dupe Elimination
+-------------------------------
+DIFFICULTY: Intermediate
+SKILLS: NQP
+DETAILS:
+We have a constant table. This is good. However, in the program:
+  say("foo");
+  say("foo");
+The "foo" ends up in the constants table twice. This is not good.
+Take a look in multi sub dnst_for(PAST::Val $val) { ... } and see
+about eliminating the duplication. It happens for integer and
+numeric constants too. If you use some weird unique string you can
+easily look at x.cs to see it only appears once, not once per usage.
diff --git a/dotnet/compiler/DNST.pm b/dotnet/compiler/DNST.pm
@@ -375,6 +375,7 @@ class DNST::Bind is DNST::Node {
 class DNST::Literal is DNST::Node {
     has $!value;
     has $!escape;
+    has $!type;
 
     method value($set?) {
         if pir::defined($set) { $!value := $set }
@@ -386,10 +387,16 @@ class DNST::Literal is DNST::Node {
         $!escape
     }
 
-    method new(:$value!, :$escape) {
+    method type($set?) {
+        if pir::defined($set) { $!type := $set }
+        $!type
+    }
+
+    method new(:$value!, :$escape, :$type) {
         my $obj := self.CREATE;
         $obj.value($value);
         $obj.escape($escape);
+        $obj.type($type);
         $obj;
     }
 }

diff --git a/dotnet/compiler/PAST2DNSTCompiler.pm b/dotnet/compiler/PAST2DNSTCompiler.pm
@@ -894,32 +894,33 @@ our multi sub dnst_for(PAST::Val $val) {
         return DNST::Literal.new( :value($val.value<SBI>) );
     }
 
-    # Look up the type to box to.
-    my $type;
+    # Work out type to box to.
     my $primitive;
     if pir::isa($val.value, 'Integer') {
         $primitive := 'int';
-        $type := 'NQPInt';
     }
     elsif pir::isa($val.value, 'String') {
         $primitive := 'str';
-        $type := 'NQPStr';
     }
     elsif pir::isa($val.value, 'Float') {
         $primitive := 'num';
-        $type := 'NQPNum';
     }
     else {
         pir::die("Can not detect type of value")
     }
-    my $*BIND_CONTEXT := 0;
-    my $type_dnst := emit_lexical_lookup($type);
+
+    # If we have a non-object type context, can hand back a literal value.
+    if $*TYPE_CONTEXT ne 'obj' {
+        return DNST::Literal.new(
+            :value($val.value),
+            :type(vm_type_for($primitive)),
+            :escape($primitive eq 'str')
+        );
+    }
 
-    # Add to constants table.
-    my $make_const := emit_op('box_' ~ $primitive,
-        DNST::Literal.new( :value($val.value), :escape($primitive eq 'str') ),
-        $type_dnst
-    );
+    # Otherwise, need to box it. Add to constants table if possible.
+    my $make_const := box($primitive, DNST::Literal.new(
+        :value($val.value), :escape($primitive eq 'str') ));
     if $*IN_LOADINIT || $*COMPILING_NQP_SETTING {
         return $make_const;
     }
@@ -1888,7 +1889,7 @@ sub emit_op($name, *@args) {
         # We may need to auto-unbox it if we don't have the desired type
         # of thing.
         if $*TYPE_CONTEXT ne 'obj' {
-            unless ($arg_dnst ~~ DNST::MethodCall || $arg_dnst ~~ DNST::Call)
+            unless ($arg_dnst ~~ DNST::MethodCall || $arg_dnst ~~ DNST::Call || $arg_dnst ~~ DNST::Literal)
               && $arg_dnst.type eq vm_type_for($*TYPE_CONTEXT) {
                 $arg_dnst := unbox($*TYPE_CONTEXT, $arg_dnst);
             }