From: <ha...@us...> - 2006-11-23 15:55:23
|
Revision: 6305 http://svn.sourceforge.net/jmol/?rev=6305&view=rev Author: hansonr Date: 2006-11-23 07:55:22 -0800 (Thu, 23 Nov 2006) Log Message: ----------- oy. Important! -- variables were not properly defining Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Eval.java Modified: trunk/Jmol/src/org/jmol/viewer/Eval.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Eval.java 2006-11-23 15:21:54 UTC (rev 6304) +++ trunk/Jmol/src/org/jmol/viewer/Eval.java 2006-11-23 15:55:22 UTC (rev 6305) @@ -938,8 +938,8 @@ Point3f thisCoordinate = null; boolean refreshed = false; pcLastExpressionInstruction = 1000; - boolean isSubsetDefinition = (pcStart < 0); - if (isSubsetDefinition) + boolean ignoreSubset = (pcStart < 0); + if (ignoreSubset) pcStart = -pcStart; if (logMessages) viewer.scriptStatus("start to evaluate expression"); @@ -1102,7 +1102,7 @@ } if (sp != 1) evalError(GT._("atom expression compiler error - stack over/underflow")); - if (!isSubsetDefinition && bsSubset != null) + if (!ignoreSubset && bsSubset != null) stack[0].and(bsSubset); return stack[0]; } @@ -1150,8 +1150,8 @@ Object value = variables.get(variable); if (value != null) { if (value instanceof Token[]) { - value = expression((Token[]) value, 2); - variables.put(variable, value); + value = expression((Token[]) value, -2); + //variables.put("@" + variable, value); } return (BitSet) value; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |