Skip to content

Commit

Permalink
Merge pull request #421 from sgtatham/eval-ast-vector-gc-fix
Browse files Browse the repository at this point in the history 
vala: avoid half-constructed vectors being garbage-collected.
  • Loading branch information
@kanaka
kanaka authored Jul 16, 2019
2 parents 70305b6 + 9cb52cf commit 0614249
Show file tree
Hide file tree
Showing 9 changed files with 54 additions and 45 deletions.
11 changes: 6 additions & 5 deletions vala/step2_eval.vala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,12 @@ class Mal.Main : GLib.Object {
return result;
}
if (ast is Mal.Vector) {
var results = new GLib.List<Mal.Val>();
for (var iter = (ast as Mal.Vector).iter();
iter.nonempty(); iter.step())
results.append(EVAL(iter.deref(), env));
return new Mal.Vector.from_list(results);
var vec = ast as Mal.Vector;
var result = new Mal.Vector.with_size(vec.length);
var root = new GC.Root(result); (void)root;
for (var i = 0; i < vec.length; i++)
result[i] = EVAL(vec[i], env);
return result;
}
if (ast is Mal.Hashmap) {
var result = new Mal.Hashmap();
Expand Down
11 changes: 6 additions & 5 deletions vala/step3_env.vala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,12 @@ class Mal.Main : GLib.Object {
return result;
}
if (ast is Mal.Vector) {
var results = new GLib.List<Mal.Val>();
for (var iter = (ast as Mal.Vector).iter();
iter.nonempty(); iter.step())
results.append(EVAL(iter.deref(), env));
return new Mal.Vector.from_list(results);
var vec = ast as Mal.Vector;
var result = new Mal.Vector.with_size(vec.length);
var root = new GC.Root(result); (void)root;
for (var i = 0; i < vec.length; i++)
result[i] = EVAL(vec[i], env);
return result;
}
if (ast is Mal.Hashmap) {
var result = new Mal.Hashmap();
Expand Down
11 changes: 6 additions & 5 deletions vala/step4_if_fn_do.vala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,12 @@ class Mal.Main: GLib.Object {
return result;
}
if (ast is Mal.Vector) {
var results = new GLib.List<Mal.Val>();
for (var iter = (ast as Mal.Vector).iter();
iter.nonempty(); iter.step())
results.append(EVAL(iter.deref(), env));
return new Mal.Vector.from_list(results);
var vec = ast as Mal.Vector;
var result = new Mal.Vector.with_size(vec.length);
var root = new GC.Root(result); (void)root;
for (var i = 0; i < vec.length; i++)
result[i] = EVAL(vec[i], env);
return result;
}
if (ast is Mal.Hashmap) {
var result = new Mal.Hashmap();
Expand Down
11 changes: 6 additions & 5 deletions vala/step5_tco.vala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,12 @@ class Mal.Main : GLib.Object {
return result;
}
if (ast is Mal.Vector) {
var results = new GLib.List<Mal.Val>();
for (var iter = (ast as Mal.Vector).iter();
iter.nonempty(); iter.step())
results.append(EVAL(iter.deref(), env));
return new Mal.Vector.from_list(results);
var vec = ast as Mal.Vector;
var result = new Mal.Vector.with_size(vec.length);
var root = new GC.Root(result); (void)root;
for (var i = 0; i < vec.length; i++)
result[i] = EVAL(vec[i], env);
return result;
}
if (ast is Mal.Hashmap) {
var result = new Mal.Hashmap();
Expand Down
11 changes: 6 additions & 5 deletions vala/step6_file.vala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,12 @@ class Mal.Main : GLib.Object {
return result;
}
if (ast is Mal.Vector) {
var results = new GLib.List<Mal.Val>();
for (var iter = (ast as Mal.Vector).iter();
iter.nonempty(); iter.step())
results.append(EVAL(iter.deref(), env));
return new Mal.Vector.from_list(results);
var vec = ast as Mal.Vector;
var result = new Mal.Vector.with_size(vec.length);
var root = new GC.Root(result); (void)root;
for (var i = 0; i < vec.length; i++)
result[i] = EVAL(vec[i], env);
return result;
}
if (ast is Mal.Hashmap) {
var result = new Mal.Hashmap();
Expand Down
11 changes: 6 additions & 5 deletions vala/step7_quote.vala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,12 @@ class Mal.Main : GLib.Object {
return result;
}
if (ast is Mal.Vector) {
var results = new GLib.List<Mal.Val>();
for (var iter = (ast as Mal.Vector).iter();
iter.nonempty(); iter.step())
results.append(EVAL(iter.deref(), env));
return new Mal.Vector.from_list(results);
var vec = ast as Mal.Vector;
var result = new Mal.Vector.with_size(vec.length);
var root = new GC.Root(result); (void)root;
for (var i = 0; i < vec.length; i++)
result[i] = EVAL(vec[i], env);
return result;
}
if (ast is Mal.Hashmap) {
var result = new Mal.Hashmap();
Expand Down
11 changes: 6 additions & 5 deletions vala/step8_macros.vala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,12 @@ class Mal.Main : GLib.Object {
return result;
}
if (ast is Mal.Vector) {
var results = new GLib.List<Mal.Val>();
for (var iter = (ast as Mal.Vector).iter();
iter.nonempty(); iter.step())
results.append(EVAL(iter.deref(), env));
return new Mal.Vector.from_list(results);
var vec = ast as Mal.Vector;
var result = new Mal.Vector.with_size(vec.length);
var root = new GC.Root(result); (void)root;
for (var i = 0; i < vec.length; i++)
result[i] = EVAL(vec[i], env);
return result;
}
if (ast is Mal.Hashmap) {
var result = new Mal.Hashmap();
Expand Down
11 changes: 6 additions & 5 deletions vala/step9_try.vala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,12 @@ class Mal.Main : GLib.Object {
return result;
}
if (ast is Mal.Vector) {
var results = new GLib.List<Mal.Val>();
for (var iter = (ast as Mal.Vector).iter();
iter.nonempty(); iter.step())
results.append(EVAL(iter.deref(), env));
return new Mal.Vector.from_list(results);
var vec = ast as Mal.Vector;
var result = new Mal.Vector.with_size(vec.length);
var root = new GC.Root(result); (void)root;
for (var i = 0; i < vec.length; i++)
result[i] = EVAL(vec[i], env);
return result;
}
if (ast is Mal.Hashmap) {
var result = new Mal.Hashmap();
Expand Down
11 changes: 6 additions & 5 deletions vala/stepA_mal.vala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,12 @@ class Mal.Main : GLib.Object {
return result;
}
if (ast is Mal.Vector) {
var results = new GLib.List<Mal.Val>();
for (var iter = (ast as Mal.Vector).iter();
iter.nonempty(); iter.step())
results.append(EVAL(iter.deref(), env));
return new Mal.Vector.from_list(results);
var vec = ast as Mal.Vector;
var result = new Mal.Vector.with_size(vec.length);
var root = new GC.Root(result); (void)root;
for (var i = 0; i < vec.length; i++)
result[i] = EVAL(vec[i], env);
return result;
}
if (ast is Mal.Hashmap) {
var result = new Mal.Hashmap();
Expand Down

0 comments on commit 0614249

Please sign in to comment.