Revision: 20380
http://sourceforge.net/p/jmol/code/20380
Author: hansonr
Date: 2015-03-12 02:24:51 +0000 (Thu, 12 Mar 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.3.13_2015.03.11"
bug fix; pdb and mmcif readers not doing biomolecule 2 properly
bug fix: load filter "bychain" broken
bug fix: (x.a).push(3) does not work
bug fix: (x.a)[3] = 5 does not work
Modified Paths:
--------------
branches/v14_2/Jmol/src/org/jmol/script/ScriptCompiler.java
branches/v14_2/Jmol/src/org/jmol/script/ScriptExpr.java
branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties
Modified: branches/v14_2/Jmol/src/org/jmol/script/ScriptCompiler.java
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/script/ScriptCompiler.java 2015-03-12
02:24:39 UTC (rev 20379)
+++ branches/v14_2/Jmol/src/org/jmol/script/ScriptCompiler.java 2015-03-12
02:24:51 UTC (rev 20380)
@@ -1906,7 +1906,8 @@
ptNewSetModifier = (isNewSet ? (ident.equals("(") ? 2 : 1)
: Integer.MAX_VALUE);
// unfortunately we have to look here for defaultLattice, because it must
not turn into a string.
- return ((isSetBrace || theToken.tok == T.defaultlattice
+ return ((isSetBrace || theToken.tok == T.leftparen
+ || theToken.tok == T.defaultlattice
|| theToken.tok == T.plusPlus || theToken.tok == T.minusMinus) ?
theToken
: T.o(T.identifier, ident));
}
Modified: branches/v14_2/Jmol/src/org/jmol/script/ScriptExpr.java
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/script/ScriptExpr.java 2015-03-12
02:24:39 UTC (rev 20379)
+++ branches/v14_2/Jmol/src/org/jmol/script/ScriptExpr.java 2015-03-12
02:24:51 UTC (rev 20380)
@@ -29,7 +29,6 @@
import org.jmol.util.BSUtil;
import org.jmol.util.Elements;
import org.jmol.util.Escape;
-import org.jmol.util.Logger;
/**
* The ScriptExpr class holds the main functions for
@@ -463,6 +462,8 @@
case T.size:
case T.keys:
case T.type:
+ case T.push:
+ case T.pop:
if (tok == T.per)
break;
//$FALL-THROUGH$
@@ -1998,7 +1999,7 @@
String propertyName = "";
boolean settingData = key.startsWith("property_");
boolean isThrown = key.equals("thrown_value");
- boolean isExpression = (tokAt(1) == T.expressionBegin);
+ boolean isExpression = (tokAt(1) == T.expressionBegin || tokAt(1) ==
T.leftparen);
SV t = (settingData ? null : key.length() == 0 ? new SV() :
getContextVariableAsVariable(key));
// determine whether this is some sort of
// special assignment of a known variable
@@ -2169,7 +2170,7 @@
} else if (vv instanceof String) {
setStringProperty(key, (String) vv);
} else {
- Logger.error("ERROR -- return from propertyExpression was " + vv);
+ // could be an array and be OK Logger.error("ERROR -- return from
propertyExpression was " + vv);
}
return tv;
}
Modified: branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties 2015-03-12
02:24:39 UTC (rev 20379)
+++ branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties 2015-03-12
02:24:51 UTC (rev 20380)
@@ -8,7 +8,10 @@
bug fix; pdb and mmcif readers not doing biomolecule 2 properly
bug fix: load filter "bychain" broken
+bug fix: (x.a).push(3) does not work
+bug fix: (x.a)[3] = 5 does not work
+
JmolVersion="14.2.13_2015.03.09"
bug fix: show state/xxxx does not work
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
