Fixed problem with make dist so that packages can be made and distributed.

[splint.git] / src / multiVal.c

diff --git a/src/multiVal.c b/src/multiVal.c
index e00b9a99a53bb50f5482bb60136cbbc9c3a0cf6b..5b9a2b0a8238c9ef9317796ddb7174edda5be57c 100644 (file)
--- a/src/multiVal.c
+++ b/src/multiVal.c
@@ -17,15 +17,15 @@
 ** the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 ** MA 02111-1307, USA.
 **
-** For information on lclint: lclint-request@cs.virginia.edu
-** To report a bug: lclint-bug@cs.virginia.edu
+** For information on splint: info@splint.org
+** To report a bug: splint-bug@splint.org
 ** For more information: http://www.splint.org
 */
 /*
 ** multiVal.c
 */
 
-# include "lclintMacros.nf"
+# include "splintMacros.nf"
 # include "basic.h"
 
 /*@only@*/ multiVal multiVal_unknown ()
@@ -53,8 +53,8 @@ static /*@special@*/ /*@notnull@*/ multiVal multiVal_create (mvkind kind)
 /*@only@*/ multiVal multiVal_makeChar (char x)
 {
   multiVal mv = multiVal_create (MVCHAR);
-    mv->value.cval = x;
-    return mv;
+  mv->value.cval = x;
+  return mv;
 }
 
 /*@only@*/ multiVal multiVal_makeDouble (double x)
@@ -298,7 +298,7 @@ multiVal multiVal_add (multiVal m1, multiVal m2)
   switch (m1->kind)
     {
     case MVLONG:   return (multiVal_makeInt (m1->value.ival + m2->value.ival));
-    case MVCHAR:   return (multiVal_makeChar (m1->value.cval + m2->value.cval));
+    case MVCHAR:   return (multiVal_makeChar ((char) (m1->value.cval + m2->value.cval)));
     case MVDOUBLE: return (multiVal_makeDouble (m1->value.fval + m2->value.fval));
     case MVSTRING: return multiVal_undefined;
     }
@@ -316,7 +316,7 @@ multiVal multiVal_subtract (multiVal m1, multiVal m2)
   switch (m1->kind)
     {
     case MVLONG:   return (multiVal_makeInt (m1->value.ival - m2->value.ival));
-    case MVCHAR:   return (multiVal_makeChar (m1->value.cval - m2->value.cval));
+    case MVCHAR:   return (multiVal_makeChar ((char) (m1->value.cval - m2->value.cval)));
     case MVDOUBLE: return (multiVal_makeDouble (m1->value.fval - m2->value.fval));
     case MVSTRING: return multiVal_undefined;
     }
@@ -334,7 +334,7 @@ multiVal multiVal_multiply (multiVal m1, multiVal m2)
   switch (m1->kind)
     {
     case MVLONG:   return (multiVal_makeInt (m1->value.ival * m2->value.ival));
-    case MVCHAR:   return (multiVal_makeChar (m1->value.cval * m2->value.cval));
+    case MVCHAR:   return (multiVal_makeChar ((char) (m1->value.cval * m2->value.cval)));
     case MVDOUBLE: return (multiVal_makeDouble (m1->value.fval * m2->value.fval));
     case MVSTRING: return multiVal_undefined;
     }
@@ -351,9 +351,26 @@ multiVal multiVal_divide (multiVal m1, multiVal m2)
 
   switch (m1->kind)
     {
-    case MVLONG:   return (multiVal_makeInt (m1->value.ival / m2->value.ival));
-    case MVCHAR:   return (multiVal_makeChar (m1->value.cval / m2->value.cval));
-    case MVDOUBLE: return (multiVal_makeDouble (m1->value.fval / m2->value.fval));
+    case MVLONG: 
+      if (m2->value.ival != 0)
+       {
+         return (multiVal_makeInt (m1->value.ival / m2->value.ival));
+       }
+      else
+       {
+         return multiVal_undefined;
+       }
+    case MVCHAR:   
+      if (m2->value.cval != (char) 0)
+       {
+         return (multiVal_makeChar ((char) (m1->value.cval / m2->value.cval)));
+       }
+      else
+       {
+         return multiVal_undefined;
+       }
+    case MVDOUBLE:
+      return multiVal_undefined; /* Don't attempt to divide floats */
     case MVSTRING: return multiVal_undefined;
     }