[Jmol-commits] SF.net SVN: jmol:[20450] trunk/Jmol/src/org/jmol/script/ScriptEval.java

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

Revision: 20450
          http://sourceforge.net/p/jmol/code/20450
Author:   hansonr
Date:     2015-04-17 19:37:13 +0000 (Fri, 17 Apr 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.3.13_2015.04.16"

bug fix: for in/from broken in 14.3.13_2015.04.05
 -- entering a FOR loop with empty has pops {...} context one level too far, exiting functions

Modified Paths:
--------------
    trunk/Jmol/src/org/jmol/script/ScriptEval.java

Modified: trunk/Jmol/src/org/jmol/script/ScriptEval.java
===================================================================
--- trunk/Jmol/src/org/jmol/script/ScriptEval.java	2015-04-17 18:59:01 UTC (rev 20449)
+++ trunk/Jmol/src/org/jmol/script/ScriptEval.java	2015-04-17 19:37:13 UTC (rev 20450)
@@ -3521,11 +3521,12 @@
           break;
         }
       }
+      if (!isForCheck)
+        pushContext(cmdToken, "FOR");        
       if (key == null) {
         if (isForCheck) {
           j = (bsOrList == null ? pts[1] + 1 : 2);
         } else {
-          pushContext(cmdToken, "FOR");
           j = 2;
         }
         if (tokAt(j) == T.var)
@@ -3534,9 +3535,6 @@
         isMinusMinus = key.equals("--") || key.equals("++");
         if (isMinusMinus)
           key = paramAsStr(++j);
-      } else {
-        if (!isForCheck)
-          pushContext(cmdToken, "FOR");        
       }
       if (isOK)
         if (tok == T.in) {

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