fix

asarhaddon · Nov 8, 2024 · 94f7f30 · 94f7f30
1 parent a2f5708
commit 94f7f30
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 15 deletions.
diff --git a/impls/swift3/Sources/step2_eval/main.swift b/impls/swift3/Sources/step2_eval/main.swift
@@ -6,7 +6,7 @@ func READ(_ str: String) throws -> MalVal {
 }
 
 // eval
-func eval_ast(_ ast: MalVal, _ env: Dictionary<String, MalVal>) throws -> MalVal {
+func EVAL(_ ast: MalVal, _ env: Dictionary<String, MalVal>) throws -> MalVal {
     /* print("EVAL: " + PRINT(ast)) */
     switch ast {
     case MalVal.MalSymbol(let sym):
@@ -25,7 +25,7 @@ func eval_ast(_ ast: MalVal, _ env: Dictionary<String, MalVal>) throws -> MalVal
 
                 let raw_args = lst[1..<lst.count]
                 switch try EVAL(lst[0], env) {
-                 case MalVal.MalFunc(let fn, nil, _, _, _, _):
+                case MalVal.MalFunc(let fn, nil, _, _, _, _):
                     let args = raw_args.map { try EVAL($0, env) }
                     return try fn(args)
                 default:

diff --git a/impls/swift3/Sources/step3_env/main.swift b/impls/swift3/Sources/step3_env/main.swift
@@ -6,7 +6,7 @@ func READ(_ str: String) throws -> MalVal {
 }
 
 // eval
-func eval_ast(_ ast: MalVal, _ env: Env) throws -> MalVal {
+func EVAL(_ ast: MalVal, _ env: Env) throws -> MalVal {
     switch try! env.find(MalVal.MalSymbol("DEBUG-EVAL")) {
         case MalVal.MalFalse, MalVal.MalNil:
         default:
@@ -45,7 +45,7 @@ func eval_ast(_ ast: MalVal, _ env: Env) throws -> MalVal {
         default:
                 let raw_args = lst[1..<lst.count]
                 switch try EVAL(lst[0], env) {
-                 case MalVal.MalFunc(let fn, nil, _, _, _, _):
+                case MalVal.MalFunc(let fn, nil, _, _, _, _):
                     let args = raw_args.map { try EVAL($0, env) }
                     return try fn(args)
                 default:

diff --git a/impls/swift3/Sources/step4_if_fn_do/main.swift b/impls/swift3/Sources/step4_if_fn_do/main.swift
@@ -6,7 +6,7 @@ func READ(_ str: String) throws -> MalVal {
 }
 
 // eval
-func eval_ast(_ ast: MalVal, _ env: Env) throws -> MalVal {
+func EVAL(_ ast: MalVal, _ env: Env) throws -> MalVal {
     switch try! env.find(MalVal.MalSymbol("DEBUG-EVAL")) {
         case MalVal.MalFalse, MalVal.MalNil:
         default:
@@ -67,7 +67,7 @@ func eval_ast(_ ast: MalVal, _ env: Env) throws -> MalVal {
         default:
                 let raw_args = lst[1..<lst.count]
                 switch try EVAL(lst[0], env) {
-                 case MalVal.MalFunc(let fn, nil, _, _, _, _):
+                case MalVal.MalFunc(let fn, nil, _, _, _, _):
                     let args = raw_args.map { try EVAL($0, env) }
                     return try fn(args)
                 default:

diff --git a/impls/swift3/Sources/step5_tco/main.swift b/impls/swift3/Sources/step5_tco/main.swift
@@ -70,7 +70,7 @@ func EVAL(_ orig_ast: MalVal, _ orig_env: Env) throws -> MalVal {
         default:
                 let raw_args = lst[1..<lst.count]
                 switch try EVAL(lst[0], env) {
-                 case MalVal.MalFunc(let fn, nil, _, _, _, _):
+                case MalVal.MalFunc(let fn, nil, _, _, _, _):
                     let args = raw_args.map { try EVAL($0, env) }
                     return try fn(args)
                 case MalVal.MalFunc(_, let a, let e, let p, _, _):

diff --git a/impls/swift3/Sources/step6_file/main.swift b/impls/swift3/Sources/step6_file/main.swift
@@ -70,7 +70,7 @@ func EVAL(_ orig_ast: MalVal, _ orig_env: Env) throws -> MalVal {
         default:
                 let raw_args = lst[1..<lst.count]
                 switch try EVAL(lst[0], env) {
-                 case MalVal.MalFunc(let fn, nil, _, _, _, _):
+                case MalVal.MalFunc(let fn, nil, _, _, _, _):
                     let args = raw_args.map { try EVAL($0, env) }
                     return try fn(args)
                 case MalVal.MalFunc(_, let a, let e, let p, _, _):

diff --git a/impls/swift3/Sources/step7_quote/main.swift b/impls/swift3/Sources/step7_quote/main.swift
@@ -119,7 +119,7 @@ func EVAL(_ orig_ast: MalVal, _ orig_env: Env) throws -> MalVal {
         default:
                 let raw_args = lst[1..<lst.count]
                 switch try EVAL(lst[0], env) {
-                 case MalVal.MalFunc(let fn, nil, _, _, _, _):
+                case MalVal.MalFunc(let fn, nil, _, _, _, _):
                     let args = raw_args.map { try EVAL($0, env) }
                     return try fn(args)
                 case MalVal.MalFunc(_, let a, let e, let p, _, _):

diff --git a/impls/swift3/Sources/step8_macros/main.swift b/impls/swift3/Sources/step8_macros/main.swift
@@ -129,7 +129,7 @@ func EVAL(_ orig_ast: MalVal, _ orig_env: Env) throws -> MalVal {
                 switch try EVAL(lst[0], env) {
                 case MalVal.MalFunc(let fn, _, _, _, let macro, _):
                     ast = try fn(args) // TCO
-                 case MalVal.MalFunc(let fn, nil, _, _, _, _):
+                case MalVal.MalFunc(let fn, nil, _, _, _, _):
                     let args = raw_args.map { try EVAL($0, env) }
                     return try fn(args)
                 case MalVal.MalFunc(_, let a, let e, let p, _, _):

diff --git a/impls/swift3/Sources/step9_try/main.swift b/impls/swift3/Sources/step9_try/main.swift
@@ -162,7 +162,7 @@ func EVAL(_ orig_ast: MalVal, _ orig_env: Env) throws -> MalVal {
                 switch try EVAL(lst[0], env) {
                 case MalVal.MalFunc(let fn, _, _, _, let macro, _):
                     ast = try fn(args) // TCO
-                 case MalVal.MalFunc(let fn, nil, _, _, _, _):
+                case MalVal.MalFunc(let fn, nil, _, _, _, _):
                     let args = raw_args.map { try EVAL($0, env) }
                     return try fn(args)
                 case MalVal.MalFunc(_, let a, let e, let p, _, _):

diff --git a/impls/swift3/Sources/stepA_mal/main.swift b/impls/swift3/Sources/stepA_mal/main.swift
@@ -162,7 +162,7 @@ func EVAL(_ orig_ast: MalVal, _ orig_env: Env) throws -> MalVal {
                 switch try EVAL(lst[0], env) {
                 case MalVal.MalFunc(let fn, _, _, _, let macro, _):
                     ast = try fn(args) // TCO
-                 case MalVal.MalFunc(let fn, nil, _, _, _, _):
+                case MalVal.MalFunc(let fn, nil, _, _, _, _):
                     let args = raw_args.map { try EVAL($0, env) }
                     return try fn(args)
                 case MalVal.MalFunc(_, let a, let e, let p, _, _):

diff --git a/impls/swift4/Sources/step2_eval/main.swift b/impls/swift4/Sources/step2_eval/main.swift
@@ -33,7 +33,6 @@ func EVAL(_ ast: MalData, env: [String: MalData]) throws -> MalData {
         default:
             return ast
         }
-    }
 }
 
 func PRINT(_ input: MalData) -> String {

diff --git a/impls/swift4/Sources/step3_env/main.swift b/impls/swift4/Sources/step3_env/main.swift
@@ -57,7 +57,6 @@ func EVAL(_ ast: MalData, env: Env) throws -> MalData {
         default:
             return ast
         }
-    }
 }
 
 func PRINT(_ input: MalData) -> String {

diff --git a/impls/swift4/Sources/step4_if_fn_do/main.swift b/impls/swift4/Sources/step4_if_fn_do/main.swift
@@ -72,7 +72,6 @@ func EVAL(_ ast: MalData, env: Env) throws -> MalData {
         default:
             return ast
         }
-    }
 }
 
 func PRINT(_ input: MalData) -> String {
-Original file line number
+Diff line change
@@ Expand Up @@
             default:
                 return ast
             }
-        }
     }
     func PRINT(_ input: MalData) -> String {
@@ Expand Down @@