From 297778127bd402a1825dacddc57fd097c31fbeeb Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Sun, 1 Dec 2013 12:01:00 +0100
Subject: [PATCH] xpressn.c, drop "Defd" enum, to be incorporated into a bigger
 enum

---
 src/frontend/numparam/numparam.h | 2 --
 src/frontend/numparam/xpressn.c  | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/frontend/numparam/numparam.h b/src/frontend/numparam/numparam.h
index 07890a0b4..44099148b 100644
--- a/src/frontend/numparam/numparam.h
+++ b/src/frontend/numparam/numparam.h
@@ -13,8 +13,6 @@ typedef enum {Nodekey = '#'} _nNodekey;  /* Introduces node symbol */
 typedef enum {Intro   = '&'} _nIntro;    /* Introduces preprocessor tokens */
 typedef enum {Comment = '*'} _nComment;  /* Spice Comment lines */
 typedef enum {Psp     = '{'} _nPsp;      /* Ps expression */
-typedef enum {Defd    = 6} _nDefd;      /* serial numb. of 'defined' keyword.
-                                            The others are not used (yet) */
 
 typedef char *auxtable;         /* dummy */
 
diff --git a/src/frontend/numparam/xpressn.c b/src/frontend/numparam/xpressn.c
index 3467d57c9..dd3a29b72 100644
--- a/src/frontend/numparam/xpressn.c
+++ b/src/frontend/numparam/xpressn.c
@@ -1016,7 +1016,7 @@ opfunctkey(tdico *dico,
         state = S_binop;
         level = 3;
         break;
-    case Defd:
+    case 6:
         c = '?';
         state = S_atom;
         level = 0;
@@ -1260,7 +1260,7 @@ formula(tdico *dico, const char *s, const char *s_end, bool *perror)
                 c = opfunctkey(dico, kw, c, &state, &level, &error);
             }
 
-            if (kw == Defd) {
+            if (kw == 6) {
                 u = exists(dico, s_end, &s, &error);
             }
         } else if (((c == '.') || ((c >= '0') && (c <= '9')))) {