Skip to content

Commit

Permalink
Merge pull request kanaka#419 from asarhaddon/vala-remove-redundant-p…
Browse files Browse the repository at this point in the history 
…arameter

vala: remove a redundant parameter
  • Loading branch information
@kanaka
kanaka authored Jul 15, 2019
2 parents ed9f32c + 73030fa commit 70305b6
Show file tree
Hide file tree
Showing 8 changed files with 57 additions and 66 deletions.
15 changes: 7 additions & 8 deletions vala/step3_env.vala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,16 +101,16 @@ class Mal.Main : GLib.Object {
}

private static Mal.Val define_eval(Mal.Val key, Mal.Val value,
Mal.Env eval_env, Mal.Env def_env)
Mal.Env env)
throws Mal.Error {
var rootk = new GC.Root(key); (void)rootk;
var roote = new GC.Root(def_env); (void)roote;
var roote = new GC.Root(env); (void)roote;
var symkey = key as Mal.Sym;
if (symkey == null)
throw new Mal.Error.BAD_PARAMS(
"let*: expected a symbol to define");
var val = EVAL(value, eval_env);
def_env.set(symkey, val);
var val = EVAL(value, env);
env.set(symkey, val);
return val;
}

Expand All @@ -134,7 +134,7 @@ class Mal.Main : GLib.Object {
throw new Mal.Error.BAD_PARAMS(
"def!: expected two values");
return define_eval(list.next.data, list.next.next.data,
env, env);
env);
case "let*":
if (list.length() != 3)
throw new Mal.Error.BAD_PARAMS(
Expand All @@ -150,8 +150,7 @@ class Mal.Main : GLib.Object {
throw new Mal.Error.BAD_PARAMS(
"let*: expected an even-length list" +
" of definitions");
define_eval(iter.data, iter.next.data,
newenv, newenv);
define_eval(iter.data, iter.next.data, newenv);
}
} else if (defns is Mal.Vector) {
var vec = defns as Mal.Vector;
Expand All @@ -160,7 +159,7 @@ class Mal.Main : GLib.Object {
"let*: expected an even-length vector" +
" of definitions");
for (var i = 0; i < vec.length; i += 2)
define_eval(vec[i], vec[i+1], newenv, newenv);
define_eval(vec[i], vec[i+1], newenv);
} else {
throw new Mal.Error.BAD_PARAMS(
"let*: expected a list or vector of definitions");
Expand Down
15 changes: 7 additions & 8 deletions vala/step4_if_fn_do.vala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,16 @@ class Mal.Main: GLib.Object {
}

private static Mal.Val define_eval(Mal.Val key, Mal.Val value,
Mal.Env eval_env, Mal.Env def_env)
Mal.Env env)
throws Mal.Error {
var rootk = new GC.Root(key); (void)rootk;
var roote = new GC.Root(def_env); (void)roote;
var roote = new GC.Root(env); (void)roote;
var symkey = key as Mal.Sym;
if (symkey == null)
throw new Mal.Error.BAD_PARAMS(
"let*: expected a symbol to define");
var val = EVAL(value, eval_env);
def_env.set(symkey, val);
var val = EVAL(value, env);
env.set(symkey, val);
return val;
}

Expand All @@ -89,7 +89,7 @@ class Mal.Main: GLib.Object {
throw new Mal.Error.BAD_PARAMS(
"def!: expected two values");
return define_eval(list.next.data, list.next.next.data,
env, env);
env);
case "let*":
if (list.length() != 3)
throw new Mal.Error.BAD_PARAMS(
Expand All @@ -105,8 +105,7 @@ class Mal.Main: GLib.Object {
throw new Mal.Error.BAD_PARAMS(
"let*: expected an even-length list" +
" of definitions");
define_eval(iter.data, iter.next.data,
newenv, newenv);
define_eval(iter.data, iter.next.data, newenv);
}
} else if (defns is Mal.Vector) {
var vec = defns as Mal.Vector;
Expand All @@ -115,7 +114,7 @@ class Mal.Main: GLib.Object {
"let*: expected an even-length vector" +
" of definitions");
for (var i = 0; i < vec.length; i += 2)
define_eval(vec[i], vec[i+1], newenv, newenv);
define_eval(vec[i], vec[i+1], newenv);
} else {
throw new Mal.Error.BAD_PARAMS(
"let*: expected a list or vector of definitions");
Expand Down
15 changes: 7 additions & 8 deletions vala/step5_tco.vala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,16 @@ class Mal.Main : GLib.Object {
}

private static Mal.Val define_eval(Mal.Val key, Mal.Val value,
Mal.Env eval_env, Mal.Env def_env)
Mal.Env env)
throws Mal.Error {
var rootk = new GC.Root(key); (void)rootk;
var roote = new GC.Root(def_env); (void)roote;
var roote = new GC.Root(env); (void)roote;
var symkey = key as Mal.Sym;
if (symkey == null)
throw new Mal.Error.BAD_PARAMS(
"let*: expected a symbol to define");
var val = EVAL(value, eval_env);
def_env.set(symkey, val);
var val = EVAL(value, env);
env.set(symkey, val);
return val;
}

Expand Down Expand Up @@ -98,7 +98,7 @@ class Mal.Main : GLib.Object {
throw new Mal.Error.BAD_PARAMS(
"def!: expected two values");
return define_eval(list.next.data, list.next.next.data,
env, env);
env);
case "let*":
if (list.length() != 3)
throw new Mal.Error.BAD_PARAMS(
Expand All @@ -114,8 +114,7 @@ class Mal.Main : GLib.Object {
throw new Mal.Error.BAD_PARAMS(
"let*: expected an even-length list" +
" of definitions");
define_eval(iter.data, iter.next.data,
env, env);
define_eval(iter.data, iter.next.data, env);
}
} else if (defns is Mal.Vector) {
var vec = defns as Mal.Vector;
Expand All @@ -124,7 +123,7 @@ class Mal.Main : GLib.Object {
"let*: expected an even-length vector" +
" of definitions");
for (var i = 0; i < vec.length; i += 2)
define_eval(vec[i], vec[i+1], env, env);
define_eval(vec[i], vec[i+1], env);
} else {
throw new Mal.Error.BAD_PARAMS(
"let*: expected a list or vector of definitions");
Expand Down
15 changes: 7 additions & 8 deletions vala/step6_file.vala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,16 +70,16 @@ class Mal.Main : GLib.Object {
}

private static Mal.Val define_eval(Mal.Val key, Mal.Val value,
Mal.Env eval_env, Mal.Env def_env)
Mal.Env env)
throws Mal.Error {
var rootk = new GC.Root(key); (void)rootk;
var roote = new GC.Root(def_env); (void)roote;
var roote = new GC.Root(env); (void)roote;
var symkey = key as Mal.Sym;
if (symkey == null)
throw new Mal.Error.BAD_PARAMS(
"let*: expected a symbol to define");
var val = EVAL(value, eval_env);
def_env.set(symkey, val);
var val = EVAL(value, env);
env.set(symkey, val);
return val;
}

Expand Down Expand Up @@ -112,7 +112,7 @@ class Mal.Main : GLib.Object {
throw new Mal.Error.BAD_PARAMS(
"def!: expected two values");
return define_eval(list.next.data, list.next.next.data,
env, env);
env);
case "let*":
if (list.length() != 3)
throw new Mal.Error.BAD_PARAMS(
Expand All @@ -128,8 +128,7 @@ class Mal.Main : GLib.Object {
throw new Mal.Error.BAD_PARAMS(
"let*: expected an even-length list" +
" of definitions");
define_eval(iter.data, iter.next.data,
env, env);
define_eval(iter.data, iter.next.data, env);
}
} else if (defns is Mal.Vector) {
var vec = defns as Mal.Vector;
Expand All @@ -138,7 +137,7 @@ class Mal.Main : GLib.Object {
"let*: expected an even-length vector" +
" of definitions");
for (var i = 0; i < vec.length; i += 2)
define_eval(vec[i], vec[i+1], env, env);
define_eval(vec[i], vec[i+1], env);
} else {
throw new Mal.Error.BAD_PARAMS(
"let*: expected a list or vector of definitions");
Expand Down
18 changes: 8 additions & 10 deletions vala/step7_quote.vala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,16 +70,16 @@ class Mal.Main : GLib.Object {
}

private static Mal.Val define_eval(Mal.Val key, Mal.Val value,
Mal.Env eval_env, Mal.Env def_env)
Mal.Env env)
throws Mal.Error {
var rootk = new GC.Root(key); (void)rootk;
var roote = new GC.Root(def_env); (void)roote;
var roote = new GC.Root(env); (void)roote;
var symkey = key as Mal.Sym;
if (symkey == null)
throw new Mal.Error.BAD_PARAMS(
"let*: expected a symbol to define");
var val = EVAL(value, eval_env);
def_env.set(symkey, val);
var val = EVAL(value, env);
env.set(symkey, val);
return val;
}

Expand Down Expand Up @@ -159,7 +159,7 @@ class Mal.Main : GLib.Object {
throw new Mal.Error.BAD_PARAMS(
"def!: expected two values");
return define_eval(list.next.data, list.next.next.data,
env, env);
env);
case "let*":
if (list.length() != 3)
throw new Mal.Error.BAD_PARAMS(
Expand All @@ -175,8 +175,7 @@ class Mal.Main : GLib.Object {
throw new Mal.Error.BAD_PARAMS(
"let*: expected an even-length list" +
" of definitions");
define_eval(iter.data, iter.next.data,
env, env);
define_eval(iter.data, iter.next.data, env);
}
} else if (defns is Mal.Vector) {
var vec = defns as Mal.Vector;
Expand All @@ -185,11 +184,10 @@ class Mal.Main : GLib.Object {
"let*: expected an even-length vector" +
" of definitions");
for (var i = 0; i < vec.length; i += 2)
define_eval(vec[i], vec[i+1], env, env);
define_eval(vec[i], vec[i+1], env);
} else {
throw new Mal.Error.BAD_PARAMS(
"let*: expected a list or vector of "+
"definitions");
"let*: expected a list or vector of definitions");
}
ast = list.nth(2).data;
continue; // tail-call optimisation
Expand Down
15 changes: 7 additions & 8 deletions vala/step8_macros.vala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,19 +70,19 @@ class Mal.Main : GLib.Object {
}

private static Mal.Val define_eval(Mal.Val key, Mal.Val value,
Mal.Env eval_env, Mal.Env def_env,
Mal.Env env,
bool is_macro = false)
throws Mal.Error {
var rootk = new GC.Root(key); (void)rootk;
var roote = new GC.Root(def_env); (void)roote;
var roote = new GC.Root(env); (void)roote;
var symkey = key as Mal.Sym;
if (symkey == null)
throw new Mal.Error.BAD_PARAMS(
"let*: expected a symbol to define");
var val = EVAL(value, eval_env);
var val = EVAL(value, env);
if (val is Mal.Function)
(val as Mal.Function).is_macro = is_macro;
def_env.set(symkey, val);
env.set(symkey, val);
return val;
}

Expand Down Expand Up @@ -192,7 +192,7 @@ class Mal.Main : GLib.Object {
throw new Mal.Error.BAD_PARAMS(
"def!: expected two values");
return define_eval(list.next.data, list.next.next.data,
env, env, sym.v == "defmacro!");
env, sym.v == "defmacro!");
case "let*":
if (list.length() != 3)
throw new Mal.Error.BAD_PARAMS(
Expand All @@ -208,8 +208,7 @@ class Mal.Main : GLib.Object {
throw new Mal.Error.BAD_PARAMS(
"let*: expected an even-length list" +
" of definitions");
define_eval(iter.data, iter.next.data,
env, env);
define_eval(iter.data, iter.next.data, env);
}
} else if (defns is Mal.Vector) {
var vec = defns as Mal.Vector;
Expand All @@ -218,7 +217,7 @@ class Mal.Main : GLib.Object {
"let*: expected an even-length vector" +
" of definitions");
for (var i = 0; i < vec.length; i += 2)
define_eval(vec[i], vec[i+1], env, env);
define_eval(vec[i], vec[i+1], env);
} else {
throw new Mal.Error.BAD_PARAMS(
"let*: expected a list or vector of definitions");
Expand Down
15 changes: 7 additions & 8 deletions vala/step9_try.vala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,19 +71,19 @@ class Mal.Main : GLib.Object {
}

private static Mal.Val define_eval(Mal.Val key, Mal.Val value,
Mal.Env eval_env, Mal.Env def_env,
Mal.Env env,
bool is_macro = false)
throws Mal.Error {
var rootk = new GC.Root(key); (void)rootk;
var roote = new GC.Root(def_env); (void)roote;
var roote = new GC.Root(env); (void)roote;
var symkey = key as Mal.Sym;
if (symkey == null)
throw new Mal.Error.BAD_PARAMS(
"let*: expected a symbol to define");
var val = EVAL(value, eval_env);
var val = EVAL(value, env);
if (val is Mal.Function)
(val as Mal.Function).is_macro = is_macro;
def_env.set(symkey, val);
env.set(symkey, val);
return val;
}

Expand Down Expand Up @@ -195,7 +195,7 @@ class Mal.Main : GLib.Object {
throw new Mal.Error.BAD_PARAMS(
"def!: expected two values");
return define_eval(list.next.data, list.next.next.data,
env, env, sym.v == "defmacro!");
env, sym.v == "defmacro!");
case "let*":
if (list.length() != 3)
throw new Mal.Error.BAD_PARAMS(
Expand All @@ -211,8 +211,7 @@ class Mal.Main : GLib.Object {
throw new Mal.Error.BAD_PARAMS(
"let*: expected an even-length list" +
" of definitions");
define_eval(iter.data, iter.next.data,
env, env);
define_eval(iter.data, iter.next.data, env);
}
} else if (defns is Mal.Vector) {
var vec = defns as Mal.Vector;
Expand All @@ -221,7 +220,7 @@ class Mal.Main : GLib.Object {
"let*: expected an even-length vector" +
" of definitions");
for (var i = 0; i < vec.length; i += 2)
define_eval(vec[i], vec[i+1], env, env);
define_eval(vec[i], vec[i+1], env);
} else {
throw new Mal.Error.BAD_PARAMS(
"let*: expected a list or vector of definitions");
Expand Down
Loading

0 comments on commit 70305b6

Please sign in to comment.