Revision: 20426
http://sourceforge.net/p/jmol/code/20426
Author: hansonr
Date: 2015-04-01 12:06:16 +0000 (Wed, 01 Apr 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.3.13_2015.04.01"
bug fix: local var xxx with same name of ..xxx forces lower case xxx
Modified Paths:
--------------
branches/v14_2/Jmol/src/org/jmol/script/ScriptCompiler.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-04-01
12:06:11 UTC (rev 20425)
+++ branches/v14_2/Jmol/src/org/jmol/script/ScriptCompiler.java 2015-04-01
12:06:16 UTC (rev 20426)
@@ -907,13 +907,13 @@
private void getPrefixToken() {
ident = script.substring(ichToken, ichToken + cchToken);
identLC = ident.toLowerCase();
- boolean isUserVar = (isContextVariable(identLC));
+ boolean isUserVar = (lastToken.tok != T.per && !isDotDot &&
isContextVariable(identLC));
String preserveCase = null;
if (nTokens == 0)
isUserToken = isUserVar;
if (nTokens == 1
&& (tokCommand == T.function || tokCommand == T.parallel || tokCommand
== T.var)
- || nTokens != 0 && isUserVar && lastToken.tok != T.per || !isDotDot
+ || nTokens != 0 && isUserVar || !isDotDot
&& isUserFunction(identLC) && ((preserveCase = ident) != null)
&& (thisFunction == null || !thisFunction.name.equals(identLC))) {
// we need to allow:
Modified: branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties 2015-04-01
12:06:11 UTC (rev 20425)
+++ branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties 2015-04-01
12:06:16 UTC (rev 20426)
@@ -4,8 +4,12 @@
# THIS IS THE RELEASE BRANCH
# BUG FIXES ONLY, PLEASE
-Jmol.___JmolVersion="14.2.13_2015.03.30"
+Jmol.___JmolVersion="14.2.13_2015.04.01"
+bug fix: local var xxx with same name of ..xxx forces lower case xxx
+
+JmolVersion="14.2.13_2015.03.30"
+
bug fix: {hash}.Key = value will be stored as "key" rather than "Key".
bug fix: {hash}.key will fail if "key" is also a user-defined function.
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
