[translation] Avoid name conflict with C macros isinf(), isnan()

This is issue #2326

Moving the functions to mylib should also help with translation to other
languages.

Unrelated:

[metrics] Compare against nosouffle build

Author: Andy C

build/doc.sh

@@ -307,7 +307,7 @@ code:not(pre code) {
 }
 </style>
 
-This doc mirrors the `--help` for the 3 shell tools in the build sytsem:
+This doc mirrors the `--help` for the 3 shell tools in the build system:
 
 1. `configure` - Detect system features
 1. `_build/oils.sh` - Compile `oils-for-unix` source into an executable

cpp/stdlib.cc

@@ -20,18 +20,6 @@
 
 using error::e_die;
 
-namespace math {
-
-bool isinf(double f) {
-  return ::isinf(f);
-}
-
-bool isnan(double f) {
-  return ::isnan(f);
-}
-
-}  // namespace math
-
 namespace fcntl_ {
 
 int fcntl(int fd, int cmd) {

cpp/stdlib.h

@@ -9,13 +9,6 @@
 
 #include "mycpp/runtime.h"
 
-namespace math {
-
-bool isinf(double f);
-bool isnan(double f);
-
-}  // namespace math
-
 namespace fcntl_ {
 
 // for F_GETFD

data_lang/j8.py

@@ -23,8 +23,6 @@
     - NIL8 at least has no commas for [1 2 "hi"]
 """
 
-import math
-
 from _devbuild.gen.id_kind_asdl import Id, Id_t, Id_str
 from _devbuild.gen.nil8_asdl import (nvalue, nvalue_t)
 from _devbuild.gen.runtime_asdl import error_code_e
@@ -38,7 +36,7 @@
 from frontend import match
 from mycpp import mops
 from mycpp import mylib
-from mycpp.mylib import tagswitch, iteritems, NewDict, log
+from mycpp.mylib import tagswitch, iteritems, NewDict, log, isinf_, isnan_
 
 import fastfunc
 
@@ -500,14 +498,14 @@ def Print(self, val, level=0):
                 val = cast(value.Float, UP_val)
 
                 fl = val.f
-                if math.isinf(fl):
+                if isinf_(fl):
                     if self.options & INF_NAN_ARE_NULL:
                         s = 'null'  # negative infinity is null too
                     else:
                         s = 'INFINITY'
                         if fl < 0:
                             s = '-' + s
-                elif math.isnan(fl):
+                elif isnan_(fl):
                     if self.options & INF_NAN_ARE_NULL:
                         # JavaScript JSON lib behavior: Inf and NaN are null
                         # Python has a bug in the encoder by default, and then

display/pp_value.py

@@ -4,8 +4,6 @@
 Render Oils value_t -> doc_t, so it can be pretty printed
 """
 
-import math
-
 from _devbuild.gen.pretty_asdl import (doc, Measure, MeasuredDoc)
 from _devbuild.gen.runtime_asdl import error_code_e
 from _devbuild.gen.value_asdl import Obj, value, value_e, value_t, value_str
@@ -17,7 +15,7 @@
 from display.pretty import _Break, _Concat, AsciiText
 from frontend import match
 from mycpp import mops
-from mycpp.mylib import log, tagswitch, iteritems
+from mycpp.mylib import log, tagswitch, iteritems, isinf_, isnan_
 from typing import cast, List, Dict
 
 import libc
@@ -35,11 +33,11 @@ def FloatString(fl):
     # type: (float) -> str
 
     # Print in YSH syntax, similar to data_lang/j8.py
-    if math.isinf(fl):
+    if isinf_(fl):
         s = 'INFINITY'
         if fl < 0:
             s = '-' + s
-    elif math.isnan(fl):
+    elif isnan_(fl):
         s = 'NAN'
     else:
         s = str(fl)

metrics/native-code.sh

@@ -126,7 +126,7 @@ compare-gcc-clang() {
 
   local -a targets=(
     _bin/{clang,cxx}-opt/bin/oils_for_unix.mycpp.stripped
-    _bin/{clang,cxx}-opt/bin/oils_for_unix.mycpp-souffle.stripped
+    _bin/{clang,cxx}-opt/bin/oils_for_unix.mycpp-nosouffle.stripped
     _bin/cxx-{opt+bumpleak,opt+bumproot,opt+bigint}/bin/oils_for_unix.mycpp.stripped
     _bin/{clang,cxx}-opt/yaks/yaks_main.mycpp.stripped
     #_bin/cxx-{opt+bumpleak,opt+bumproot}/yaks/yaks_main.mycpp.stripped

mycpp/gc_mylib.cc

@@ -1,13 +1,22 @@
 #include "mycpp/gc_mylib.h"
 
 #include <errno.h>
+#include <math.h>
 #include <stdio.h>
 #include <unistd.h>  // isatty
 
 #include "mycpp/gc_iolib.h"
 
 namespace mylib {
 
+bool isinf_(double f) {
+  return ::isinf(f);
+}
+
+bool isnan_(double f) {
+  return ::isnan(f);
+}
+
 void InitCppOnly() {
   // We don't seem need this now that we have ctx_FlushStdout().
   // setvbuf(stdout, 0, _IONBF, 0);

mycpp/gc_mylib.h

@@ -13,6 +13,9 @@ class Dict;
 
 namespace mylib {
 
+bool isinf_(double f);
+bool isnan_(double f);
+
 void InitCppOnly();
 
 // Wrappers around our C++ APIs

mycpp/mylib.py

@@ -12,6 +12,7 @@
     cStringIO = None
     import io
 
+import math
 import sys
 
 from pylib import collections_
@@ -35,6 +36,17 @@
 STDIN_FILENO = 0
 
 
+# Avoid name conflicts with C Macros
+def isinf_(x):
+    # type: (float) -> bool
+    return math.isinf(x)
+
+
+def isnan_(x):
+    # type: (float) -> bool
+    return math.isnan(x)
+
+
 def MaybeCollect():
     # type: () -> None
     pass