Trying to add dummyfile to be bin to stay in the repository.\18

[splint.git] / src / ctype.c

diff --git a/src/ctype.c b/src/ctype.c
index 1423bbdcd8d986a234e5898ab12d89a06c651b06..d09d4fe8d15913c0a9b33076f4dfd81c9d8a3029 100644 (file)
--- a/src/ctype.c
+++ b/src/ctype.c
@@ -17,8 +17,8 @@
 ** 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
 */
 /*
@@ -28,7 +28,7 @@
 ** They should probably be separated soon.
 */
 
-# include "lclintMacros.nf"
+# include "splintMacros.nf"
 # include "basic.h"
 # include "structNames.h"
 
@@ -317,7 +317,29 @@ ctype_makePointer (ctype c)
 
 ctype ctype_makeFixedArray (ctype c, long size)
 {
-  return (cttable_addDerived (CTK_ARRAY, ctbase_makeFixedArray (c, size), c));
+  ctype res;
+  res = cttable_addDerived (CTK_ARRAY, ctbase_makeFixedArray (c, size), c);
+  return res;
+}
+
+ctype ctype_makeInnerFixedArray (ctype c, long size)
+{
+  ctype res;
+
+  if (ctype_isFixedArray (c))
+    {
+      ctype cb = ctype_baseArrayPtr (c);
+      long osize = ctype_getArraySize (c);
+
+      res = ctype_makeFixedArray (ctype_makeInnerFixedArray (cb, size),
+                                 osize);
+    }
+  else
+    {
+      res = ctype_makeFixedArray (c, size);
+    }
+
+  return res;
 }
 
 ctype
@@ -988,11 +1010,11 @@ ctype_isDirectInt (ctype c)
 static bool
   ctype_isForcePred (ctype * c, bool (pred) (ctype))
 {
-  if (ctype_isConj (*c))
+  /*drl bee: pbr */  if (ctype_isConj (*c))
     {
       ctype cbr = ctype_getConjA (*c);
 
-      if ((*pred) (cbr))
+     /*drl bee: si*/   if ((*pred) (cbr))
        {
          if ((*pred) (ctype_getConjB (*c)))
            {