From: <ha...@us...> - 2010-07-18 14:39:31
|
Revision: 13610 http://jmol.svn.sourceforge.net/jmol/?rev=13610&view=rev Author: hansonr Date: 2010-07-18 14:39:25 +0000 (Sun, 18 Jul 2010) Log Message: ----------- version=12.0.RC26_dev PROMPT # new feature: PROMPT command with 0 or 1 arguments # new feature: prompt(label,data,asButtons) # x = prompt("testing") # just shows an OK box # x = prompt("testing","defaultInput") # returns user input or "null" # x = prompt("testing","yes|no|cancel", true) # returns 0, 1, or 2 # Modified Paths: -------------- trunk/Jmol/src/org/jmol/script/ScriptCompiler.java Modified: trunk/Jmol/src/org/jmol/script/ScriptCompiler.java =================================================================== --- trunk/Jmol/src/org/jmol/script/ScriptCompiler.java 2010-07-18 14:25:42 UTC (rev 13609) +++ trunk/Jmol/src/org/jmol/script/ScriptCompiler.java 2010-07-18 14:39:25 UTC (rev 13610) @@ -384,9 +384,8 @@ cchToken = 0; continue; } - if (lookingAtImpliedString(false)) { + if (lookingAtImpliedString(true)) ichEnd = ichToken + cchToken; - } } return commandExpected(); } @@ -970,7 +969,7 @@ } if (Token.tokAttr(tokCommand, Token.implicitStringCommand) && !(tokCommand == Token.script && iHaveQuotedString) - && lookingAtImpliedString(false)) { + && lookingAtImpliedString(true)) { String str = script.substring(ichToken, ichToken + cchToken); if (tokCommand == Token.label && Parser.isOneOf(str.toLowerCase(), "on;off;hide;display")) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |