548d265fa08d11262a97f3933555addbb0f959c7 kent Wed Feb 11 16:11:37 2015 -0800 Updating code for long long vs. int. diff --git src/lib/rqlParse.c src/lib/rqlParse.c index d91b30f..04b359d 100644 --- src/lib/rqlParse.c +++ src/lib/rqlParse.c @@ -77,31 +77,31 @@ } } void rqlValDump(union rqlVal val, enum rqlType type, FILE *f) /* Dump out value to file. */ { switch (type) { case rqlTypeBoolean: fprintf(f, "%s", (val.b ? "true" : "false") ); break; case rqlTypeString: fprintf(f, "%s", val.s); break; case rqlTypeInt: - fprintf(f, "%d", val.i); + fprintf(f, "%lld", val.i); break; case rqlTypeDouble: fprintf(f, "%f", val.x); break; } } void rqlParseDump(struct rqlParse *p, int depth, FILE *f) /* Dump out rqlParse tree and children. */ { spaceOut(f, 3*depth); fprintf(f, "%s ", rqlOpToString(p->op)); rqlValDump(p->val, p->type, f); fprintf(f, "\n"); struct rqlParse *child; @@ -147,31 +147,31 @@ p->op = rqlOpSymbol; p->type = rqlTypeString; /* String until promoted at least. */ p->val.s = cloneString(tok); } else if (isdigit(c)) { p->op = rqlOpLiteral; p->type = rqlTypeInt; p->val.i = sqlUnsigned(tok); if ((tok = tokenizerNext(tkz)) != NULL) { if (tok[0] == '.') { char buf[32]; tok = tokenizerMustHaveNext(tkz); - safef(buf, sizeof(buf), "%d.%s", p->val.i, tok); + safef(buf, sizeof(buf), "%lld.%s", p->val.i, tok); p->type = rqlTypeDouble; p->val.x = sqlDouble(buf); } else tokenizerReuse(tkz); } } else if (c == '(') { p = rqlParseExpression(tkz); skipOverRequired(tkz, ")"); } else { errAbort("Unexpected %s line %d of %s", tok, tkz->lf->lineIx, tkz->lf->fileName);