new function: format

[calc.git] / format.c

diff --git a/format.c b/format.c
index 48cc56f57951d5d528d08eb726bd6388ed728277..152875022ad8a10f826378c7d611a5abd5d6edd4 100644 (file)
--- a/format.c
+++ b/format.c
@@ -7,36 +7,78 @@
 /* global variables */
 
 #define DEFAULT_FORMAT "=> %.6g\n"
-char *format = NULL;
-char *minform = NULL;
+char *_format = NULL;
+#define DEFAULT_MINFORM "%.6g"
+char *_minform = NULL;
+
+int _precision = 6;
+
+#define DEFAULT_PROMPT "=> "
+char *_prompt = NULL;
 
 /* print function */
 
-void set_format (char *prompt, int precision)
+void set_precision (int precision)
+{
+    _precision = precision;
+}
+
+int get_precision ()
+{
+    return _precision;
+}
+
+void set_prompt (char *prompt)
+{
+    if (_prompt) {
+        free (_prompt);
+    }
+    _prompt = strdup (prompt);
+}
+
+void set_format ()
 {
     char buffer[128] = {0};
-    free_format ();
-    sprintf (buffer, "%s%%.%dg\n", prompt, precision);
-    format = strdup (buffer);
-    sprintf (buffer, "%%.%dg", precision);
-    minform = strdup (buffer);
+    sprintf (buffer, "%s%%.%dg\n", _prompt ? _prompt : DEFAULT_PROMPT, _precision);
+    if (_format) {
+        free (_format);
+    }
+    _format = strdup (buffer);
+    sprintf (buffer, "%%.%dg", _precision);
+    if (_minform) {
+        free (_minform);
+    }
+    _minform = strdup (buffer);
 }
 
 void free_format ()
 {
-    if (format) {
-        free (format);
-        format = NULL;
+    if (_format) {
+        free (_format);
+        _format = NULL;
     }
-    if (minform) {
-        free (minform);
-        minform = NULL;
+    if (_minform) {
+        free (_minform);
+        _minform = NULL;
+    }
+    if (_prompt) {
+        free (_prompt);
+        _prompt = NULL;
     }
 }
 
 double print (double value)
 {
-    fprintf (stdout, format ? format : DEFAULT_FORMAT, value);
+    fprintf (stdout, _format ? _format : DEFAULT_FORMAT, value);
+    fflush (stdout);
+    return value;
+}
+
+double printl (double value)
+{
+    fprintf (stdout, _minform ? _minform : DEFAULT_MINFORM, value);
     fflush (stdout);
     return value;
 }
+
+/* vim: set ts=4 sw=4 et: */