[Jmol-commits] SF.net SVN: jmol: [6849] trunk/Jmol/src/org/jmol/viewer

[<ha...@us...>]

Revision: 6849
          http://svn.sourceforge.net/jmol/?rev=6849&view=rev
Author:   hansonr
Date:     2007-02-16 23:33:51 -0800 (Fri, 16 Feb 2007)

Log Message:
-----------


Modified Paths:
--------------
    trunk/Jmol/src/org/jmol/viewer/Compiler.java
    trunk/Jmol/src/org/jmol/viewer/Eval.java

Modified: trunk/Jmol/src/org/jmol/viewer/Compiler.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Compiler.java	2007-02-17 07:23:14 UTC (rev 6848)
+++ trunk/Jmol/src/org/jmol/viewer/Compiler.java	2007-02-17 07:33:51 UTC (rev 6849)
@@ -846,6 +846,7 @@
       for (int i = 0; i < atokenCommand.length; i++)
         Logger.debug(i + ": " + atokenCommand[i]);
     }
+    
 
     //compile color parameters
 
@@ -855,16 +856,15 @@
     //compile expressions
 
     isSetExpression =  (tokCommand == Token.set || tokCommand == Token.ifcmd);// && size > 3 && atokenCommand[2].tok == Token.leftbrace);
-    isNumericExpression = false;//(tokCommand == Token.ifcmd);
-    boolean checkExpression = (isNumericExpression || tokAttrOr(tokCommand,
+    boolean checkExpression = (tokAttrOr(tokCommand,
         Token.expressionCommand, Token.embeddedExpression));
-    if (!isNumericExpression && !tokAttr(tokCommand, Token.coordOrSet)) {
+    if (!tokAttr(tokCommand, Token.coordOrSet)) {
       // $ or { at beginning disallow expression checking for center command
       int firstTok = (size == 1 ? Token.nada : atokenCommand[1].tok);
       if ((firstTok == Token.leftbrace || firstTok == Token.dollarsign))
         checkExpression = false;
     }
-    isBitSetExpression = !isNumericExpression;
+    isBitSetExpression = true;
     if (checkExpression && !compileExpression())
       return false;
 
@@ -969,7 +969,7 @@
 
   private boolean compileExpression() {
     int tokCommand = atokenCommand[0].tok;
-    boolean isMultipleOK = (isNumericExpression || tokAttr(tokCommand, Token.embeddedExpression));
+    boolean isMultipleOK = (tokAttr(tokCommand, Token.embeddedExpression));
     int expPtr = 1;
     if (tokCommand == Token.define || tokCommand == Token.set)
       expPtr = 2;
@@ -977,16 +977,17 @@
       return true;
     while (expPtr > 0 && expPtr < atokenCommand.length) {
       if (isMultipleOK)
-        while (!isNumericExpression && expPtr < atokenCommand.length
-            && atokenCommand[expPtr].tok != (isSetExpression ? Token.leftbrace : Token.leftparen))
+        while (expPtr < atokenCommand.length
+            && atokenCommand[expPtr].tok != (isSetExpression ? Token.leftbrace
+                : Token.leftparen))
           ++expPtr;
       // 0 here means OK; -1 means error;
       // > 0 means pointer to the next expression
       if (expPtr >= atokenCommand.length)
-          break;
+        break;
       if ((expPtr = compileExpression(expPtr)) <= 0)
         break;
-      if (!isNumericExpression && !isMultipleOK)
+      if (!isMultipleOK)
         return endOfExpressionExpected();
     }
     return (expPtr == atokenCommand.length || expPtr == 0);
@@ -1118,7 +1119,6 @@
     return (atokenInfix[itokenInfix].tok == tok);
   }
 
-  boolean isNumericExpression;
   boolean isBitSetExpression;
   boolean isSetExpression;
   
@@ -1209,19 +1209,7 @@
         return rightParenthesisExpected();
       return true;
     case Token.leftbrace:
-      if (isNumericExpression) {
-        if (isBitSetExpression)
-          break;
-        addTokenToPostfix(tokenNext());
-        isBitSetExpression = true;
-        if (!clauseOr())
-          return false;
-        isBitSetExpression = false;
-        if (tokPeek() != Token.rightbrace)
-          return rightBraceExpected();
-        return clauseComparator();
-        //        return (isSetExpression ? addTokenToPostfix(tokenNext()) : clauseComparator());        
-      } else if (isSetExpression) {
+      if (isSetExpression) {
         // allows for the possibility of {x y z} or {a/b c/d e/f}
         tokenNext();
         if (!clauseOr())
@@ -1235,7 +1223,6 @@
             return rightBraceExpected();
         }
         return true;
-
       } else if (!bitset())
         return false;
       return true;

Modified: trunk/Jmol/src/org/jmol/viewer/Eval.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Eval.java	2007-02-17 07:23:14 UTC (rev 6848)
+++ trunk/Jmol/src/org/jmol/viewer/Eval.java	2007-02-17 07:33:51 UTC (rev 6849)
@@ -5163,7 +5163,7 @@
           int i = intParameter(2);
           pt = new Point3f(i, i, i);
         } else {
-          pt = getSetCoordinate(2, true, false);
+          pt = getSetCoordinate(2, false, false);
         }
         if (!isSyntaxCheck)
           viewer.setDefaultLattice(pt);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.