matlab: missed octave support fixes.

diff --git a/matlab/step2_eval.m b/matlab/step2_eval.m
index bc38ebe..b8a1d77 100644 (file)
--- a/matlab/step2_eval.m
+++ b/matlab/step2_eval.m
@@ -9,11 +9,7 @@ end
 function ret = eval_ast(ast, env)
     switch class(ast)
     case 'types.Symbol'
-        %if exist('OCTAVE_VERSION', 'builtin') ~= 0
-        %    ret = env.(ast.name);
-        %else
-            ret = env(ast.name);
-        %end
+        ret = env(ast.name);
     case 'types.List'
         ret = types.List();
         for i=1:length(ast)

diff --git a/matlab/step5_tco.m b/matlab/step5_tco.m
index 8e01426..ef42683 100644 (file)
--- a/matlab/step5_tco.m
+++ b/matlab/step5_tco.m
@@ -67,14 +67,14 @@ function ret = EVAL(ast, env)
            if length(ast) > 3
                ast = ast.get(4); % TCO
             else
-               ret = types.nil;
+               ret = type_utils.nil;
                return;
             end
         else
             ast = ast.get(3); % TCO
         end
     case 'fn*'
-        fn = @(varargin) EVAL(ast.get(3), Env(env, ast.get(2), ...
+        fn = @(varargin) EVAL(ast.get(3), Env({env}, ast.get(2), ...
                                               types.List(varargin{:})));
         ret = types.Function(fn, ast.get(3), env, ast.get(2));
         return;

diff --git a/matlab/step6_file.m b/matlab/step6_file.m
index 4377792..3f06433 100644 (file)
--- a/matlab/step6_file.m
+++ b/matlab/step6_file.m
@@ -67,14 +67,14 @@ function ret = EVAL(ast, env)
            if length(ast) > 3
                ast = ast.get(4); % TCO
             else
-               ret = types.nil;
+               ret = type_utils.nil;
                return;
             end
         else
             ast = ast.get(3); % TCO
         end
     case 'fn*'
-        fn = @(varargin) EVAL(ast.get(3), Env(env, ast.get(2), ...
+        fn = @(varargin) EVAL(ast.get(3), Env({env}, ast.get(2), ...
                                               types.List(varargin{:})));
         ret = types.Function(fn, ast.get(3), env, ast.get(2));
         return;

diff --git a/matlab/step7_quote.m b/matlab/step7_quote.m
index ff5c2d9..e6054ba 100644 (file)
--- a/matlab/step7_quote.m
+++ b/matlab/step7_quote.m
@@ -95,14 +95,14 @@ function ret = EVAL(ast, env)
            if length(ast) > 3
                ast = ast.get(4); % TCO
             else
-               ret = types.nil;
+               ret = type_utils.nil;
                return;
             end
         else
             ast = ast.get(3); % TCO
         end
     case 'fn*'
-        fn = @(varargin) EVAL(ast.get(3), Env(env, ast.get(2), ...
+        fn = @(varargin) EVAL(ast.get(3), Env({env}, ast.get(2), ...
                                               types.List(varargin{:})));
         ret = types.Function(fn, ast.get(3), env, ast.get(2));
         return;