From: <ha...@us...> - 2011-10-25 01:26:07
|
Revision: 16400 http://jmol.svn.sourceforge.net/jmol/?rev=16400&view=rev Author: hansonr Date: 2011-10-25 01:26:00 +0000 (Tue, 25 Oct 2011) Log Message: ----------- version=12.2.3_dev # bug fix: userFunction(x,@y) should operate as per all math # -- parens - value of variable pointed to by y # -- x = myfunc(x, @y) same action as just myfunc(x, @y) # bug fix: userFunction x @y # -- no parens - should operate as value of x and value of y # -- @ is unnecessary but allowed Modified Paths: -------------- branches/v12_2/Jmol/src/org/jmol/script/ScriptEvaluator.java branches/v12_2/Jmol/src/org/jmol/viewer/Jmol.properties Modified: branches/v12_2/Jmol/src/org/jmol/script/ScriptEvaluator.java =================================================================== --- branches/v12_2/Jmol/src/org/jmol/script/ScriptEvaluator.java 2011-10-25 01:23:23 UTC (rev 16399) +++ branches/v12_2/Jmol/src/org/jmol/script/ScriptEvaluator.java 2011-10-25 01:26:00 UTC (rev 16400) @@ -2267,6 +2267,13 @@ } if (i == statementLength)// || isScriptCheck) return i == statementLength; + switch (statement[0].tok) { + case Token.parallel: + case Token.function: + case Token.identifier: + if (tokAt(1) == Token.leftparen) + return true; + } fixed = new Token[statementLength]; fixed[0] = statement[0]; boolean isExpression = false; @@ -12721,6 +12728,7 @@ case Token.middle: case Token.bottom: case Token.identifier: + case Token.string: case Token.id: if (theTok == Token.id) pt++; Modified: branches/v12_2/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- branches/v12_2/Jmol/src/org/jmol/viewer/Jmol.properties 2011-10-25 01:23:23 UTC (rev 16399) +++ branches/v12_2/Jmol/src/org/jmol/viewer/Jmol.properties 2011-10-25 01:26:00 UTC (rev 16400) @@ -4,6 +4,12 @@ version=12.2.3_dev +# bug fix: userFunction(x,@y) should operate as per all math +# -- parens - value of variable pointed to by y +# -- x = myfunc(x, @y) same action as just myfunc(x, @y) +# bug fix: userFunction x @y +# -- no parens - should operate as value of x and value of y +# -- @ is unnecessary but allowed # bug fix: reading of JVXL files for color density fails to color properly # bug fix: .... vdw 100.0% --- should be OK with float there, even if it rounds. # bug fix: load append twice can cause zap to be in wrong place in state file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |