From: <ha...@us...> - 2009-09-03 00:42:31
|
Revision: 11438 http://jmol.svn.sourceforge.net/jmol/?rev=11438&view=rev Author: hansonr Date: 2009-09-03 00:42:22 +0000 (Thu, 03 Sep 2009) Log Message: ----------- version=11.8.3_dev # bug fix: compiler error for {xxx}.yy = n \n {xxx}.yy = n Modified Paths: -------------- branches/v11_8/Jmol/src/org/jmol/viewer/Jmol.properties branches/v11_8/Jmol/src/org/jmol/viewer/ScriptCompiler.java Modified: branches/v11_8/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- branches/v11_8/Jmol/src/org/jmol/viewer/Jmol.properties 2009-09-03 00:41:00 UTC (rev 11437) +++ branches/v11_8/Jmol/src/org/jmol/viewer/Jmol.properties 2009-09-03 00:42:22 UTC (rev 11438) @@ -4,6 +4,7 @@ version=11.8.3_dev +# bug fix: compiler error for {xxx}.yy = n \n {xxx}.yy = n # bug fix: compiler error for literal -0 or -0.0 # bug fix: show pointgroup can give wrong format after getproperty PointGroupInfo # bug fix: mmCIF misreads bfactor data Modified: branches/v11_8/Jmol/src/org/jmol/viewer/ScriptCompiler.java =================================================================== --- branches/v11_8/Jmol/src/org/jmol/viewer/ScriptCompiler.java 2009-09-03 00:41:00 UTC (rev 11437) +++ branches/v11_8/Jmol/src/org/jmol/viewer/ScriptCompiler.java 2009-09-03 00:42:22 UTC (rev 11438) @@ -395,7 +395,7 @@ while (ichT < cchScript && isSpaceOrTab(script.charAt(ichT))) ++ichT; return (lookingAtLookupToken(ichT) - && tokLastMath != 0); + && tokLastMath == 1); } private boolean lookingAtEndOfLine() { @@ -2022,7 +2022,7 @@ ++ichT; } } - tokLastMath++; + tokLastMath = 1; break; case '/': if (ichT < cchScript && script.charAt(ichT) == '/') @@ -2032,20 +2032,22 @@ case '!': if (ichT < cchScript && script.charAt(ichT) == '=') ++ichT; - tokLastMath++; + tokLastMath = 1; break; case ')': case ']': case '}': case '.': break; + case '@': + case '{': + tokLastMath = 2; + break; case '(': case ',': - case '{': case '$': case ':': case ';': - case '@': case '%': case '[': tokLastMath = 1; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |