GNU Mes.

[mes.git] / lib / libmes.c

diff --git a/lib/libmes.c b/lib/libmes.c
index 9f09b6f38c42ab65050472665f643ab8a198c3a5..ee26d44a28b7df496441a5e3bf0b80e7fee63655 100644 (file)
--- a/lib/libmes.c
+++ b/lib/libmes.c
@@ -1,24 +1,27 @@
 /* -*-comment-start: "//";comment-end:""-*-
- * Mes --- Maxwell Equations of Software
+ * GNU Mes --- Maxwell Equations of Software
  * Copyright © 2016,2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  *
- * This file is part of Mes.
+ * This file is part of GNU Mes.
  *
- * Mes is free software; you can redistribute it and/or modify it
+ * GNU Mes is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or (at
  * your option) any later version.
  *
- * Mes is distributed in the hope that it will be useful, but
+ * GNU Mes is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Mes.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <libmes.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 int
 isdigit (int c)
@@ -29,7 +32,7 @@ isdigit (int c)
 int
 isxdigit (int c)
 {
-  return isdigit (c) || c >= 'a' && c <= 'f';
+  return isdigit (c) || (c >= 'a' && c <= 'f');
 }
 
 int
@@ -82,7 +85,7 @@ atoi (char const *s)
 }
 
 char const*
-itoa (int x)
+number_to_ascii (int x, int base, int signed_p)
 {
   static char itoa_buf[12];
   char *p = itoa_buf + 11;
@@ -90,7 +93,7 @@ itoa (int x)
 
   int sign = 0;
   unsigned u = x;
-  if (x < 0)
+  if (signed_p && x < 0)
     {
       sign = 1;
       u = -x;
@@ -98,8 +101,9 @@ itoa (int x)
 
   do
      {
-       *p-- = '0' + (u % 10);
-       u = u / 10;
+       int i = u % base;
+       *p-- = i > 9 ? 'a' + i - 10 : '0' + i;
+       u = u / base;
      } while (u);
 
   if (sign && *(p + 1) != '0')
@@ -111,32 +115,23 @@ itoa (int x)
 char const*
 itoab (int x, int base)
 {
-  static char itoa_buf[12];
-  char *p = itoa_buf + 11;
-  *p-- = 0;
-
-  int sign = 0;
-  unsigned u = x;
-  if (x < 0)
-    {
-      sign = 1;
-      u = -x;
-    }
-
-  do
-     {
-       int i = u % base;
-       *p-- = i > 9 ? 'a' + i - 10 : '0' + i;
-       x = u / base;
-     } while (u);
+  return number_to_ascii (x, base, 1);
+}
 
-  if (sign && *(p + 1) != '0')
-    *p-- = '-';
+char const*
+itoa (int x)
+{
+  return number_to_ascii (x, 10, 1);
+}
 
-  return p+1;
+char const*
+utoa (unsigned x)
+{
+  return number_to_ascii (x, 10, 0);
 }
 
 int _ungetc_pos = -1;
+int _ungetc_fd = -1;
 char _ungetc_buf[10];
 
 int
@@ -154,7 +149,29 @@ fdgetc (int fd)
   else
     {
       i = _ungetc_buf[_ungetc_pos];
+      if (_ungetc_fd != fd && i == 10)
+        {
+          // FIXME: Nyacc's ungetc exposes harmless libmec.c bug
+          // we need one unget position per FD
+          _ungetc_pos = -1;
+          _ungetc_fd = -1;
+          return fdgetc (fd);
+        }
+      else if (_ungetc_fd != fd)
+        {
+          eputs (" ***MES LIB C*** fdgetc ungetc conflict unget-fd=");
+          eputs (itoa (_ungetc_fd));
+          eputs (", fdgetc-fd=");
+          eputs (itoa (fd));
+          eputs (", c=");
+          eputs (itoa ( _ungetc_buf[_ungetc_pos]));
+          eputs ("\n");
+          exit (1);
+        }
+      i = _ungetc_buf[_ungetc_pos];
       _ungetc_pos -= 1;
+      if (_ungetc_pos == -1)
+        _ungetc_fd = -1;
      }
   if (i < 0)
     i += 256;
@@ -169,13 +186,6 @@ fdputc (int c, int fd)
   return 0;
 }
 
-int
-putchar (int c)
-{
-  write (STDOUT, (char*)&c, 1);
-  return 0;
-}
-
 int
 fdputs (char const* s, int fd)
 {
@@ -187,13 +197,43 @@ fdputs (char const* s, int fd)
 int
 fdungetc (int c, int fd)
 {
+  if (c == -1)
+    return c;
+  if (_ungetc_pos == -1)
+    _ungetc_fd = fd;
+  else if (_ungetc_fd != fd)
+    {
+      eputs (" ***MES LIB C*** fdungetc ungetc conflict unget-fd=");
+      eputs (itoa (_ungetc_fd));
+      eputs (", fdungetc-fd=");
+      eputs (itoa (fd));
+      eputs ("\n");
+      exit (1);
+    }
   _ungetc_pos++;
   _ungetc_buf[_ungetc_pos] = c;
   return c;
 }
 
 int
-getchar ()
+_fdungetc_p (int fd)
+{
+  return _ungetc_pos > -1;
+}
+
+#if POSIX || __x86_64__
+#define STDERR 2
+int
+eputs (char const* s)
+{
+  int i = strlen (s);
+  write (STDERR, s, i);
+  return 0;
+}
+#endif
+
+int
+eputc (int c)
 {
-  return fdgetc (g_stdin);
+  return fdputc (c, STDERR);
 }