Fix FUNCTION VARIANCE and a test case of FUNCTION SQRT (#280)

Author: yutaro-sakamoto

CHANGELOG.md

@@ -22,6 +22,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 * Fix error handlings of 0 divisions (#273)
 * Fix an error of comparing large numbers (#275)
 * Fix checkings for subscripts (#277)
+* Fix FUNCTION VARIANCE and a test case of FUNCTION SQRT (#280)
 ### Optimized
 * Optimize the file reading process (#257)
 

libcobj/app/src/main/java/jp/osscons/opensourcecobol/libcobj/common/CobolIntrinsic.java

@@ -1554,18 +1554,17 @@ public static AbstractCobolField funcVariance(int prams, AbstractCobolField... f
     }
     CobolDataStorage data = new CobolDataStorage(8);
     field.setDataStorage(data);
-    d4.getDisplayField(field, 0);
-    long n = data.longValue();
+    d4.getField(field, 0);
+    long n = field.getLong();
     int i = 0;
     while (n != 0) {
       n /= 10;
       ++i;
     }
-    field.setDataStorage(null);
+    makeFieldEntry(field);
     if (i <= 18) {
       attr.setScale(18 - i);
     }
-    makeDoubleEntry();
     d4.getField(currField, 0);
     return currField;
   }

libcobj/app/src/main/java/jp/osscons/opensourcecobol/libcobj/data/CobolNumericField.java

@@ -335,7 +335,7 @@ private void moveAlphanumericToDisplay(AbstractCobolField field) {
           // TODO Moduleの情報を参照するコードに編集する
         } else if (c == (byte) '.') {
           ++count;
-          if (count > 0) {
+          if (count > 1) {
             break outer;
           }
 

tests/run.src/functions.at

@@ -1537,7 +1537,6 @@ AT_CHECK([java prog], [0],
 AT_CLEANUP
 
 AT_SETUP([FUNCTION SQRT])
-AT_CHECK([${SKIP_TEST}])
 
 AT_DATA([prog.cob], [
        IDENTIFICATION   DIVISION.
@@ -1548,8 +1547,8 @@ AT_DATA([prog.cob], [
        01  Y   PIC   S9V9(17)   COMP.
        PROCEDURE        DIVISION.
            MOVE FUNCTION SQRT ( X ) TO Y.
-           IF Y >= 1.22474487139158890 AND
-              Y <= 1.22474487139158899
+           IF Y >= 1.2247448713915890 AND
+              Y <= 1.2247448713915900
                    DISPLAY "OK"
                    END-DISPLAY
            ELSE
@@ -1855,7 +1854,6 @@ AT_CHECK([java prog], [0],
 AT_CLEANUP
 
 AT_SETUP([FUNCTION VARIANCE])
-AT_CHECK([${SKIP_TEST}])
 
 AT_DATA([prog.cob], [
        IDENTIFICATION   DIVISION.