diff options
author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-03 20:17:31 +0000 |
---|---|---|
committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-03 20:17:31 +0000 |
commit | 3a37070093275603ff3c797c2ca426f6d52b6fe2 (patch) | |
tree | 54ccd89a92a427e6ca4d727612181f40eb82ffc2 /main/ast_expr2.c | |
parent | 9982b145f400fd20c6dffa27529a75b4af67adec (diff) |
Removing expr floating patch from 1.4; too much of a behavior change. If you want this fix, try trunk instead. bug 9508.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@73143 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/ast_expr2.c')
-rw-r--r-- | main/ast_expr2.c | 363 |
1 files changed, 173 insertions, 190 deletions
diff --git a/main/ast_expr2.c b/main/ast_expr2.c index 021feff74..4acd56d54 100644 --- a/main/ast_expr2.c +++ b/main/ast_expr2.c @@ -129,33 +129,16 @@ * $FreeBSD: src/bin/expr/expr.y,v 1.16 2000/07/22 10:59:36 se Exp $ */ -#include <sys/types.h> -#include <stdio.h> - -#ifdef STANDALONE /* I guess somewhere, the feature is set in the asterisk includes */ -#ifndef __USE_ISOC99 -#define __USE_ISOC99 1 -#endif -#endif +#include "asterisk.h" -#ifdef __USE_ISOC99 -#define FP___PRINTF "%.16Lg" -#define FP___FMOD fmodl -#define FP___STRTOD strtold -#define FP___TYPE long double -#else -#define FP___PRINTF "%.8g" -#define FP___FMOD fmod -#define FP___STRTOD strtod -#define FP___TYPE double +#ifndef STANDALONE +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #endif +#include <sys/types.h> +#include <stdio.h> #include <stdlib.h> -#ifndef _GNU_SOURCE -#define _GNU_SOURCE -#endif #include <string.h> -#include <math.h> #include <locale.h> #include <unistd.h> #include <ctype.h> @@ -168,7 +151,6 @@ #include <regex.h> #include <limits.h> -#include "asterisk.h" #include "asterisk/ast_expr.h" #include "asterisk/logger.h" @@ -185,7 +167,7 @@ # if ! defined(QUAD_MAX) # define QUAD_MAX (0x7fffffffffffffffLL) # endif -#define YYENABLE_NLS 0 + #define YYPARSE_PARAM parseio #define YYLEX_PARAM ((struct parse_io *)parseio)->scanner #define YYERROR_VERBOSE 1 @@ -193,7 +175,7 @@ extern char extra_error_message[4095]; extern int extra_error_message_supplied; enum valtype { - AST_EXPR_number, AST_EXPR_numeric_string, AST_EXPR_string + AST_EXPR_integer, AST_EXPR_numeric_string, AST_EXPR_string } ; #ifdef STANDALONE @@ -204,7 +186,7 @@ struct val { enum valtype type; union { char *s; - FP___TYPE i; /* either long double, or just double, on a bad day */ + quad_t i; } u; } ; @@ -217,14 +199,14 @@ struct parse_io yyscan_t scanner; }; -static int chk_div __P((FP___TYPE, FP___TYPE)); -static int chk_minus __P((FP___TYPE, FP___TYPE, FP___TYPE)); -static int chk_plus __P((FP___TYPE, FP___TYPE, FP___TYPE)); -static int chk_times __P((FP___TYPE, FP___TYPE, FP___TYPE)); +static int chk_div __P((quad_t, quad_t)); +static int chk_minus __P((quad_t, quad_t, quad_t)); +static int chk_plus __P((quad_t, quad_t, quad_t)); +static int chk_times __P((quad_t, quad_t, quad_t)); static void free_value __P((struct val *)); static int is_zero_or_null __P((struct val *)); static int isstring __P((struct val *)); -static struct val *make_number __P((FP___TYPE)); +static struct val *make_integer __P((quad_t)); static struct val *make_str __P((const char *)); static struct val *op_and __P((struct val *, struct val *)); static struct val *op_colon __P((struct val *, struct val *)); @@ -244,7 +226,7 @@ static struct val *op_or __P((struct val *, struct val *)); static struct val *op_plus __P((struct val *, struct val *)); static struct val *op_rem __P((struct val *, struct val *)); static struct val *op_times __P((struct val *, struct val *)); -static int to_number __P((struct val *)); +static quad_t to_integer __P((struct val *)); static void to_string __P((struct val *)); /* uh, if I want to predeclare yylex with a YYLTYPE, I have to predeclare the yyltype... sigh */ @@ -292,12 +274,12 @@ int ast_yyerror(const char *,YYLTYPE *, struct parse_io *); #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 165 "ast_expr2.y" +#line 147 "ast_expr2.y" { struct val *val; } /* Line 198 of yacc.c. */ -#line 301 "ast_expr2.c" +#line 283 "ast_expr2.c" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 @@ -319,13 +301,13 @@ typedef struct YYLTYPE /* Copy the second part of user declarations. */ -#line 169 "ast_expr2.y" +#line 151 "ast_expr2.y" extern int ast_yylex __P((YYSTYPE *, YYLTYPE *, yyscan_t)); /* Line 221 of yacc.c. */ -#line 329 "ast_expr2.c" +#line 311 "ast_expr2.c" #ifdef short # undef short @@ -618,9 +600,9 @@ static const yytype_int8 yyrhs[] = /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 193, 193, 201, 208, 209, 213, 217, 221, 225, - 229, 233, 237, 241, 245, 249, 253, 257, 261, 265, - 269, 273, 277, 281 + 0, 175, 175, 183, 190, 191, 195, 199, 203, 207, + 211, 215, 219, 223, 227, 231, 235, 239, 243, 247, + 251, 255, 259, 263 }; #endif @@ -1269,114 +1251,114 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) switch (yytype) { case 3: /* "TOK_COLONCOLON" */ -#line 187 "ast_expr2.y" +#line 169 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1275 "ast_expr2.c" +#line 1257 "ast_expr2.c" break; case 4: /* "TOK_COND" */ -#line 187 "ast_expr2.y" +#line 169 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1280 "ast_expr2.c" +#line 1262 "ast_expr2.c" break; case 5: /* "TOK_OR" */ -#line 187 "ast_expr2.y" +#line 169 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1285 "ast_expr2.c" +#line 1267 "ast_expr2.c" break; case 6: /* "TOK_AND" */ -#line 187 "ast_expr2.y" +#line 169 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1290 "ast_expr2.c" +#line 1272 "ast_expr2.c" break; case 7: /* "TOK_NE" */ -#line 187 "ast_expr2.y" +#line 169 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1295 "ast_expr2.c" +#line 1277 "ast_expr2.c" break; case 8: /* "TOK_LE" */ -#line 187 "ast_expr2.y" +#line 169 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1300 "ast_expr2.c" +#line 1282 "ast_expr2.c" break; case 9: /* "TOK_GE" */ -#line 187 "ast_expr2.y" +#line 169 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1305 "ast_expr2.c" +#line 1287 "ast_expr2.c" break; case 10: /* "TOK_LT" */ -#line 187 "ast_expr2.y" +#line 169 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1310 "ast_expr2.c" +#line 1292 "ast_expr2.c" break; case 11: /* "TOK_GT" */ -#line 187 "ast_expr2.y" +#line 169 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1315 "ast_expr2.c" +#line 1297 "ast_expr2.c" break; case 12: /* "TOK_EQ" */ -#line 187 "ast_expr2.y" +#line 169 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1320 "ast_expr2.c" +#line 1302 "ast_expr2.c" break; case 13: /* "TOK_MINUS" */ -#line 187 "ast_expr2.y" +#line 169 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1325 "ast_expr2.c" +#line 1307 "ast_expr2.c" break; case 14: /* "TOK_PLUS" */ -#line 187 "ast_expr2.y" +#line 169 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1330 "ast_expr2.c" +#line 1312 "ast_expr2.c" break; case 15: /* "TOK_MOD" */ -#line 187 "ast_expr2.y" +#line 169 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1335 "ast_expr2.c" +#line 1317 "ast_expr2.c" break; case 16: /* "TOK_DIV" */ -#line 187 "ast_expr2.y" +#line 169 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1340 "ast_expr2.c" +#line 1322 "ast_expr2.c" break; case 17: /* "TOK_MULT" */ -#line 187 "ast_expr2.y" +#line 169 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1345 "ast_expr2.c" +#line 1327 "ast_expr2.c" break; case 18: /* "TOK_COMPL" */ -#line 187 "ast_expr2.y" +#line 169 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1350 "ast_expr2.c" +#line 1332 "ast_expr2.c" break; case 19: /* "TOK_EQTILDE" */ -#line 187 "ast_expr2.y" +#line 169 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1355 "ast_expr2.c" +#line 1337 "ast_expr2.c" break; case 20: /* "TOK_COLON" */ -#line 187 "ast_expr2.y" +#line 169 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1360 "ast_expr2.c" +#line 1342 "ast_expr2.c" break; case 21: /* "TOK_LP" */ -#line 187 "ast_expr2.y" +#line 169 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1365 "ast_expr2.c" +#line 1347 "ast_expr2.c" break; case 22: /* "TOK_RP" */ -#line 187 "ast_expr2.y" +#line 169 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1370 "ast_expr2.c" +#line 1352 "ast_expr2.c" break; case 23: /* "TOKEN" */ -#line 187 "ast_expr2.y" +#line 169 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1375 "ast_expr2.c" +#line 1357 "ast_expr2.c" break; case 26: /* "expr" */ -#line 187 "ast_expr2.y" +#line 169 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1380 "ast_expr2.c" +#line 1362 "ast_expr2.c" break; default: @@ -1699,10 +1681,10 @@ yyreduce: switch (yyn) { case 2: -#line 193 "ast_expr2.y" +#line 175 "ast_expr2.y" { ((struct parse_io *)parseio)->val = (struct val *)calloc(sizeof(struct val),1); ((struct parse_io *)parseio)->val->type = (yyvsp[(1) - (1)].val)->type; - if( (yyvsp[(1) - (1)].val)->type == AST_EXPR_number ) + if( (yyvsp[(1) - (1)].val)->type == AST_EXPR_integer ) ((struct parse_io *)parseio)->val->u.i = (yyvsp[(1) - (1)].val)->u.i; else ((struct parse_io *)parseio)->val->u.s = (yyvsp[(1) - (1)].val)->u.s; @@ -1711,7 +1693,7 @@ yyreduce: break; case 3: -#line 201 "ast_expr2.y" +#line 183 "ast_expr2.y" {/* nothing */ ((struct parse_io *)parseio)->val = (struct val *)calloc(sizeof(struct val),1); ((struct parse_io *)parseio)->val->type = AST_EXPR_string; ((struct parse_io *)parseio)->val->u.s = strdup(""); @@ -1719,12 +1701,12 @@ yyreduce: break; case 4: -#line 208 "ast_expr2.y" +#line 190 "ast_expr2.y" { (yyval.val)= (yyvsp[(1) - (1)].val);;} break; case 5: -#line 209 "ast_expr2.y" +#line 191 "ast_expr2.y" { (yyval.val) = (yyvsp[(2) - (3)].val); (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; (yyloc).first_line=0; (yyloc).last_line=0; @@ -1732,7 +1714,7 @@ yyreduce: break; case 6: -#line 213 "ast_expr2.y" +#line 195 "ast_expr2.y" { (yyval.val) = op_or ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; @@ -1740,7 +1722,7 @@ yyreduce: break; case 7: -#line 217 "ast_expr2.y" +#line 199 "ast_expr2.y" { (yyval.val) = op_and ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; @@ -1748,7 +1730,7 @@ yyreduce: break; case 8: -#line 221 "ast_expr2.y" +#line 203 "ast_expr2.y" { (yyval.val) = op_eq ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; @@ -1756,7 +1738,7 @@ yyreduce: break; case 9: -#line 225 "ast_expr2.y" +#line 207 "ast_expr2.y" { (yyval.val) = op_gt ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; @@ -1764,7 +1746,7 @@ yyreduce: break; case 10: -#line 229 "ast_expr2.y" +#line 211 "ast_expr2.y" { (yyval.val) = op_lt ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; @@ -1772,7 +1754,7 @@ yyreduce: break; case 11: -#line 233 "ast_expr2.y" +#line 215 "ast_expr2.y" { (yyval.val) = op_ge ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; @@ -1780,7 +1762,7 @@ yyreduce: break; case 12: -#line 237 "ast_expr2.y" +#line 219 "ast_expr2.y" { (yyval.val) = op_le ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; @@ -1788,7 +1770,7 @@ yyreduce: break; case 13: -#line 241 "ast_expr2.y" +#line 223 "ast_expr2.y" { (yyval.val) = op_ne ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; @@ -1796,7 +1778,7 @@ yyreduce: break; case 14: -#line 245 "ast_expr2.y" +#line 227 "ast_expr2.y" { (yyval.val) = op_plus ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; @@ -1804,7 +1786,7 @@ yyreduce: break; case 15: -#line 249 "ast_expr2.y" +#line 231 "ast_expr2.y" { (yyval.val) = op_minus ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; @@ -1812,7 +1794,7 @@ yyreduce: break; case 16: -#line 253 "ast_expr2.y" +#line 235 "ast_expr2.y" { (yyval.val) = op_negate ((yyvsp[(2) - (2)].val)); DESTROY((yyvsp[(1) - (2)].val)); (yyloc).first_column = (yylsp[(1) - (2)]).first_column; (yyloc).last_column = (yylsp[(2) - (2)]).last_column; @@ -1820,7 +1802,7 @@ yyreduce: break; case 17: -#line 257 "ast_expr2.y" +#line 239 "ast_expr2.y" { (yyval.val) = op_compl ((yyvsp[(2) - (2)].val)); DESTROY((yyvsp[(1) - (2)].val)); (yyloc).first_column = (yylsp[(1) - (2)]).first_column; (yyloc).last_column = (yylsp[(2) - (2)]).last_column; @@ -1828,7 +1810,7 @@ yyreduce: break; case 18: -#line 261 "ast_expr2.y" +#line 243 "ast_expr2.y" { (yyval.val) = op_times ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; @@ -1836,7 +1818,7 @@ yyreduce: break; case 19: -#line 265 "ast_expr2.y" +#line 247 "ast_expr2.y" { (yyval.val) = op_div ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; @@ -1844,7 +1826,7 @@ yyreduce: break; case 20: -#line 269 "ast_expr2.y" +#line 251 "ast_expr2.y" { (yyval.val) = op_rem ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; @@ -1852,7 +1834,7 @@ yyreduce: break; case 21: -#line 273 "ast_expr2.y" +#line 255 "ast_expr2.y" { (yyval.val) = op_colon ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; @@ -1860,7 +1842,7 @@ yyreduce: break; case 22: -#line 277 "ast_expr2.y" +#line 259 "ast_expr2.y" { (yyval.val) = op_eqtilde ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; @@ -1868,7 +1850,7 @@ yyreduce: break; case 23: -#line 281 "ast_expr2.y" +#line 263 "ast_expr2.y" { (yyval.val) = op_cond ((yyvsp[(1) - (5)].val), (yyvsp[(3) - (5)].val), (yyvsp[(5) - (5)].val)); DESTROY((yyvsp[(2) - (5)].val)); DESTROY((yyvsp[(4) - (5)].val)); @@ -1878,7 +1860,7 @@ yyreduce: /* Line 1270 of yacc.c. */ -#line 1882 "ast_expr2.c" +#line 1864 "ast_expr2.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2097,11 +2079,11 @@ yyreturn: } -#line 288 "ast_expr2.y" +#line 270 "ast_expr2.y" static struct val * -make_number (FP___TYPE i) +make_integer (quad_t i) { struct val *vp; @@ -2111,7 +2093,7 @@ make_number (FP___TYPE i) return(NULL); } - vp->type = AST_EXPR_number; + vp->type = AST_EXPR_integer; vp->u.i = i; return vp; } @@ -2121,7 +2103,7 @@ make_str (const char *s) { struct val *vp; size_t i; - int isint; /* this started out being a test for an integer, but then ended up being a test for a float */ + int isint; vp = (struct val *) malloc (sizeof (*vp)); if (vp == NULL || ((vp->u.s = strdup (s)) == NULL)) { @@ -2129,13 +2111,14 @@ make_str (const char *s) return(NULL); } - for (i = 0, isint = (isdigit(s[0]) || s[0] == '-' || s[0]=='.'); isint && i < strlen(s); i++) + for(i = 1, isint = isdigit(s[0]) || s[0] == '-'; + isint && i < strlen(s); + i++) { - if (!isdigit(s[i]) && s[i] != '.') { - isint = 0; - break; - } + if(!isdigit(s[i])) + isint = 0; } + if (isint) vp->type = AST_EXPR_numeric_string; else @@ -2157,17 +2140,17 @@ free_value (struct val *vp) } -static int -to_number (struct val *vp) +static quad_t +to_integer (struct val *vp) { - FP___TYPE i; + quad_t i; if (vp == NULL) { - ast_log(LOG_WARNING,"vp==NULL in to_number()\n"); + ast_log(LOG_WARNING,"vp==NULL in to_integer()\n"); return(0); } - if (vp->type == AST_EXPR_number) + if (vp->type == AST_EXPR_integer) return 1; if (vp->type == AST_EXPR_string) @@ -2175,16 +2158,16 @@ to_number (struct val *vp) /* vp->type == AST_EXPR_numeric_string, make it numeric */ errno = 0; - i = FP___STRTOD(vp->u.s, (char**)0); /* either strtod, or strtold on a good day */ + i = strtoll(vp->u.s, (char**)NULL, 10); if (errno != 0) { - ast_log(LOG_WARNING,"Conversion of %s to number under/overflowed!\n", vp->u.s); + ast_log(LOG_WARNING,"Conversion of %s to integer under/overflowed!\n", vp->u.s); free(vp->u.s); vp->u.s = 0; return(0); } free (vp->u.s); vp->u.i = i; - vp->type = AST_EXPR_number; + vp->type = AST_EXPR_integer; return 1; } @@ -2225,7 +2208,7 @@ to_string (struct val *vp) return; } - sprintf(tmp, FP___PRINTF, vp->u.i); + sprintf(tmp, "%ld", (long int) vp->u.i); vp->type = AST_EXPR_string; vp->u.s = tmp; } @@ -2234,7 +2217,7 @@ to_string (struct val *vp) static int isstring (struct val *vp) { - /* only TRUE if this string is not a valid number */ + /* only TRUE if this string is not a valid integer */ return (vp->type == AST_EXPR_string); } @@ -2242,10 +2225,10 @@ isstring (struct val *vp) static int is_zero_or_null (struct val *vp) { - if (vp->type == AST_EXPR_number) { + if (vp->type == AST_EXPR_integer) { return (vp->u.i == 0); } else { - return (*vp->u.s == 0 || (to_number(vp) && vp->u.i == 0)); + return (*vp->u.s == 0 || (to_integer (vp) && vp->u.i == 0)); } /* NOTREACHED */ } @@ -2332,7 +2315,7 @@ op_and (struct val *a, struct val *b) if (is_zero_or_null (a) || is_zero_or_null (b)) { free_value (a); free_value (b); - return (make_number ((double)0.0)); + return (make_integer ((quad_t)0)); } else { free_value (b); return (a); @@ -2347,18 +2330,18 @@ op_eq (struct val *a, struct val *b) if (isstring (a) || isstring (b)) { to_string (a); to_string (b); - r = make_number ((FP___TYPE)(strcoll (a->u.s, b->u.s) == 0)); + r = make_integer ((quad_t)(strcoll (a->u.s, b->u.s) == 0)); } else { #ifdef DEBUG_FOR_CONVERSIONS char buffer[2000]; sprintf(buffer,"Converting '%s' and '%s' ", a->u.s, b->u.s); #endif - (void)to_number(a); - (void)to_number(b); + (void)to_integer(a); + (void)to_integer(b); #ifdef DEBUG_FOR_CONVERSIONS ast_log(LOG_WARNING,"%s to '%lld' and '%lld'\n", buffer, a->u.i, b->u.i); #endif - r = make_number ((FP___TYPE)(a->u.i == b->u.i)); + r = make_integer ((quad_t)(a->u.i == b->u.i)); } free_value (a); @@ -2374,11 +2357,11 @@ op_gt (struct val *a, struct val *b) if (isstring (a) || isstring (b)) { to_string (a); to_string (b); - r = make_number ((FP___TYPE)(strcoll (a->u.s, b->u.s) > 0)); + r = make_integer ((quad_t)(strcoll (a->u.s, b->u.s) > 0)); } else { - (void)to_number(a); - (void)to_number(b); - r = make_number ((FP___TYPE)(a->u.i > b->u.i)); + (void)to_integer(a); + (void)to_integer(b); + r = make_integer ((quad_t)(a->u.i > b->u.i)); } free_value (a); @@ -2394,11 +2377,11 @@ op_lt (struct val *a, struct val *b) if (isstring (a) || isstring (b)) { to_string (a); to_string (b); - r = make_number ((FP___TYPE)(strcoll (a->u.s, b->u.s) < 0)); + r = make_integer ((quad_t)(strcoll (a->u.s, b->u.s) < 0)); } else { - (void)to_number(a); - (void)to_number(b); - r = make_number ((FP___TYPE)(a->u.i < b->u.i)); + (void)to_integer(a); + (void)to_integer(b); + r = make_integer ((quad_t)(a->u.i < b->u.i)); } free_value (a); @@ -2414,11 +2397,11 @@ op_ge (struct val *a, struct val *b) if (isstring (a) || isstring (b)) { to_string (a); to_string (b); - r = make_number ((FP___TYPE)(strcoll (a->u.s, b->u.s) >= 0)); + r = make_integer ((quad_t)(strcoll (a->u.s, b->u.s) >= 0)); } else { - (void)to_number(a); - (void)to_number(b); - r = make_number ((FP___TYPE)(a->u.i >= b->u.i)); + (void)to_integer(a); + (void)to_integer(b); + r = make_integer ((quad_t)(a->u.i >= b->u.i)); } free_value (a); @@ -2434,11 +2417,11 @@ op_le (struct val *a, struct val *b) if (isstring (a) || isstring (b)) { to_string (a); to_string (b); - r = make_number ((FP___TYPE)(strcoll (a->u.s, b->u.s) <= 0)); + r = make_integer ((quad_t)(strcoll (a->u.s, b->u.s) <= 0)); } else { - (void)to_number(a); - (void)to_number(b); - r = make_number ((FP___TYPE)(a->u.i <= b->u.i)); + (void)to_integer(a); + (void)to_integer(b); + r = make_integer ((quad_t)(a->u.i <= b->u.i)); } free_value (a); @@ -2468,7 +2451,7 @@ op_cond (struct val *a, struct val *b, struct val *c) } else { - (void)to_number(a); + (void)to_integer(a); if( a->u.i ) { free_value(a); @@ -2493,11 +2476,11 @@ op_ne (struct val *a, struct val *b) if (isstring (a) || isstring (b)) { to_string (a); to_string (b); - r = make_number ((FP___TYPE)(strcoll (a->u.s, b->u.s) != 0)); + r = make_integer ((quad_t)(strcoll (a->u.s, b->u.s) != 0)); } else { - (void)to_number(a); - (void)to_number(b); - r = make_number ((FP___TYPE)(a->u.i != b->u.i)); + (void)to_integer(a); + (void)to_integer(b); + r = make_integer ((quad_t)(a->u.i != b->u.i)); } free_value (a); @@ -2506,7 +2489,7 @@ op_ne (struct val *a, struct val *b) } static int -chk_plus (FP___TYPE a, FP___TYPE b, FP___TYPE r) +chk_plus (quad_t a, quad_t b, quad_t r) { /* sum of two positive numbers must be positive */ if (a > 0 && b > 0 && r <= 0) @@ -2523,23 +2506,23 @@ op_plus (struct val *a, struct val *b) { struct val *r; - if (!to_number (a)) { + if (!to_integer (a)) { if( !extra_error_message_supplied ) ast_log(LOG_WARNING,"non-numeric argument\n"); - if (!to_number (b)) { + if (!to_integer (b)) { free_value(a); free_value(b); - return make_number(0); + return make_integer(0); } else { free_value(a); return (b); } - } else if (!to_number(b)) { + } else if (!to_integer(b)) { free_value(b); return (a); } - r = make_number (a->u.i + b->u.i); + r = make_integer (/*(quad_t)*/(a->u.i + b->u.i)); if (chk_plus (a->u.i, b->u.i, r->u.i)) { ast_log(LOG_WARNING,"overflow\n"); } @@ -2549,7 +2532,7 @@ op_plus (struct val *a, struct val *b) } static int -chk_minus (FP___TYPE a, FP___TYPE b, FP___TYPE r) +chk_minus (quad_t a, quad_t b, quad_t r) { /* special case subtraction of QUAD_MIN */ if (b == QUAD_MIN) { @@ -2567,27 +2550,27 @@ op_minus (struct val *a, struct val *b) { struct val *r; - if (!to_number (a)) { + if (!to_integer (a)) { if( !extra_error_message_supplied ) ast_log(LOG_WARNING, "non-numeric argument\n"); - if (!to_number (b)) { + if (!to_integer (b)) { free_value(a); free_value(b); - return make_number(0); + return make_integer(0); } else { - r = make_number(0 - b->u.i); + r = make_integer(0 - b->u.i); free_value(a); free_value(b); return (r); } - } else if (!to_number(b)) { + } else if (!to_integer(b)) { if( !extra_error_message_supplied ) ast_log(LOG_WARNING, "non-numeric argument\n"); free_value(b); return (a); } - r = make_number (a->u.i - b->u.i); + r = make_integer (/*(quad_t)*/(a->u.i - b->u.i)); if (chk_minus (a->u.i, b->u.i, r->u.i)) { ast_log(LOG_WARNING, "overflow\n"); } @@ -2601,14 +2584,14 @@ op_negate (struct val *a) { struct val *r; - if (!to_number (a) ) { + if (!to_integer (a) ) { free_value(a); if( !extra_error_message_supplied ) ast_log(LOG_WARNING, "non-numeric argument\n"); - return make_number(0); + return make_integer(0); } - r = make_number (- a->u.i); + r = make_integer (/*(quad_t)*/(- a->u.i)); if (chk_minus (0, a->u.i, r->u.i)) { ast_log(LOG_WARNING, "overflow\n"); } @@ -2630,7 +2613,7 @@ op_compl (struct val *a) { switch( a->type ) { - case AST_EXPR_number: + case AST_EXPR_integer: if( a->u.i == 0 ) v1 = 0; break; @@ -2661,13 +2644,13 @@ op_compl (struct val *a) } } - r = make_number (!v1); + r = make_integer (!v1); free_value (a); return r; } static int -chk_times (FP___TYPE a, FP___TYPE b, FP___TYPE r) +chk_times (quad_t a, quad_t b, quad_t r) { /* special case: first operand is 0, no overflow possible */ if (a == 0) @@ -2683,15 +2666,15 @@ op_times (struct val *a, struct val *b) { struct val *r; - if (!to_number (a) || !to_number (b)) { + if (!to_integer (a) || !to_integer (b)) { free_value(a); free_value(b); if( !extra_error_message_supplied ) ast_log(LOG_WARNING, "non-numeric argument\n"); - return(make_number(0)); + return(make_integer(0)); } - r = make_number (a->u.i * b->u.i); + r = make_integer (/*(quad_t)*/(a->u.i * b->u.i)); if (chk_times (a->u.i, b->u.i, r->u.i)) { ast_log(LOG_WARNING, "overflow\n"); } @@ -2701,7 +2684,7 @@ op_times (struct val *a, struct val *b) } static int -chk_div (FP___TYPE a, FP___TYPE b) +chk_div (quad_t a, quad_t b) { /* div by zero has been taken care of before */ /* only QUAD_MIN / -1 causes overflow */ @@ -2716,28 +2699,28 @@ op_div (struct val *a, struct val *b) { struct val *r; - if (!to_number (a)) { + if (!to_integer (a)) { free_value(a); free_value(b); if( !extra_error_message_supplied ) ast_log(LOG_WARNING, "non-numeric argument\n"); - return make_number(0); - } else if (!to_number (b)) { + return make_integer(0); + } else if (!to_integer (b)) { free_value(a); free_value(b); if( !extra_error_message_supplied ) ast_log(LOG_WARNING, "non-numeric argument\n"); - return make_number(INT_MAX); + return make_integer(INT_MAX); } if (b->u.i == 0) { ast_log(LOG_WARNING, "division by zero\n"); free_value(a); free_value(b); - return make_number(INT_MAX); + return make_integer(INT_MAX); } - r = make_number (a->u.i / b->u.i); + r = make_integer (/*(quad_t)*/(a->u.i / b->u.i)); if (chk_div (a->u.i, b->u.i)) { ast_log(LOG_WARNING, "overflow\n"); } @@ -2751,12 +2734,12 @@ op_rem (struct val *a, struct val *b) { struct val *r; - if (!to_number (a) || !to_number (b)) { + if (!to_integer (a) || !to_integer (b)) { if( !extra_error_message_supplied ) ast_log(LOG_WARNING, "non-numeric argument\n"); free_value(a); free_value(b); - return make_number(0); + return make_integer(0); } if (b->u.i == 0) { @@ -2765,7 +2748,7 @@ op_rem (struct val *a, struct val *b) return(b); } - r = make_number (FP___FMOD(a->u.i, b->u.i)); /* either fmod or fmodl if FP___TYPE is available */ + r = make_integer (/*(quad_t)*/(a->u.i % b->u.i)); /* chk_rem necessary ??? */ free_value (a); free_value (b); @@ -2805,11 +2788,11 @@ op_colon (struct val *a, struct val *b) v = make_str (a->u.s + rm[1].rm_so); } else { - v = make_number ((FP___TYPE)(rm[0].rm_eo - rm[0].rm_so)); + v = make_integer ((quad_t)(rm[0].rm_eo - rm[0].rm_so)); } } else { if (rp.re_nsub == 0) { - v = make_number ((FP___TYPE)0); + v = make_integer ((quad_t)0); } else { v = make_str (""); } @@ -2856,11 +2839,11 @@ op_eqtilde (struct val *a, struct val *b) v = make_str (a->u.s + rm[1].rm_so); } else { - v = make_number ((FP___TYPE)(rm[0].rm_eo - rm[0].rm_so)); + v = make_integer ((quad_t)(rm[0].rm_eo - rm[0].rm_so)); } } else { if (rp.re_nsub == 0) { - v = make_number ((FP___TYPE)0.0); + v = make_integer ((quad_t)0); } else { v = make_str (""); } |