[Jmol-commits] SF.net SVN: jmol:[15610] trunk/Jmol/src/org/jmol

[<ha...@us...>]

Revision: 15610
          http://jmol.svn.sourceforge.net/jmol/?rev=15610&view=rev
Author:   hansonr
Date:     2011-06-18 00:17:07 +0000 (Sat, 18 Jun 2011)

Log Message:
-----------
version=12.1.50_dev

# bug fix: for (Var x in y){ {x}.xxxx =  ...} does not work properly
# bug fix: for (Var x in y){...} did not work unless y is enclosed in { }

Modified Paths:
--------------
    trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java
    trunk/Jmol/src/org/jmol/script/ScriptVariable.java
    trunk/Jmol/src/org/jmol/viewer/Jmol.properties

Modified: trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java
===================================================================
--- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java	2011-06-17 22:15:11 UTC (rev 15609)
+++ trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java	2011-06-18 00:17:07 UTC (rev 15610)
@@ -13018,6 +13018,9 @@
           t = tmap.get(hkey);
         } else {
           int ipt = ScriptVariable.iValue(vv);
+          // in the case of for (x in y) where y is an array, we need to select the item before continuing
+          if (t.tok == Token.varray)
+            t = ScriptVariable.selectItem(t);
           switch (t.tok) {
           case Token.varray:
             List<ScriptVariable> list = t.getList();

Modified: trunk/Jmol/src/org/jmol/script/ScriptVariable.java
===================================================================
--- trunk/Jmol/src/org/jmol/script/ScriptVariable.java	2011-06-17 22:15:11 UTC (rev 15609)
+++ trunk/Jmol/src/org/jmol/script/ScriptVariable.java	2011-06-18 00:17:07 UTC (rev 15610)
@@ -430,6 +430,10 @@
       return Boolean.FALSE;
     case integer:
       return Integer.valueOf(x.intValue);
+    case bitset:
+//      return bsSelect(x);
+    case array:
+      return selectItem(x).value;
     default:
       return x.value;
     }

Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties	2011-06-17 22:15:11 UTC (rev 15609)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties	2011-06-18 00:17:07 UTC (rev 15610)
@@ -3,6 +3,9 @@
 
 version=12.1.50_dev
 
+# bug fix: for (Var x in y){ {x}.xxxx =  ...} does not work properly
+# bug fix: for (Var x in y){...} did not work unless y is enclosed in { }
+#
 # TODO -- save that function in state; state for new INTERSECTION option
 #
 # new feature: isosurface INTERSECTION {atomset1} {atomset2} function "fname" VDW 
@@ -37,8 +40,7 @@
 #
 # new feature: set defaultLabelPDB "%m%r" -- for set picking LABEL (typically labeling groups)
 # new feature: set defaultLabelXYZ "%a"   -- for set picking LABEL (typically labeling atoms)
-
-# bug fix: for (Var x in y){...} did not work unless y is enclosed in { }
+#
 # bug fix: UFF full listing (set loglevel 6;minimize steps 0;show minimization) missing n and cosNphi0 in torsions
 #
 # new feature: within(distance, $surfaceID)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.