Introduce formats in preprocessor variables.

* configure.ac: Version 1.9.90
* NEWS: Likewise.
* etc/Makefile.am (EXTRA_DIST): Add logfilter.awk uptmpl.sed
* etc/logfilter.awk: New file
* etc/uptmpl.sed: New file
* etc/tagr.tmpl: Update
* etc/upgrade.awk: Add copyleft header
* gnulib.modules: Add fprintftime.
* src/graph.c (rate_unit): Change to "Bytes per Second".
(number_suffix, number_suffix_count): Move to grid.c
* src/html.gram.y: Work with formats.
* src/html.lex.l: Likewise.
* src/output.c (update_output): Store NOW as a number and
provide a formatting function for it.
* src/tagr.h (union value, value_format_fn): New types.
(pp_value_t): New members: fmt, format
(add_numeric_value, add_string_value): Change return type.
(init_value): New proto.

6 files changed, 173 insertions, 75 deletions

diff --git a/src/graph.c b/src/graph.c
index 16483bb..bfd00cb 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -55,9 +55,5 @@ int graph_h_margin[2] = { 100, 14 };
 int graph_v_margin[2] = { 14, 35 };
 
-char *rate_unit = "Bits per Second";
-
-static char *short_suffix[] = {"", "k", "M", "G", "T"};
-char **number_suffix = short_suffix;
-size_t number_suffix_count = sizeof (short_suffix) / sizeof (short_suffix[0]);
+char *rate_unit = "Bytes per Second";
 
 #define make_color_index(g, ar) \
@@ -99,5 +95,6 @@ draw_graph (FILE *fp,
   
 #define ytr(y)                      \
-  (unsigned long) ((ymax >= (y) ? (ymax - (y)) : ymax) * yscale + graph_h_margin[1])
+  (unsigned long) ((ymax >= (y) ? (ymax - (y)) : ymax) * \
+                    yscale + graph_h_margin[1])
 #define xtr(x)                      \
   (unsigned long) (growright ?      \
diff --git a/src/grid.c b/src/grid.c
index f4a75e1..1671753 100644
--- a/src/grid.c
+++ b/src/grid.c
@@ -81,4 +81,9 @@ grid_free_data (void *ptr)
 
 
+/* FIXME: Suffixes not yet used. */
+static char *short_suffix[] = {"", "k", "M", "G", "T"};
+char **number_suffix = short_suffix;
+size_t number_suffix_count = sizeof (short_suffix) / sizeof (short_suffix[0]);
+
 struct ygrid_data
 {
diff --git a/src/html.gram.y b/src/html.gram.y
index bce5e93..fae64ff 100644
--- a/src/html.gram.y
+++ b/src/html.gram.y
@@ -37,4 +37,6 @@ static FILE *tmp_file;
 static void out_char (int c);
 static void out_value (pp_value_t *val);
+static void deduce_format (pp_value_t *res,
+                           const pp_value_t *a, const pp_value_t *b);
  
 %}
@@ -84,5 +86,5 @@ eval  : IDENT
       | obrace error cbrace
         {
-          $$.type = unspecified_value;
+          init_value (&$$, unspecified_value, NULL);
         }
       ;
@@ -109,14 +111,14 @@ expr  : value
           if ($1.type == unspecified_value
               || $3.type == unspecified_value)
-            $$.type = unspecified_value;
+            init_value (&$$, unspecified_value, NULL);
           else if ($1.type != $3.type)
             {
               yyerror ("type mismatch in addition");
-              $$.type = unspecified_value;
+              init_value (&$$, unspecified_value, NULL);
             }
           else
             {
               $$.type = $1.type;
-              $$.prec = maxprec ($1.prec, $3.prec);
+              deduce_format (&$$, &$1, &$3);
               switch ($1.type)
                 {
@@ -141,19 +143,19 @@ expr  : value
           if ($1.type == unspecified_value
               || $3.type == unspecified_value)
-            $$.type = unspecified_value;
+            init_value (&$$, unspecified_value, NULL);
           else if ($1.type != $3.type)
             {
               yyerror ("type mismatch in subtraction");
-              $$.type = unspecified_value;
+              init_value (&$$, unspecified_value, NULL);
             }
           else if ($1.type == string_value)
             {
               yyerror ("subtraction not defined for strings");
-              $$.type = unspecified_value;
+              init_value (&$$, unspecified_value, NULL);
             }
           else
             {
               $$.type = $1.type;
-              $$.prec = maxprec ($1.prec, $3.prec);
+              deduce_format (&$$, &$1, &$3);
               $$.v.number = $1.v.number - $3.v.number;
             }
@@ -163,19 +165,19 @@ expr  : value
           if ($1.type == unspecified_value
               || $3.type == unspecified_value)
-            $$.type = unspecified_value;
+            init_value (&$$, unspecified_value, NULL);
           else if ($1.type != $3.type)
             {
               yyerror ("type mismatch in multiplication");
-              $$.type = unspecified_value;
+              init_value (&$$, unspecified_value, NULL);
             }
           else if ($1.type == string_value)
             {
               yyerror ("multiplication not defined for strings");
-              $$.type = unspecified_value;
+              init_value (&$$, unspecified_value, NULL);
             }
           else
             {
               $$.type = $1.type;
-              $$.prec = maxprec ($1.prec, $3.prec);
+              deduce_format (&$$, &$1, &$3);
               $$.v.number = $1.v.number * $3.v.number;
             }
@@ -185,24 +187,24 @@ expr  : value
           if ($1.type == unspecified_value
               || $3.type == unspecified_value)
-            $$.type = unspecified_value;
+            init_value (&$$, unspecified_value, NULL);
           else if ($1.type != $3.type)
             {
               yyerror ("type mismatch in division");
-              $$.type = unspecified_value;
+              init_value (&$$, unspecified_value, NULL);
             }
           else if ($1.type == string_value)
             {
               yyerror ("division not defined for strings");
-              $$.type = unspecified_value;
+              init_value (&$$, unspecified_value, NULL);
             }
           else if (fabs ($3.v.number) < 1.0e-5)
             {
               yyerror ("division by zero");
-              $$.type = unspecified_value;
+              init_value (&$$, unspecified_value, NULL);
             }
           else
             {
               $$.type = $1.type;
-              $$.prec = maxprec ($1.prec, $3.prec);
+              deduce_format (&$$, &$1, &$3);
               $$.v.number = $1.v.number / $3.v.number;
             }
@@ -211,14 +213,13 @@ expr  : value
         {
           if ($2.type == unspecified_value) 
-            $$.type = unspecified_value;
+            init_value (&$$, unspecified_value, NULL);
           else if ($2.type == string_value)
             {
               yyerror ("unary minus not defined for strings");
-              $$.type = unspecified_value;
+              init_value (&$$, unspecified_value, NULL);
             }
           else
             {
-              $$.type = $2.type;
-              $$.prec = $2.prec;
+              $$ = $2;
               $$.v.number = - $2.v.number;
             }
@@ -227,9 +228,9 @@ expr  : value
         {
           if ($2.type == unspecified_value)
-            $$.type = unspecified_value;
+            init_value (&$$, unspecified_value, NULL);
           else if ($2.type == string_value)
             {
               yyerror ("unary plus not defined for strings");
-              $$.type = unspecified_value;
+              init_value (&$$, unspecified_value, NULL);
             }
           else
@@ -243,7 +244,7 @@ value : IDENT
       | NUMBER