X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fexpr-evl.c;h=a1b540e4974d984f78036eb8305be6ed285c5682;hb=e22db86f67a3b77124af022bbd734922c62c424c;hp=0699e86b0b4c1d03a3260f37626f72eb661296ab;hpb=7b98b3a4f58f6dc5a8e9cbc188b627966d5e652d;p=pspp

diff --git a/src/expr-evl.c b/src/expr-evl.c
index 0699e86b0b..a1b540e497 100644
--- a/src/expr-evl.c
+++ b/src/expr-evl.c
@@ -37,11 +37,11 @@
 #include <math.h>
 #include <errno.h>
 #include <stdio.h>
-#include "approx.h"
 #include "data-in.h"
 #include "error.h"
 #include "julcal/julcal.h"
 #include "magic.h"
+#include "misc.h"
 #include "pool.h"
 #include "random.h"
 #include "stats.h"
@@ -50,14 +50,6 @@
 #include "vfm.h"
 #include "vfmP.h"
 
-/* FIXME: This could be even more efficient if we caught SYSMIS when
-   it first reared its ugly head, then threw it into an entirely new
-   switch that handled SYSMIS aggressively like all the code does now.
-   But I've spent a couple of weeks on the expression code, and that's
-   enough to make anyone sick.  For that matter, it could be more
-   efficient if I hand-coded it in assembly for a dozen processors,
-   but I'm not going to do that either. */
-
 double
 expr_evaluate (struct expression *e, struct ccase *c, union value *v)
 {
@@ -110,7 +102,7 @@ expr_evaluate (struct expression *e, struct ccase *c, union value *v)
 	  sp--;
 	  if (sp[0].f == SYSMIS)
 	    {
-	      if (approx_eq (sp[1].f, 0.0))
+	      if (sp[1].f == 0.0)
 		sp->f = 1.0;
 	    }
 	  else if (sp[1].f == SYSMIS)
@@ -121,16 +113,14 @@ expr_evaluate (struct expression *e, struct ccase *c, union value *v)
 	      else
 		sp->f = SYSMIS;
 	    }
-	  else if (approx_eq (sp[0].f, 0.0) && approx_eq (sp[1].f, 0.0))
+	  else if (sp[0].f == 0.0 && sp[1].f == 0.0)
 	    sp->f = SYSMIS;
 	  else
 	    sp->f = pow (sp[0].f, sp[1].f);
 	  break;
 
 	case OP_AND:
-	  /* Note that the equality operator (==) may be used here
-	     (instead of approx_eq) because booleans are always
-	     *exactly* 0, 1, or SYSMIS.
+	  /* Note that booleans are always one of 0, 1, or SYSMIS.
 
 	     Truth table (in order of detection):
 
@@ -201,7 +191,7 @@ expr_evaluate (struct expression *e, struct ccase *c, union value *v)
 	      if (sp[1].f == SYSMIS)
 		sp->f = SYSMIS;
 	      else
-		sp->f = approx_eq (sp[0].f, sp[1].f);
+		sp->f = sp[0].f == sp[1].f;
 	    }
 	  break;
 	case OP_GE:
@@ -211,7 +201,7 @@ expr_evaluate (struct expression *e, struct ccase *c, union value *v)
 	      if (sp[1].f == SYSMIS)
 		sp->f = SYSMIS;
 	      else
-		sp->f = approx_ge (sp[0].f, sp[1].f);
+		sp->f = sp[0].f >= sp[1].f;
 	    }
 	  break;
 	case OP_GT:
@@ -221,7 +211,7 @@ expr_evaluate (struct expression *e, struct ccase *c, union value *v)
 	      if (sp[1].f == SYSMIS)
 		sp->f = SYSMIS;
 	      else
-		sp->f = approx_gt (sp[0].f, sp[1].f);
+		sp->f = sp[0].f > sp[1].f;
 	    }
 	  break;
 	case OP_LE:
@@ -231,7 +221,7 @@ expr_evaluate (struct expression *e, struct ccase *c, union value *v)
 	      if (sp[1].f == SYSMIS)
 		sp->f = SYSMIS;
 	      else
-		sp->f = approx_le (sp[0].f, sp[1].f);
+		sp->f = sp[0].f <= sp[1].f;
 	    }
 	  break;
 	case OP_LT:
@@ -241,7 +231,7 @@ expr_evaluate (struct expression *e, struct ccase *c, union value *v)
 	      if (sp[1].f == SYSMIS)
 		sp->f = SYSMIS;
 	      else
-		sp->f = approx_lt (sp[0].f, sp[1].f);
+		sp->f = sp[0].f < sp[1].f;
 	    }
 	  break;
 	case OP_NE:
@@ -251,7 +241,7 @@ expr_evaluate (struct expression *e, struct ccase *c, union value *v)
 	      if (sp[1].f == SYSMIS)
 		sp->f = SYSMIS;
 	      else
-		sp->f = approx_ne (sp[0].f, sp[1].f);
+		sp->f = sp[0].f != sp[1].f;
 	    }
 	  break;
 
@@ -404,7 +394,7 @@ expr_evaluate (struct expression *e, struct ccase *c, union value *v)
 	    if (sp->f == SYSMIS)
 	      break;
 	    for (i = 1; i <= n_args; i++)
-	      if (approx_eq (sp[0].f, sp[i].f))
+	      if (sp[0].f == sp[i].f)
 		{
 		  sp->f = 1.0;
 		  goto main_loop;
@@ -545,8 +535,7 @@ expr_evaluate (struct expression *e, struct ccase *c, union value *v)
 	    for (i = 1; i <= n_args; i += 2)
 	      if (sp[i].f == SYSMIS || sp[i + 1].f == SYSMIS)
 		continue;
-	      else if (approx_ge (sp[0].f, sp[i].f)
-		       && approx_le (sp[0].f, sp[i + 1].f))
+	      else if (sp[0].f >= sp[i].f && sp[0].f <= sp[i + 1].f)
 		{
 		  sp->f = 1.0;
 		  goto main_loop;
@@ -1061,6 +1050,7 @@ expr_evaluate (struct expression *e, struct ccase *c, union value *v)
 	    dest = pool_alloc (e->pool, f.w + 1);
 	    dest[0] = f.w;
 
+            assert ((formats[f.type].cat & FCAT_STRING) == 0);
 	    data_out (&dest[1], &f, sp);
 	    sp->c = dest;
 	  }
@@ -1116,9 +1106,9 @@ expr_evaluate (struct expression *e, struct ccase *c, union value *v)
 	    sp->f *= sp->f;
 	  break;
 	case OP_NUM_TO_BOOL:
-	  if (approx_eq (sp->f, 0.0))
+	  if (sp->f == 0.0)
 	    sp->f = 0.0;
-	  else if (approx_eq (sp->f, 1.0))
+	  else if (sp->f == 1.0)
 	    sp->f = 1.0;
 	  else if (sp->f != SYSMIS)
 	    {
@@ -1137,7 +1127,7 @@ expr_evaluate (struct expression *e, struct ccase *c, union value *v)
 	    {
 	      if (sp[1].f == SYSMIS)
 		{
-		  if (approx_ne (sp[0].f, 0.0))
+		  if (sp[0].f != 0.0)
 		    sp->f = SYSMIS;
 		}
 	      else
@@ -1292,12 +1282,6 @@ expr_evaluate (struct expression *e, struct ccase *c, union value *v)
 	  goto finished;
 
 	default:
-#if GLOBAL_DEBUGGING
-	  printf (_("evaluate_expression(): not implemented: %s\n"),
-		  ops[op[-1]].name);
-#else
-	  printf (_("evaluate_expression(): not implemented: %d\n"), op[-1]);
-#endif
 	  assert (0);
 	}