From: <ha...@us...> - 2010-07-24 21:54:55
|
Revision: 13684 http://jmol.svn.sourceforge.net/jmol/?rev=13684&view=rev Author: hansonr Date: 2010-07-24 21:54:48 +0000 (Sat, 24 Jul 2010) Log Message: ----------- version=12.0.RC28_dev # bug fix: PROMPT command need not require @{...} # bug fix: a = {} needs to default to ({}) (empty bitset) Modified Paths: -------------- trunk/Jmol/src/org/jmol/script/ScriptCompilationTokenParser.java trunk/Jmol/src/org/jmol/viewer/Jmol.properties Modified: trunk/Jmol/src/org/jmol/script/ScriptCompilationTokenParser.java =================================================================== --- trunk/Jmol/src/org/jmol/script/ScriptCompilationTokenParser.java 2010-07-24 20:55:08 UTC (rev 13683) +++ trunk/Jmol/src/org/jmol/script/ScriptCompilationTokenParser.java 2010-07-24 21:54:48 UTC (rev 13684) @@ -189,7 +189,7 @@ private boolean isExpressionNext() { return tokPeek(Token.leftbrace) && tokAt(itokenInfix + 1) != Token.string - && tokAt(itokenInfix + 1) != Token.rightbrace + //&& tokAt(itokenInfix + 1) != Token.rightbrace || !isMathExpressionCommand && tokPeek(Token.leftparen); } Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2010-07-24 20:55:08 UTC (rev 13683) +++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2010-07-24 21:54:48 UTC (rev 13684) @@ -4,6 +4,7 @@ version=12.0.RC28_dev # bug fix: PROMPT command need not require @{...} +# bug fix: a = {} needs to default to ({}) (empty bitset) # -------------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |