{
value *val;
- val = Safe_calloc (1, sizeof (value));
+ val = Safe_alloc (sizeof (value));
return val;
}
initList *nilist;
- nilist = Safe_calloc (1, sizeof (initList));
+ nilist = Safe_alloc (sizeof (initList));
nilist->type = type;
nilist->lineno = yylineno;
}
else
{
- newL = Safe_malloc(sizeof(literalList));
+ newL = Safe_alloc(sizeof(literalList));
newL->literalValue = val;
newL->count = 1;
newL->next = NULL;
while (src)
{
- newL = Safe_malloc(sizeof(literalList));
+ newL = Safe_alloc(sizeof(literalList));
newL->literalValue = src->literalValue;
newL->count = src->count;
}
if (SPEC_USIGN(val->type)) {
- if (uval<=0xff) {
- SPEC_NOUN(val->type)=V_CHAR;
+ if (uval<=0xffff) {
SPEC_LONG(val->type)=0;
- } else {
- if (uval<=0xffff) {
- SPEC_LONG(val->type)=0;
+ SPEC_CVAL(val->type).v_uint = uval;
+ if (uval<=0xff) {
+ SPEC_NOUN(val->type)=V_CHAR;
}
}
- } else {
+ } else { // not unsigned
if (sval<0) {
- if (sval>=-128) {
- SPEC_NOUN(val->type)=V_CHAR;
+ if (sval>=-32768) {
SPEC_LONG(val->type)=0;
- } else {
- if (sval>=-32768) {
- SPEC_LONG(val->type)=0;
+ SPEC_CVAL(val->type).v_int = sval;
+ if (sval>=-128) {
+ SPEC_NOUN(val->type)=V_CHAR;
}
}
- } else {
- if (sval<=127) {
- SPEC_NOUN(val->type)=V_CHAR;
+ } else { // sval>=0
+ SPEC_USIGN(val->type)=1;
+ if (sval<=65535) {
SPEC_LONG(val->type)=0;
- } else {
- if (sval<=32767) {
- SPEC_LONG(val->type)=0;
+ SPEC_CVAL(val->type).v_int = sval;
+ if (sval<=255) {
+ SPEC_NOUN(val->type)=V_CHAR;
}
}
}
constFloatVal (char *s)
{
value *val = newValue ();
- float sval;
+ double sval;
- if (sscanf (s, "%f", &sval) != 1)
+ if (sscanf (s, "%lf", &sval) != 1)
{
werror (E_INVALID_FLOAT_CONST, s);
return constVal ("0");
short hex = 0, octal = 0;
char scanFmt[10];
int scI = 0;
- unsigned long sval;
+ double dval;
val = newValue (); /* alloc space for value */
SPEC_NOUN (val->type) = V_CHAR;
SPEC_USIGN (val->type) = 1;
- /* set the _long flag if 'lL' is found */
- if (strchr (s, 'l') || strchr (s, 'L'))
- SPEC_LONG (val->type) = 1;
-
hex = ((strchr (s, 'x') || strchr (s, 'X')) ? 1 : 0);
/* set the octal flag */
/* create the scan string */
scanFmt[scI++] = '%';
+ scanFmt[scI++] = 'l';
+
if (octal)
scanFmt[scI++] = 'o';
else if (hex)
scanFmt[scI++] = 'x';
else
- scanFmt[scI++] = 'd';
+ scanFmt[scI++] = 'f';
- scanFmt[scI++] = 'L';
scanFmt[scI++] = '\0';
- sscanf (s, scanFmt, &sval);
+ if (octal || hex) {
+ unsigned long sval;
+ sscanf (s, scanFmt, &sval);
+ dval=sval;
+ } else {
+ sscanf (s, scanFmt, &dval);
+ }
+
+ /* Setup the flags first */
+ /* set the _long flag if 'lL' is found */
+ if (strchr (s, 'l') || strchr (s, 'L')) {
+ SPEC_NOUN (val->type) = V_INT;
+ SPEC_LONG (val->type) = 1;
+ }
- if (sval<0) { // "-28u" will still be signed and negative
+ if (dval<0) { // "-28u" will still be signed and negative
SPEC_USIGN (val->type) = 0;
- if (sval<-32768) { // check if we have to promote to long
+ if (dval<-128) { // check if we have to promote to int
SPEC_NOUN (val->type) = V_INT;
+ }
+ if (dval<-32768) { // check if we have to promote to long int
SPEC_LONG (val->type) = 1;
- SPEC_CVAL (val->type).v_long=sval;
- } else {
- SPEC_CVAL (val->type).v_int=sval;
- if (sval<-128) { // check if we have to promote to int
- SPEC_NOUN (val->type) = V_INT;
- }
}
- } else {
- if (sval>0xffff) { // check if we have to promote to long
+ } else { // >=0
+ if (dval>0xff) { // check if we have to promote to int
SPEC_NOUN (val->type) = V_INT;
+ }
+ if (dval>0xffff) { // check if we have to promote to long int
SPEC_LONG (val->type) = 1;
- SPEC_CVAL (val->type).v_ulong=sval;
- } else {
- SPEC_CVAL (val->type).v_uint=sval;
- if (sval>0xff) { // check if we have to promote to int
- SPEC_NOUN (val->type) = V_INT;
- }
}
}
+ if (SPEC_LONG (val->type))
+ {
+ if (SPEC_USIGN (val->type))
+ {
+ SPEC_CVAL (val->type).v_ulong = dval;
+ }
+ else
+ {
+ SPEC_CVAL (val->type).v_long = dval;
+ }
+ }
+ else
+ {
+ if (SPEC_USIGN (val->type))
+ {
+ SPEC_CVAL (val->type).v_uint = dval;
+ }
+ else
+ {
+ SPEC_CVAL (val->type).v_int = dval;
+ }
+ }
+
return val;
}
/param src Pointer to 'x' from start of hex character value
*/
-char hexEscape(char **src)
-
+unsigned char hexEscape(char **src)
{
-char *s ;
-unsigned long value ;
-
-(*src)++ ; /* Skip over the 'x' */
-s = *src ; /* Save for error detection */
-
-value = strtol (*src, src, 16);
-
-if (s == *src)
- {
- // no valid hex found
- werror(E_INVALID_HEX);
- }
-
-else
- {
- if (value > 255)
- {
- werror(W_ESC_SEQ_OOR_FOR_CHAR);
+ char *s ;
+ unsigned long value ;
+
+ (*src)++ ; /* Skip over the 'x' */
+ s = *src ; /* Save for error detection */
+
+ value = strtol (*src, src, 16);
+
+ if (s == *src) {
+ // no valid hex found
+ werror(E_INVALID_HEX);
+ } else {
+ if (value > 255) {
+ werror(W_ESC_SEQ_OOR_FOR_CHAR);
}
}
-
-return (char) value;
+ return (char) value;
}
+
/*------------------------------------------------------------------*/
/* octalEscape - process an octal constant of max three digits */
/* return the octal value, throw a warning for illegal octal */
/* adjust src to point at the last proccesed char */
/*------------------------------------------------------------------*/
-char octalEscape (char **str) {
+unsigned char octalEscape (char **str) {
int digits;
unsigned value=0;
SPEC_NOUN (val->etype) = V_CHAR;
SPEC_SCLS (val->etype) = S_LITERAL;
- SPEC_CVAL (val->etype).v_char = Safe_calloc (1, strlen (s) + 1);
+ SPEC_CVAL (val->etype).v_char = Safe_alloc (strlen (s) + 1);
DCL_ELEM (val->type) = copyStr (SPEC_CVAL (val->etype).v_char, s);
return val;
case '5' :
case '6' :
case '7' :
- SPEC_CVAL (val->type).v_int = octalEscape(&s);
+ SPEC_CVAL (val->type).v_uint = octalEscape(&s);
break;
case 'x':
- SPEC_CVAL (val->type).v_int = hexEscape(&s) ;
+ SPEC_CVAL (val->type).v_uint = hexEscape(&s) ;
break;
default:
- SPEC_CVAL (val->type).v_int = *s;
+ SPEC_CVAL (val->type).v_uint = (unsigned char)*s;
break;
}
}
else /* not a backslash */
- SPEC_CVAL (val->type).v_int = *s;
+ SPEC_CVAL (val->type).v_uint = (unsigned char)*s;
return val;
}
}
/*------------------------------------------------------------------*/
-/* floatFromVal - value to unsinged integer conversion */
+/* floatFromVal - value to double float conversion */
/*------------------------------------------------------------------*/
double
floatFromVal (value * val)
if (SPEC_NOUN (val->etype) == V_FLOAT)
return (double) SPEC_CVAL (val->etype).v_float;
- else
+
+ if (SPEC_LONG (val->etype))
{
- if (SPEC_LONG (val->etype))
- {
- if (SPEC_USIGN (val->etype))
- return (double) SPEC_CVAL (val->etype).v_ulong;
- else
- return (double) SPEC_CVAL (val->etype).v_long;
- }
+ if (SPEC_USIGN (val->etype))
+ return (double) SPEC_CVAL (val->etype).v_ulong;
else
- {
- if (SPEC_USIGN (val->etype))
- return (double) SPEC_CVAL (val->etype).v_uint;
- else
- return (double) SPEC_CVAL (val->etype).v_int;
- }
+ return (double) SPEC_CVAL (val->etype).v_long;
}
+
+ if (SPEC_NOUN (val->etype) == V_INT) {
+ if (SPEC_USIGN (val->etype))
+ return (double) SPEC_CVAL (val->etype).v_uint;
+ else
+ return (double) SPEC_CVAL (val->etype).v_int;
+ }
+
+ if (SPEC_NOUN (val->etype) == V_CHAR) {
+ if (SPEC_USIGN (val->etype))
+ return (double) (unsigned char)SPEC_CVAL (val->etype).v_uint;
+ else
+ return (double) (signed char)SPEC_CVAL (val->etype).v_int;
+ }
+
+ if (IS_BITVAR(val->etype)) {
+ return (double) SPEC_CVAL (val->etype).v_ulong;
+ }
+
+ // we are lost !
+ werror (E_INTERNAL_ERROR, __FILE__, __LINE__,
+ "floatFromVal: unknown value");
+ return 0;
}
SPEC_CVAL (val->etype).v_int = -SPEC_CVAL (val->etype).v_int;
}
}
+ // -(unsigned 3) now really is signed
+ SPEC_USIGN(val->etype)=0;
return val;
}
IS_FLOAT (rval->etype) ? V_FLOAT : V_INT);
SPEC_SCLS (val->type) = S_LITERAL; /* will remain literal */
SPEC_USIGN (val->type) = (SPEC_USIGN (lval->etype) & SPEC_USIGN (rval->etype));
- SPEC_LONG (val->type) = (SPEC_LONG (lval->etype) | SPEC_LONG (rval->etype));
+ SPEC_LONG (val->type) = 1;
if (IS_FLOAT (val->type))
SPEC_CVAL (val->type).v_float = floatFromVal (lval) * floatFromVal (rval);
SPEC_CVAL (val->type).v_long = (long) floatFromVal (lval) *
(long) floatFromVal (rval);
}
- else
- {
- if (SPEC_USIGN (val->type))
- SPEC_CVAL (val->type).v_uint = (unsigned) floatFromVal (lval) *
- (unsigned) floatFromVal (rval);
- else
- SPEC_CVAL (val->type).v_int = (int) floatFromVal (lval) *
- (int) floatFromVal (rval);
- }
}
return cheapestVal(val);
}
SPEC_USIGN (rval->etype) &&
(floatFromVal(lval)+floatFromVal(rval))>=0;
- SPEC_LONG (val->type) = (SPEC_LONG (lval->etype) | SPEC_LONG (rval->etype));
+ SPEC_LONG (val->type) = 1;
if (IS_FLOAT (val->type))
SPEC_CVAL (val->type).v_float = floatFromVal (lval) + floatFromVal (rval);
SPEC_CVAL (val->type).v_long = (long) floatFromVal (lval) +
(long) floatFromVal (rval);
}
- else
- {
- if (SPEC_USIGN (val->type)) {
- SPEC_CVAL (val->type).v_uint = (unsigned) floatFromVal (lval) +
- (unsigned) floatFromVal (rval);
- } else {
- SPEC_CVAL (val->type).v_int = (int) floatFromVal (lval) +
- (int) floatFromVal (rval);
- }
- }
}
return cheapestVal(val);
}
val->type = val->etype = newIntLink ();
SPEC_SCLS (val->type) = S_LITERAL; /* will remain literal */
SPEC_USIGN (val->type) = (SPEC_USIGN (lval->etype) & SPEC_USIGN (rval->etype));
- SPEC_LONG (val->type) = (SPEC_LONG (lval->etype) | SPEC_LONG (rval->etype));
+ SPEC_LONG (val->type) = 1;
if (SPEC_LONG (val->type))
{
(long) floatFromVal (lval) << (long) floatFromVal (rval) : \
(long) floatFromVal (lval) >> (long) floatFromVal (rval);
}
- else
- {
- if (SPEC_USIGN (val->type)) {
- SPEC_CVAL (val->type).v_uint = lr ?
- (unsigned) floatFromVal (lval) << (unsigned) floatFromVal (rval) :\
- (unsigned) floatFromVal (lval) >> (unsigned) floatFromVal (rval);
- } else {
- SPEC_CVAL (val->type).v_int = lr ?
- (int) floatFromVal (lval) << (int) floatFromVal (rval) : \
- (int) floatFromVal (lval) >> (int) floatFromVal (rval);
- }
- }
return cheapestVal(val);
}
SPEC_SCLS (val->etype) = S_LITERAL;
/* if it is not a specifier then we can assume that */
/* it will be an unsigned long */
- if (!IS_SPEC (val->type))
- {
+ if (!IS_SPEC (val->type)) {
SPEC_CVAL (val->etype).v_ulong = (unsigned long) fval;
return val;
- }
+ }
if (SPEC_NOUN (val->etype) == V_FLOAT)
- SPEC_CVAL (val->etype).v_float = fval;
- else
- {
- if (SPEC_LONG (val->etype))
- {
+ SPEC_CVAL (val->etype).v_float = fval;
+ else {
+ unsigned long l = fval;
+ if (SPEC_LONG (val->etype)) {
if (SPEC_USIGN (val->etype))
- SPEC_CVAL (val->etype).v_ulong = (unsigned long) fval;
+ SPEC_CVAL (val->etype).v_ulong = (unsigned long) l;
else
- SPEC_CVAL (val->etype).v_long = (long) fval;
- }
- else
- {
+ SPEC_CVAL (val->etype).v_long = (long) l;
+ } else {
if (SPEC_USIGN (val->etype))
- SPEC_CVAL (val->etype).v_uint = (unsigned int) fval;
+ SPEC_CVAL (val->etype).v_uint = (unsigned short)l;
else
- SPEC_CVAL (val->etype).v_int = (int) fval;
- }
- }
+ SPEC_CVAL (val->etype).v_int = (short)l;
+ }
+ }
return val;
}
projects / fw / sdcc / blobdiff