Revision: 20394
http://sourceforge.net/p/jmol/code/20394
Author: hansonr
Date: 2015-03-19 23:42:09 +0000 (Thu, 19 Mar 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.2.13_2015.03.20"
bug fix: use of {*}.xxxx = for(i;{*};....) fails
Modified Paths:
--------------
branches/v14_2/Jmol/src/org/jmol/script/ScriptExpr.java
branches/v14_2/Jmol/src/org/jmol/script/ScriptMathProcessor.java
branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties
Modified: branches/v14_2/Jmol/src/org/jmol/script/ScriptExpr.java
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/script/ScriptExpr.java 2015-03-19
23:41:19 UTC (rev 20393)
+++ branches/v14_2/Jmol/src/org/jmol/script/ScriptExpr.java 2015-03-19
23:42:09 UTC (rev 20394)
@@ -315,9 +315,9 @@
int p = 0;
int jlast = 0;
int j = bsAtoms.nextSetBit(0);
- if (j < 0) {
+ if (j < 0 || chk) {
iToken = pt2 - 1;
- } else if (!chk) {
+ } else {
for (; j >= 0; j = bsAtoms.nextSetBit(j + 1)) {
if (jlast >= 0)
bsX.clear(jlast);
@@ -2107,10 +2107,16 @@
break;
case T.bitset:
propertyName = sel.asString();
+ boolean isprop = propertyName.startsWith("property_");
+ int tok = (isprop ? -1 : T.getTokFromName(propertyName));
+ if (tok == 0) {
+ iToken = pt;
+ error(ERROR_cannotSet);
+ }
bs = SV.getBitSet(t, true);
int nAtoms = vwr.ms.ac;
int nbs = bs.cardinality();
- if (propertyName.startsWith("property_")) {
+ if (isprop) {
Object obj = (tv.tok == T.varray ? SV.flistValue(tv, tv.getList()
.size() == nbs ? nbs : nAtoms) : tv.asString());
vwr.setData(
@@ -2121,7 +2127,7 @@
0);
break;
}
- setBitsetProperty(bs, T.getTokFromName(propertyName), tv.asInt(),
+ setBitsetProperty(bs, tok, tv.asInt(),
tv.asFloat(), tv);
}
if (selectOne)
Modified: branches/v14_2/Jmol/src/org/jmol/script/ScriptMathProcessor.java
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/script/ScriptMathProcessor.java
2015-03-19 23:41:19 UTC (rev 20393)
+++ branches/v14_2/Jmol/src/org/jmol/script/ScriptMathProcessor.java
2015-03-19 23:42:09 UTC (rev 20394)
@@ -371,9 +371,8 @@
}
private static boolean isOpFunc(T op) {
- return (T.tokAttr(op.tok, T.mathfunc) && op != T.tokenArraySquare
- || op.tok == T.propselector
- && T.tokAttr(op.intValue, T.mathfunc));
+ return (op != null && (T.tokAttr(op.tok, T.mathfunc) && op !=
T.tokenArraySquare
+ || op.tok == T.propselector && T.tokAttr(op.intValue, T.mathfunc)));
}
private boolean skipping;
Modified: branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties 2015-03-19
23:41:19 UTC (rev 20393)
+++ branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties 2015-03-19
23:42:09 UTC (rev 20394)
@@ -4,8 +4,12 @@
# THIS IS THE RELEASE BRANCH
# BUG FIXES ONLY, PLEASE
-Jmol.___JmolVersion="14.2.13_2015.03.19"
+Jmol.___JmolVersion="14.2.13_2015.03.20"
+bug fix: use of {*}.xxxx = for(i;{*};....) fails
+
+JmolVersion="14.2.13_2015.03.19"
+
bug fix: VASP chgcar surface reader fails to recognize 10-per-line file format
JmolVersion="14.2.13_2015.03.16"
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the
conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
