objpascal: fix empty list evaluation.

Part of kanaka#194.
ckafi · Apr 2, 2016 · 75b9209 · 75b9209
1 parent 203e959
commit 75b9209
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 3 deletions.
diff --git a/objpascal/step2_eval.pas b/objpascal/step2_eval.pas
@@ -82,6 +82,8 @@ function EVAL(Ast: TMal; Env: TEnv) : TMal;
 
     // Apply list
     Arr := (eval_ast(Ast, Env) as TMalList).Val;
+    if Length(Arr) = 0 then
+        Exit(Ast);
     if Arr[0] is TMalFunc then
     begin
         Fn := (Arr[0] as TMalFunc).Val;

diff --git a/objpascal/step3_env.pas b/objpascal/step3_env.pas
@@ -79,6 +79,8 @@ function EVAL(Ast: TMal; Env: TEnv) : TMal;
 
     // Apply list
     Arr := (Ast as TMalList).Val;
+    if Length(Arr) = 0 then
+        Exit(Ast);
     if Arr[0] is TMalSymbol then
         A0Sym := (Arr[0] as TMalSymbol).Val
     else

diff --git a/objpascal/step4_if_fn_do.pas b/objpascal/step4_if_fn_do.pas
@@ -87,6 +87,8 @@ function EVAL(Ast: TMal; Env: TEnv) : TMal;
     // Apply list
     Lst := (Ast as TMalList);
     Arr := Lst.Val;
+    if Length(Arr) = 0 then
+        Exit(Ast);
     if Arr[0] is TMalSymbol then
         A0Sym := (Arr[0] as TMalSymbol).Val
     else

diff --git a/objpascal/step5_tco.pas b/objpascal/step5_tco.pas
@@ -88,6 +88,8 @@ function EVAL(Ast: TMal; Env: TEnv) : TMal;
     // Apply list
     Lst := (Ast as TMalList);
     Arr := Lst.Val;
+    if Length(Arr) = 0 then
+        Exit(Ast);
     if Arr[0] is TMalSymbol then
         A0Sym := (Arr[0] as TMalSymbol).Val
     else

diff --git a/objpascal/step6_file.pas b/objpascal/step6_file.pas
@@ -90,6 +90,8 @@ function EVAL(Ast: TMal; Env: TEnv) : TMal;
     // Apply list
     Lst := (Ast as TMalList);
     Arr := Lst.Val;
+    if Length(Arr) = 0 then
+        Exit(Ast);
     if Arr[0] is TMalSymbol then
         A0Sym := (Arr[0] as TMalSymbol).Val
     else

diff --git a/objpascal/step7_quote.pas b/objpascal/step7_quote.pas
@@ -127,6 +127,8 @@ function EVAL(Ast: TMal; Env: TEnv) : TMal;
     // Apply list
     Lst := (Ast as TMalList);
     Arr := Lst.Val;
+    if Length(Arr) = 0 then
+        Exit(Ast);
     if Arr[0] is TMalSymbol then
         A0Sym := (Arr[0] as TMalSymbol).Val
     else

diff --git a/objpascal/step8_macros.pas b/objpascal/step8_macros.pas
@@ -69,7 +69,8 @@ function is_macro_call(Ast: TMal; Env: TEnv): Boolean;
     Mac : TMal;
 begin
     is_macro_call := false;
-    if (Ast.ClassType = TMalList) then
+    if (Ast.ClassType = TMalList) and
+       (Length((Ast as TMalList).Val) > 0) then
     begin
         A0 := (Ast as TMalList).Val[0];
         if (A0 is TMalSymbol) and
@@ -171,6 +172,8 @@ function EVAL(Ast: TMal; Env: TEnv) : TMal;
     // Apply list
     Lst := (Ast as TMalList);
     Arr := Lst.Val;
+    if Length(Arr) = 0 then
+        Exit(Ast);
     if Arr[0] is TMalSymbol then
         A0Sym := (Arr[0] as TMalSymbol).Val
     else

diff --git a/objpascal/step9_try.pas b/objpascal/step9_try.pas
@@ -69,7 +69,8 @@ function is_macro_call(Ast: TMal; Env: TEnv): Boolean;
     Mac : TMal;
 begin
     is_macro_call := false;
-    if (Ast.ClassType = TMalList) then
+    if (Ast.ClassType = TMalList) and
+       (Length((Ast as TMalList).Val) > 0) then
     begin
         A0 := (Ast as TMalList).Val[0];
         if (A0 is TMalSymbol) and
@@ -172,6 +173,8 @@ function EVAL(Ast: TMal; Env: TEnv) : TMal;
     // Apply list
     Lst := (Ast as TMalList);
     Arr := Lst.Val;
+    if Length(Arr) = 0 then
+        Exit(Ast);
     if Arr[0] is TMalSymbol then
         A0Sym := (Arr[0] as TMalSymbol).Val
     else

diff --git a/objpascal/stepA_mal.pas b/objpascal/stepA_mal.pas
@@ -69,7 +69,8 @@ function is_macro_call(Ast: TMal; Env: TEnv): Boolean;
     Mac : TMal;
 begin
     is_macro_call := false;
-    if (Ast.ClassType = TMalList) then
+    if (Ast.ClassType = TMalList) and
+       (Length((Ast as TMalList).Val) > 0) then
     begin
         A0 := (Ast as TMalList).Val[0];
         if (A0 is TMalSymbol) and
@@ -172,6 +173,8 @@ function EVAL(Ast: TMal; Env: TEnv) : TMal;
     // Apply list
     Lst := (Ast as TMalList);
     Arr := Lst.Val;
+    if Length(Arr) = 0 then
+        Exit(Ast);
     if Arr[0] is TMalSymbol then
         A0Sym := (Arr[0] as TMalSymbol).Val
     else