From: <ha...@us...> - 2007-02-27 00:45:17
|
Revision: 6953 http://svn.sourceforge.net/jmol/?rev=6953&view=rev Author: hansonr Date: 2007-02-26 16:45:12 -0800 (Mon, 26 Feb 2007) Log Message: ----------- 11.1.15 SELECT connected(dMin,dMax,"type",{a},{b}) integration Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Compiler.java Modified: trunk/Jmol/src/org/jmol/viewer/Compiler.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Compiler.java 2007-02-27 00:31:05 UTC (rev 6952) +++ trunk/Jmol/src/org/jmol/viewer/Compiler.java 2007-02-27 00:45:12 UTC (rev 6953) @@ -1376,6 +1376,12 @@ if (addNextTokenIf(Token.integer)) if (!addNextTokenIf(Token.comma)) break; + if (addNextTokenIf(Token.decimal)) + if (!addNextTokenIf(Token.comma)) + break; + if (addNextTokenIf(Token.decimal)) + if (!addNextTokenIf(Token.comma)) + break; if (tokPeek() == Token.identifier) { String strOrder = (String) getToken().value; int intType = JmolConstants.getBondOrderFromString(strOrder); @@ -1389,8 +1395,15 @@ } if (addNextTokenIf(Token.rightparen)) return true; - if (!clauseOr(true)) // *expression* + if (!clauseOr(tokPeek(Token.leftparen))) // *expression* return false; + if (addNextTokenIf(Token.rightparen)) + return true; + if (!addNextTokenIf(Token.comma)) + return false; + if (!clauseOr(tokPeek(Token.leftparen))) // *expression* + return false; + break; } if (!addNextTokenIf(Token.rightparen)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |