Mercurial > pytave

changeset 260:daf1aff501f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
indexing: fix off-by-one with dicts (fixes issue #10) Also, dogfood pyobject a bit more instead of just generating strings of code and using pyexec. * @pyobject/subsref.m: Improve {} indexing.
author Colin Macdonald <cbm@m.fsf.org>
date Tue, 26 Jul 2016 20:32:24 -0700
parents c8da556b6793
children 983a06be6a1b
files @pyobject/subsref.m
diffstat 1 files changed, 43 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/@pyobject/subsref.m	Wed Jul 27 20:30:35 2016 -0700
+++ b/@pyobject/subsref.m	Tue Jul 26 20:32:24 2016 -0700
@@ -44,24 +44,34 @@
       r = pycall ("getattr", x, t.subs);
 
     case "{}"
-      subsstrs = {};
-      for j = 1:length (t.subs)
-        thissub = t.subs{j};
-        if (ischar (thissub) && strcmp (thissub, ":"))
-          subsstrs{j} = ":";
-        elseif (ischar (thissub))
-          subsstrs{j} = ["'" thissub "'"];
-        elseif (isnumeric (thissub) && isscalar (thissub))
-          ## note: python indexed from 0
-          subsstrs{j} = num2str (thissub - 1);
-        else
-          thissub
-          error ("@pyobject/subsref: subs not supported")
+      ## Subtract one from index: do this for lists, numpy arrays, etc
+      pyexec ("import collections")
+      pyexec ("import numpy")
+      x_is_list = pycall (pyeval (
+        "lambda (x): isinstance(x, (collections.Sequence, numpy.ndarray))"),
+        x);
+      for i = 1:length(t.subs)
+        j = t.subs{i};
+        if (isindex (j) && isnumeric (j) && x_is_list)
+          t.subs{i} = cast (j, class (sizemax ())) - 1;
         endif
       endfor
-      s = ["[" strjoin(subsstrs, ", ") "]"];
-      ## XXX: can we use .__getitem__ here?
-      r = pyeval (sprintf ("__InOct__['%s']%s", x.id, s));
+
+      if (isscalar (t.subs))
+        ind = t.subs{1};
+      else
+        ## XXX: after #26, #27, I think its just:
+        #ind = pycall ("tuple", t.subs);
+        pyexec (["global _temp\n" ...
+                 "def pystoretemp(x):\n" ...
+                 "    global _temp\n" ...
+                 "    _temp = x"]);
+        pycall ("pystoretemp", t.subs);
+        pyexec ("_temp = tuple(_temp[0])");
+        ind = pyobject.fromPythonVarName ("_temp");
+      endif
+      gi = pycall ("getattr", x, "__getitem__");   # x.__getitem__
+      r = pycall (gi, ind);
 
     otherwise
       t
@@ -88,8 +98,8 @@
 %! assert (L{1}, 10)
 %! assert (L{2}, 20)
 
-%!test
-%! % list indexing
+%!xtest
+%! % list indexing, slice
 %! pyexec ("L = [10, 20, [30, 40]]")
 %! L = pyobject.fromPythonVarName ("L");
 %! L2 = L{:};
@@ -127,13 +137,26 @@
 %! d = pyobject.fromPythonVarName ("d");
 %! assert (d{6}, 42)
 
-%!xtest
-%! % dict: integer key should not subtract one (FIXME: Issue #10)
+%!test
+%! % dict: integer key should not subtract one
 %! pyexec ("d = {5:40, 6:42}")
 %! d = pyobject.fromPythonVarName ("d");
 %! assert (d{6}, 42)
 
 %!test
+%! % dict: floating point keys should work
+%! pyexec ("d = {5.5:'ok'}")
+%! d = pyobject.fromPythonVarName ("d");
+%! assert (d{5.5}, "ok")
+
+%!test
+%! % dict: make sure key ":" doesn't break anything
+%! pyexec ("d = {'a':1, ':':2}")
+%! d = pyobject.fromPythonVarName ("d");
+%! assert (d{'a'}, 1)
+%! assert (d{':'}, 2)
+
+%!test
 %! % method call with args
 %! s = pyeval ("set({1, 2})");
 %! s.add (42)