Allow unary minus in ftepp_if_value

diff --git a/ftepp.c b/ftepp.c
index 426bfc147f84ca624b4f92bc91b71938826aeeaa..ecc36d8e1851f422aed1c31f0e2696ae71db548a 100644 (file)
--- a/ftepp.c
+++ b/ftepp.c
@@ -788,6 +788,7 @@ static bool ftepp_if_value(ftepp_t *ftepp, bool *out, double *value_out)
 {
     ppmacro *macro;
     bool     wasnot = false;
 {
     ppmacro *macro;
     bool     wasnot = false;

+    bool     wasneg = false;

 
     if (!ftepp_skipspace(ftepp))
         return false;
 
     if (!ftepp_skipspace(ftepp))
         return false;


@@ -799,6 +800,14 @@ static bool ftepp_if_value(ftepp_t *ftepp, bool *out, double *value_out)
             return false;
     }
 
             return false;
     }
 

+    if (ftepp->token == TOKEN_OPERATOR && !strcmp(ftepp_tokval(ftepp), "-"))
+    {
+        wasneg = true;
+        ftepp_next(ftepp);
+        if (!ftepp_skipspace(ftepp))
+            return false;
+    }
+

     switch (ftepp->token) {
         case TOKEN_IDENT:
         case TOKEN_TYPENAME:
     switch (ftepp->token) {
         case TOKEN_IDENT:
         case TOKEN_TYPENAME:


@@ -855,6 +864,7 @@ static bool ftepp_if_value(ftepp_t *ftepp, bool *out, double *value_out)
             }
             break;
         case TOKEN_STRINGCONST:
             }
             break;
         case TOKEN_STRINGCONST:

+            *value_out = 0;

             *out = false;
             break;
         case TOKEN_INTCONST:
             *out = false;
             break;
         case TOKEN_INTCONST:


@@ -878,8 +888,12 @@ static bool ftepp_if_value(ftepp_t *ftepp, bool *out, double *value_out)
 
         default:
             ftepp_error(ftepp, "junk in #if: `%s` ...", ftepp_tokval(ftepp));
 
         default:
             ftepp_error(ftepp, "junk in #if: `%s` ...", ftepp_tokval(ftepp));

+            if (opts.debug)
+                ftepp_error(ftepp, "internal: token %i\n", ftepp->token);

             return false;
     }
             return false;
     }

+    if (wasneg)
+        *value_out = -*value_out;

     if (wasnot) {
         *out = !*out;
         *value_out = (*out ? 1 : 0);
     if (wasnot) {
         *out = !*out;
         *value_out = (*out ? 1 : 0);