javajs/util for CifDataParser and DF

hansonr · hansonr · commit 701e7e68412b · 2021-05-08T12:19:48.000-05:00
diff --git a/sources/net.sf.j2s.core/dist/swingjs/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20210427120017 
+20210505171935 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/timestamp
@@ -1 +1 @@
-20210427120017 
+20210505171935 
diff --git a/sources/net.sf.j2s.java.core/src/javajs/util/CifDataParser.java b/sources/net.sf.j2s.java.core/src/javajs/util/CifDataParser.java
@@ -862,21 +862,35 @@ protected boolean isTerminator(char c) {
   protected boolean isQuote(char ch) {
     switch (ch) {
     case '\'':
-    case '\"':
+    case '"':
     case '\1':
+    case '[':  
+    case ']':
       return  true;
     }
     return false;
   }
 
   /**
-   * CIF 1.0 only. 
+   * CIF 1.0 only.
    * 
-   *  
-   * @param ch current character being pointed to
+   * 
+   * @param ch
+   *        current character being pointed to
    * @return a String data object
    */
   protected Object getQuotedStringOrObject(char ch) {
+    switch (ch) {
+    case '[':
+      try {
+        return readList();
+      } catch (Exception e) {
+        System.out.println("exception in CifDataParser ; " + e);
+      }
+    case ']':
+      ich++;
+      return  "]";
+    }
     int ichStart = ich;
     char chClosingQuote = ch;
     boolean wasQuote = false;
@@ -896,10 +910,49 @@ protected Object getQuotedStringOrObject(char ch) {
       pt2++;
     } else {
       // throw away the last white character
-      ++ich; 
+      ++ich;
     }
     return str.substring(pt1, pt2);
   }
 
+  /**
+   * Read a CIF 2.0 list structure, converting it to either a JSON string or to
+   * a Java data structure
+   * 
+   * @return a string or data structure, depending upon setting asObject
+   * @throws Exception
+   */
+  public Object readList() throws Exception {
+    ich++;
+    // save the current globals cterm and nullString, 
+    // and restore them afterward. 
+    // nullString is what is returned for '.' and '?'; 
+    // for the Jmol CifReader only, this needs to be "\0"
+    char cterm0 = cterm;
+    cterm = ']';
+    String ns = nullString;
+    nullString = null;
+    Lst<Object> lst = (asObject ? new Lst<Object>() : null);
+    int n = 0;
+    String str = "";
+    while (true) {
+      // Iteratively pick up all the objects until the closing bracket
+      // This is akin to an array "deep copy"
+      Object value = (asObject ? getNextTokenObject() : getNextToken());
+      if (value == null || value.equals("]"))
+        break;
+      if (asObject) {
+        lst.addLast(value);
+      } else {
+        if (n++ > 0)
+          str += ",";
+        str += value;
+      }
+    }
+    cterm = cterm0;
+    nullString = ns;
+    return (asObject ? lst : "[" + str + "]");
+  }
+
   
 }
diff --git a/sources/net.sf.j2s.java.core/src/javajs/util/DF.java b/sources/net.sf.j2s.java.core/src/javajs/util/DF.java
@@ -175,4 +175,20 @@ public static String formatDecimalTrimmed(double x, int precision) {
     return str.substring(0, m + 1); // 0.##...
   }
 
+  /**
+   * an alternative to DecimalFormat "0.0"
+   * 
+   * @param x
+   * @param precision
+   * @return  formatted number 
+   */
+  public static String formatDecimalTrimmed0(double x, int precision) {
+    String str = DF.formatDecimalDbl(x, precision);
+    int m = str.length() - 1;
+    int pt = str.indexOf(".") + 1;
+    while (m > pt && str.charAt(m) == '0')
+      m--;
+    return str.substring(0, m + 1); // 0.0##...
+  }
+
 }
