[v6] Fix Match leak in trait_mod:of

sorear · Nov 17, 2010 · 08c9807 · 08c9807
1 parent 3392666
commit 08c9807
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 0 deletions.
diff --git a/lib/JSYNC.cs b/lib/JSYNC.cs
@@ -4,6 +4,8 @@
 using System.Text;
 
 public class JsyncWriter {
+    static bool FailSoft =
+        Environment.GetEnvironmentVariable("NIECZA_JSYNC_WRITER_FAILSOFT") != null;
     StringBuilder o = new StringBuilder();
     Dictionary<object,int> anchors = new Dictionary<object,int>();
     int nextanchor = 0;
@@ -83,6 +85,11 @@ public class JsyncWriter {
     }
 
     void WriteGeneral(IP6 obj) {
+        if (FailSoft && !(obj is DynObject)) {
+            o.AppendFormat("\"UNSERIALIZABLE {0}\"", obj.mo.name);
+            return;
+        }
+
         int a = nextanchor++;
         anchors[obj] = a;
         DynObject dyo = (DynObject) obj;

diff --git a/v6/tryfile b/v6/tryfile
@@ -56,6 +56,31 @@ augment class Hash {
 
 augment class STD {
     our $ALL;
+method gettrait($traitname,$param) {
+    my $text;
+    my $M;
+    if @$param {
+        $text = $param.[0].Str;
+        _subst($M, $text, /^\<(.*)\>$/, { $M[0] }) or
+            _subst($M, $text, /^\((.*)\)$/, { $M[0] });
+    }
+    if ($traitname eq 'export') {
+        if (defined $text) {
+            while _subst($M, $text, /\:/, "") { }
+        }
+        else {
+            $text = 'DEFAULT';
+        }
+        self.set_export($text);
+        $text;
+    }
+    elsif (defined $text) {
+        $text;
+    }
+    else {
+        1;
+    }
+}
 method find_stash ($n, $crlex = $*CURLEX) {
     my $name = $n;
     my $curlex = $crlex;
@@ -176,6 +201,11 @@ method do_import_aliases($pkg, *@names) {
 augment class STD::P6 {
 my %term            = (:dba('term')            , :prec<z=>);
 my %methodcall      = (:dba('methodcall')      , :prec<y=>, :assoc<unary>, :uassoc<left>, :fiddly, :!pure);
+    token trait_mod:of {
+        ['of'|'returns']:s <typename>
+        [ <?{ $*DECLARAND<of> }> <.sorry("Extra 'of' type; already declared as type " ~ $*DECLARAND<of>.Str)> ]?
+        { $*DECLARAND<of> = $<typename>.Str; }
+    }
     token dotty:sym<.*> {
         ('.' [ <[+*?=]> | '^' '!'? ]) :: <.unspacey> <dottyop>
         $<sym> = {$0.Str}