Skip to content

scala: merge eval_ast into eval #691

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 10, 2024
Merged

scala: merge eval_ast into eval #691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c3ef1a7
scala: merge eval_ast into eval
asarhaddon Oct 10, 2024
17193d3
scala: allow keyword arguments for the keyword core function
asarhaddon Oct 10, 2024
e2fe85e
scala: prevent defmacro! from mutating its argument
asarhaddon Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion impls/scala/core.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ object core {

// Scalar functions
def keyword(a: List[Any]) = {
"\u029e" + a(0).asInstanceOf[String]
val s = a(0).asInstanceOf[String]
if (0 < s.length && s(0) == '\u029e') s else "\u029e" + s
}

def keyword_Q(a: List[Any]) = {
Expand Down
23 changes: 10 additions & 13 deletions impls/scala/step2_eval.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,24 @@ object step2_eval {
}

// eval
def eval_ast(ast: Any, env: Map[Symbol,Any]): Any = {
def EVAL(ast: Any, env: Map[Symbol,Any]): Any = {

// println("EVAL: " + printer._pr_str(ast,true))

ast match {
case s : Symbol => env(s)
case v: MalVector => v.map(EVAL(_, env))
case l: MalList => l.map(EVAL(_, env))
case s : Symbol => return env(s)
case v: MalVector => return v.map(EVAL(_, env))
case l: MalList => {}
case m: MalHashMap => {
m.map{case (k,v) => (k, EVAL(v, env))}
return m.map{case (k,v) => (k, EVAL(v, env))}
}
case _ => ast
case _ => return ast
}
}

def EVAL(ast: Any, env: Map[Symbol,Any]): Any = {
//println("EVAL: " + printer._pr_str(ast,true))
if (!_list_Q(ast))
return eval_ast(ast, env)

// apply list
if (ast.asInstanceOf[MalList].value.length == 0)
return ast
eval_ast(ast, env).asInstanceOf[MalList].value match {
ast.asInstanceOf[MalList].map(EVAL(_, env)).value match {
case f :: el => {
var fn: List[Any] => Any = null
try {
Expand Down
28 changes: 15 additions & 13 deletions impls/scala/step3_env.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,24 @@ object step3_env {
}

// eval
def eval_ast(ast: Any, env: Env): Any = {
def EVAL(ast: Any, env: Env): Any = {

if (env.find(Symbol("DEBUG-EVAL")) != null) {
val dbgeval = env.get(Symbol("DEBUG-EVAL"))
if (dbgeval != null && dbgeval != false) {
println("EVAL: " + printer._pr_str(ast,true))
}
}

ast match {
case s : Symbol => env.get(s)
case v: MalVector => v.map(EVAL(_, env))
case l: MalList => l.map(EVAL(_, env))
case s : Symbol => return env.get(s)
case v: MalVector => return v.map(EVAL(_, env))
case l: MalList => {}
case m: MalHashMap => {
m.map{case (k,v) => (k, EVAL(v, env))}
return m.map{case (k,v) => (k, EVAL(v, env))}
}
case _ => ast
case _ => return ast
}
}

def EVAL(ast: Any, env: Env): Any = {
//println("EVAL: " + printer._pr_str(ast,true))
if (!_list_Q(ast))
return eval_ast(ast, env)

// apply list
ast.asInstanceOf[MalList].value match {
Expand All @@ -42,7 +44,7 @@ object step3_env {
}
case _ => {
// function call
eval_ast(ast, env).asInstanceOf[MalList].value match {
ast.asInstanceOf[MalList].map(EVAL(_, env)).value match {
case f :: el => {
var fn: List[Any] => Any = null
try {
Expand Down
32 changes: 17 additions & 15 deletions impls/scala/step4_if_fn_do.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,24 @@ object step4_if_fn_do {
}

// eval
def eval_ast(ast: Any, env: Env): Any = {
def EVAL(ast: Any, env: Env): Any = {

if (env.find(Symbol("DEBUG-EVAL")) != null) {
val dbgeval = env.get(Symbol("DEBUG-EVAL"))
if (dbgeval != null && dbgeval != false) {
println("EVAL: " + printer._pr_str(ast,true))
}
}

ast match {
case s : Symbol => env.get(s)
case v: MalVector => v.map(EVAL(_, env))
case l: MalList => l.map(EVAL(_, env))
case s : Symbol => return env.get(s)
case v: MalVector => return v.map(EVAL(_, env))
case l: MalList => {}
case m: MalHashMap => {
m.map{case (k,v) => (k, EVAL(v, env))}
return m.map{case (k,v) => (k, EVAL(v, env))}
}
case _ => ast
case _ => return ast
}
}

def EVAL(ast: Any, env: Env): Any = {
//println("EVAL: " + printer._pr_str(ast,true))
if (!_list_Q(ast))
return eval_ast(ast, env)

// apply list
ast.asInstanceOf[MalList].value match {
Expand All @@ -42,8 +44,8 @@ object step4_if_fn_do {
return EVAL(a2, let_env)
}
case Symbol("do") :: rest => {
val el = eval_ast(_list(rest:_*), env)
return el.asInstanceOf[MalList].value.last
val el = rest.map(EVAL(_, env))
return el.last
}
case Symbol("if") :: a1 :: a2 :: rest => {
val cond = EVAL(a1, env)
Expand All @@ -61,7 +63,7 @@ object step4_if_fn_do {
}
case _ => {
// function call
eval_ast(ast, env).asInstanceOf[MalList].value match {
ast.asInstanceOf[MalList].map(EVAL(_, env)).value match {
case f :: el => {
var fn: Func = null
try {
Expand Down
35 changes: 18 additions & 17 deletions impls/scala/step5_tco.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,26 @@ object step5_tco {
}

// eval
def eval_ast(ast: Any, env: Env): Any = {
ast match {
case s : Symbol => env.get(s)
case v: MalVector => v.map(EVAL(_, env))
case l: MalList => l.map(EVAL(_, env))
case m: MalHashMap => {
m.map{case (k,v) => (k, EVAL(v, env))}
}
case _ => ast
}
}

def EVAL(orig_ast: Any, orig_env: Env): Any = {
var ast = orig_ast; var env = orig_env;
while (true) {

//println("EVAL: " + printer._pr_str(ast,true))
if (!_list_Q(ast))
return eval_ast(ast, env)
if (env.find(Symbol("DEBUG-EVAL")) != null) {
val dbgeval = env.get(Symbol("DEBUG-EVAL"))
if (dbgeval != null && dbgeval != false) {
println("EVAL: " + printer._pr_str(ast,true))
}
}

ast match {
case s : Symbol => return env.get(s)
case v: MalVector => return v.map(EVAL(_, env))
case l: MalList => {}
case m: MalHashMap => {
return m.map{case (k,v) => (k, EVAL(v, env))}
}
case _ => return ast
}

// apply list
ast.asInstanceOf[MalList].value match {
Expand All @@ -46,7 +47,7 @@ object step5_tco {
ast = a2 // continue loop (TCO)
}
case Symbol("do") :: rest => {
eval_ast(_list(rest.slice(0,rest.length-1):_*), env)
rest.slice(0,rest.length-1).map(EVAL(_, env))
ast = ast.asInstanceOf[MalList].value.last // continue loop (TCO)
}
case Symbol("if") :: a1 :: a2 :: rest => {
Expand All @@ -67,7 +68,7 @@ object step5_tco {
}
case _ => {
// function call
eval_ast(ast, env).asInstanceOf[MalList].value match {
ast.asInstanceOf[MalList].map(EVAL(_, env)).value match {
case f :: el => {
f match {
case fn: MalFunction => {
Expand Down
35 changes: 18 additions & 17 deletions impls/scala/step6_file.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,26 @@ object step6_file {
}

// eval
def eval_ast(ast: Any, env: Env): Any = {
ast match {
case s : Symbol => env.get(s)
case v: MalVector => v.map(EVAL(_, env))
case l: MalList => l.map(EVAL(_, env))
case m: MalHashMap => {
m.map{case (k,v) => (k, EVAL(v, env))}
}
case _ => ast
}
}

def EVAL(orig_ast: Any, orig_env: Env): Any = {
var ast = orig_ast; var env = orig_env;
while (true) {

//println("EVAL: " + printer._pr_str(ast,true))
if (!_list_Q(ast))
return eval_ast(ast, env)
if (env.find(Symbol("DEBUG-EVAL")) != null) {
val dbgeval = env.get(Symbol("DEBUG-EVAL"))
if (dbgeval != null && dbgeval != false) {
println("EVAL: " + printer._pr_str(ast,true))
}
}

ast match {
case s : Symbol => return env.get(s)
case v: MalVector => return v.map(EVAL(_, env))
case l: MalList => {}
case m: MalHashMap => {
return m.map{case (k,v) => (k, EVAL(v, env))}
}
case _ => return ast
}

// apply list
ast.asInstanceOf[MalList].value match {
Expand All @@ -46,7 +47,7 @@ object step6_file {
ast = a2 // continue loop (TCO)
}
case Symbol("do") :: rest => {
eval_ast(_list(rest.slice(0,rest.length-1):_*), env)
rest.slice(0,rest.length-1).map(EVAL(_, env))
ast = ast.asInstanceOf[MalList].value.last // continue loop (TCO)
}
case Symbol("if") :: a1 :: a2 :: rest => {
Expand All @@ -67,7 +68,7 @@ object step6_file {
}
case _ => {
// function call
eval_ast(ast, env).asInstanceOf[MalList].value match {
ast.asInstanceOf[MalList].map(EVAL(_, env)).value match {
case f :: el => {
f match {
case fn: MalFunction => {
Expand Down
38 changes: 18 additions & 20 deletions impls/scala/step7_quote.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,25 +46,26 @@ object step7_quote {
}
}

def eval_ast(ast: Any, env: Env): Any = {
ast match {
case s : Symbol => env.get(s)
case v: MalVector => v.map(EVAL(_, env))
case l: MalList => l.map(EVAL(_, env))
case m: MalHashMap => {
m.map{case (k,v) => (k, EVAL(v, env))}
}
case _ => ast
}
}

def EVAL(orig_ast: Any, orig_env: Env): Any = {
var ast = orig_ast; var env = orig_env;
while (true) {

//println("EVAL: " + printer._pr_str(ast,true))
if (!_list_Q(ast))
return eval_ast(ast, env)
if (env.find(Symbol("DEBUG-EVAL")) != null) {
val dbgeval = env.get(Symbol("DEBUG-EVAL"))
if (dbgeval != null && dbgeval != false) {
println("EVAL: " + printer._pr_str(ast,true))
}
}

ast match {
case s : Symbol => return env.get(s)
case v: MalVector => return v.map(EVAL(_, env))
case l: MalList => {}
case m: MalHashMap => {
return m.map{case (k,v) => (k, EVAL(v, env))}
}
case _ => return ast
}

// apply list
ast.asInstanceOf[MalList].value match {
Expand All @@ -85,14 +86,11 @@ object step7_quote {
case Symbol("quote") :: a1 :: Nil => {
return a1
}
case Symbol("quasiquoteexpand") :: a1 :: Nil => {
return quasiquote(a1)
}
case Symbol("quasiquote") :: a1 :: Nil => {
ast = quasiquote(a1) // continue loop (TCO)
}
case Symbol("do") :: rest => {
eval_ast(_list(rest.slice(0,rest.length-1):_*), env)
rest.slice(0,rest.length-1).map(EVAL(_, env))
ast = ast.asInstanceOf[MalList].value.last // continue loop (TCO)
}
case Symbol("if") :: a1 :: a2 :: rest => {
Expand All @@ -113,7 +111,7 @@ object step7_quote {
}
case _ => {
// function call
eval_ast(ast, env).asInstanceOf[MalList].value match {
ast.asInstanceOf[MalList].map(EVAL(_, env)).value match {
case f :: el => {
f match {
case fn: MalFunction => {
Expand Down
Loading