/*
** Splint - annotation-assisted static program checker
-** Copyright (C) 1994-2002 University of Virginia,
+** Copyright (C) 1994-2003 University of Virginia,
** Massachusetts Institute of Technology
**
** This program is free software; you can redistribute it and/or modify it
ctkind_fromInt (int i)
{
/*@+enumint@*/
- if (i < CTK_ANYTYPE || i > CTK_COMPLEX)
+ if (i < CTK_UNKNOWN || i > CTK_COMPLEX)
{
llcontbug (message ("ctkind_fromInt: out of range: %d", i));
return CTK_INVALID;
ctype
ctype_createAbstract (typeId u)
{
- /* requires: ctype_createAbstract (u) is never called more than once for any u. */
- /* [ tested by cttable_addFullSafe, not really required ] */
- return (cttable_addFullSafe (ctentry_makeNew (CTK_PLAIN, ctbase_createAbstract (u))));
+ /* requires: ctype_createAbstract (u) is never called more than once for any u. */
+ /* [ tested by cttable_addFullSafe, not really required ] */
+
+ return (cttable_addFullSafe
+ (ctentry_makeNew (CTK_PLAIN, ctbase_createAbstract (u))));
+}
+
+ctype
+ctype_createNumAbstract (typeId u)
+{
+ /* requires: ctype_createAbstract (u) is never called more than once for any u. */
+ /* [ tested by cttable_addFullSafe, not really required ] */
+
+ return (cttable_addFullSafe
+ (ctentry_makeNew (CTK_PLAIN, ctbase_createNumAbstract (u))));
}
int
bool
ctype_isUA (ctype c)
{
- return (!ctype_isUnknown (c) && ctbase_isUA (ctype_getCtbase (c)));
+ return (!ctype_isUnknown (c)
+ && ctbase_isUA (ctype_getCtbase (c)));
}
bool
|| ctype_isAbstract (ctype_getConjB (c))))));
}
+bool
+ctype_isNumAbstract (ctype c)
+{
+ return (!ctype_isUnknown (c)
+ && ((ctype_isPlain (c) && ctbase_isNumAbstract (ctype_getCtbaseSafe (c))) ||
+ (ctype_isConj (c) &&
+ (ctype_isNumAbstract (ctype_getConjA (c))
+ || ctype_isNumAbstract (ctype_getConjB (c))))));
+}
+
bool
ctype_isImmutableAbstract (ctype t)
{
ctype_isRealAbstract (ctype_getConjB (c)))));
}
+bool
+ctype_isRealNumAbstract (ctype c)
+{
+ return (ctype_isNumAbstract (ctype_realType (c)) ||
+ (ctype_isConj (c) &&
+ (ctype_isRealNumAbstract (ctype_getConjA (c)) ||
+ ctype_isRealNumAbstract (ctype_getConjB (c)))));
+}
+
/*
** primitive creators
*/
{
ctype cbr = ctype_getConjA (*c);
- /*drl bee: si*/ if ((*pred) (cbr))
+ if ((*pred) (cbr))
{
if ((*pred) (ctype_getConjB (*c)))
{
ctype
ctype_makeExplicitConj (ctype c1, ctype c2)
{
- if (ctype_isFunction (c1) && !ctype_isFunction (c2))
+ if (ctype_isAnytype (c1) || ctype_isAnytype (c2))
+ {
+ return ctype_makeAnytype ();
+ }
+ else if (ctype_isFunction (c1) && !ctype_isFunction (c2))
{
ctype ret = ctype_makeExplicitConj (ctype_getReturnType (c1), c2);
static ctype ivbf = ctype_unknown; /* int | void * | bool | float */
static ctype cuc = ctype_unknown; /* char | unsigned char */
+static ctype cany = ctype_unknown;
+
+ctype
+ctype_makeAnytype ()
+{
+ if (cany == ctype_unknown)
+ {
+ cany = ctype_makeConj (ctype_unknown, ctype_dne);
+ llassert (ctype_isAnytype (cany));
+ }
+
+ DPRINTF (("make anytype: %s", ctype_unparse (cany)));
+ return cany;
+}
+
+bool
+ctype_isAnytype (ctype c)
+{
+ return (c == cany);
+}
+
static void
ctype_recordConj (ctype c)
{
DPRINTF (("Make conj: %s / %s", ctype_unparse (c1), ctype_unparse (c2)));
- if (ctype_isUnknown (c1))
+ if (ctype_isAnytype (c1))
+ {
+ return c1;
+ }
+ else if (ctype_isAnytype (c2))
+ {
+ return c2;
+ }
+ else if (ctype_isUnknown (c1))
{
return c2;
}
{
;
}
-
return (cttable_addComplex (ctbase_makeConj (c1, c2, FALSE)));
}
cstring
ctype_unparseDeclaration (ctype c, /*@only@*/ cstring name)
{
- llassert (! (ctype_isElips (c) || ctype_isMissingParamsMarker (c)));
+ llassert (!(ctype_isElips (c) || ctype_isMissingParamsMarker (c)));
if (ctype_isUnknown (c))
{
{
return cstring_makeLiteralTemp ("-");
}
- else if (ctype_isUnknown (c))
- {
- return cstring_makeLiteralTemp ("?");
- }
else if (ctype_isAnytype (c))
{
return cstring_makeLiteralTemp ("<any>");
}
+ else if (ctype_isUnknown (c))
+ {
+ return cstring_makeLiteralTemp ("?");
+ }
else
{
/*@-modobserver@*/
switch (ctentry_getKind (cte))
{
- case CTK_ANYTYPE:
case CTK_UNKNOWN:
case CTK_INVALID:
case CTK_PLAIN:
case CT_ENUMLIST:
case CT_BOOL:
case CT_ABST:
+ case CT_NUMABST:
case CT_FCN:
case CT_STRUCT:
case CT_UNION:
}
ctype
-ctype_adjustPointers (int np, ctype c)
+ctype_adjustPointers (pointers p, ctype c)
{
-
+ int np = pointers_depth (p);
+
if (ctype_isFunction (c))
{
c = ctype_makeParamsFunction
- (ctype_adjustPointers (np, ctype_getReturnType (c)),
+ (ctype_adjustPointers (p, ctype_getReturnType (c)),
uentryList_copy (ctype_argsFunction (c)));
}
else
return (ct);
}
+ctype
+ctype_createForwardEnum (cstring n)
+{
+ uentry ue = uentry_makeEnumTag (n, ctype_unknown, fileloc_undefined);
+ ctype ct = usymtab_supForwardTypeEntry (ue);
+
+ cstring_free (n);
+ return (ct);
+}
+
ctype
ctype_removePointers (ctype c)
{
ctype ctype_resolve (ctype c)
{
- if (ctype_isUnknown (c))
+ if (ctype_isUnknown (c) && !ctype_isAnytype (c))
{
+ DPRINTF (("Resolving to int: %s", ctype_unparse (c)));
return ctype_int;
}
- else if (c == ctype_anytype)
- {
- return ctype_unknown;
- }
- else
- {
- return c;
- }
+
+ return c;
}
ctype ctype_fromQual (qual q)
llbuglit ("ctype_getCtbase: ctype dne");
if (c == ctype_elipsMarker)
llbuglit ("ctype_getCtbase: elips marker");
- if (c == ctype_anytype)
- llbuglit ("ctype_getCtbase: ctype anytype");
-
+
llfatalbug (message ("ctype_getCtbase: ctype out of range: %d", c));
BADEXIT;
}
}
else if (c == CTK_UNKNOWN)
llcontbuglit ("ctype_getCtentry: ctype unknown");
- else if (c == CTK_ANYTYPE)
- llcontbuglit ("ctype_getCtentry: ctype unknown");
else if (c == CTK_INVALID)
llcontbuglit ("ctype_getCtentry: ctype invalid (ctype_undefined)");
else if (c == CTK_DNE)
return size;
}
+ctype ctype_biggerType (ctype c1, ctype c2)
+{
+ if (ctbase_isBigger (ctype_getCtbaseSafe (c2), ctype_getCtbaseSafe (c1)) )
+ {
+ return c2;
+ }
+ else
+ {
+ return c1;
+ }
+}