Ada: add variable length args (bind)

diff --git a/ada/envs.adb b/ada/envs.adb
index b41637b..0b8106b 100644 (file)
--- a/ada/envs.adb
+++ b/ada/envs.adb
@@ -111,12 +111,21 @@ package body Envs is
    procedure Bind (E : Env_Handle; Syms, Exprs : Types.List_Mal_Type) is
       use Types;
       S, Expr : List_Mal_Type;
+      First_Sym : Atom_Ptr;
    begin
       S := Syms;
       Expr := Exprs;
-      while not Is_Null (S) and not Is_Null (Expr) loop
-         Set (E, Deref_Atom (Car (S)).Get_Atom, Car (Expr));
+      while not Is_Null (S) loop
+         First_Sym := Deref_Atom (Car (S));
+         if First_Sym.Get_Atom = "&" then
+            S := Deref_List (Cdr (S)).all;
+            First_Sym := Deref_Atom (Car (S));
+            Set (E, First_Sym.Get_Atom, New_List_Mal_Type (Expr));
+            exit;
+         end if;
+         Set (E, First_Sym.Get_Atom, Car (Expr));
          S := Deref_List (Cdr (S)).all;
+         exit when Is_Null (Expr);
          Expr := Deref_List (Cdr (Expr)).all;
       end loop;
    end Bind;

diff --git a/ada/reader.adb b/ada/reader.adb
index 4f8d975..5cf4150 100644 (file)
--- a/ada/reader.adb
+++ b/ada/reader.adb
@@ -84,7 +84,7 @@ package body Reader is
        (Opentoken.Recognizer.Identifier.Get (Start_Chars, Body_Chars));
 
    Lisp_Syms : constant Ada.Strings.Maps.Character_Set :=
-     Ada.Strings.Maps.To_Set ("[]{}()'`~^@+-*/<>=");
+     Ada.Strings.Maps.To_Set ("[]{}()'`~^@&+-*/<>=");
 
    Sym_Recognizer : constant Tokenizer.Recognizable_Token :=
      Tokenizer.Get (Opentoken.Recognizer.Single_Character_Set.Get (Lisp_Syms));