clean help message

diff --git a/calc.c b/calc.c
index deb2f8026becce8ef1f14fd2c76157d6817c99a2..67c4b2e11eabbf3cbd9c571859bcdae2d278db98 100644 (file)
--- a/calc.c
+++ b/calc.c
@@ -71,8 +71,8 @@ int main (int argc, char *argv[])
      while (argc-- > 1) {
         char *arg = *(++argv);
         if (arg[0] != '-') {
-            fprintf (stderr, "%s: invalid option -- '%s'\n", progname, arg);
-            return usage (1);
+            VERBOSE (ERROR, fprintf (stderr, "%s: invalid option -- '%s'\n", progname, arg); usage (1));
+            return 1;
         }
         char c = arg[1];
         switch (c) {
@@ -83,16 +83,16 @@ int main (int argc, char *argv[])
         case 'p':
             arg = (arg[2]) ? arg + 2 : (--argc > 0) ? *(++argv) : NULL;
             if (arg == NULL) {
-                fprintf (stderr, "%s: missing precision\n", progname);
-                return usage (1);
+                VERBOSE (ERROR, fprintf (stderr, "%s: missing precision\n", progname); usage (1));
+                return 1;
             }
             precision = atoi (arg);
             break;
         case 'v':
             arg = (arg[2]) ? arg + 2 : (--argc > 0) ? *(++argv) : NULL;
             if (arg == NULL) {
-                fprintf (stderr, "%s: missing verbose level\n", progname);
-                return usage (1);
+                VERBOSE (ERROR, fprintf (stderr, "%s: missing verbose level\n", progname); usage (1));
+                return 1;
             }
             verbose = atoi (arg);
             break;

diff --git a/parser.c b/parser.c
index 85a74724602c0830f3d60cdf34193687b76db570..53d6e6c78efdea14be71bc4ddc216ddbcc005687 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -359,7 +359,6 @@ element_t *parser (char *str, char **next, int prio)
                         return ERROR_OP;
                     }
                 } else {
-printf("coucou\n"); fflush (stdout);
                     delelement (root);
                     return ERROR_OP;
                 }
@@ -496,6 +495,8 @@ void help (void)
     fprintf (stdout, " + - * / %% ^\n\n");
     fprintf (stdout, "camparison operators:\n");
     fprintf (stdout, " == != >= <= > <\n\n");
+    fprintf (stdout, "logical operators:\n");
+    fprintf (stdout, " & | !\n\n");
     fprintf (stdout, "supported functions:\n");
     fprintf (stdout, " pow sqrt cos sin atan log exp\n\n");
     fprintf (stdout, "storage functions:\n");