lix-project/lix
20
55
Fork 31
Code Issues 344 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Merge pull request #2378 from aszlig/int64

Browse source 
libexpr: Use int64_t for NixInt
This commit is contained in:
Eelco Dolstra 2018-08-29 13:30:50 +02:00 committed by GitHub
parent 54df4bb0b5 0ad643ed5c
commit 20d74a3257
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libexpr/lexer.l
View file

@ -12,6 +12,8 @@
%{ %{
#include <boost/lexical_cast.hpp>
#include "nixexpr.hh" #include "nixexpr.hh"
#include "parser-tab.hh" #include "parser-tab.hh"
@ -124,9 +126,11 @@ or { return OR_KW; }
{ID} { yylval->id = strdup(yytext); return ID; } {ID} { yylval->id = strdup(yytext); return ID; }
{INT} { errno = 0; {INT} { errno = 0;
yylval->n = strtol(yytext, 0, 10); try {
if (errno != 0) yylval->n = boost::lexical_cast<int64_t>(yytext);
} catch (const boost::bad_lexical_cast &) {
throw ParseError(format("invalid integer '%1%'") % yytext); throw ParseError(format("invalid integer '%1%'") % yytext);
}
return INT; return INT;
} }
{FLOAT} { errno = 0; {FLOAT} { errno = 0;

2
src/libexpr/value.hh
View file

@ -43,7 +43,7 @@ class XMLWriter;
class JSONPlaceholder; class JSONPlaceholder;
typedef long NixInt; typedef int64_t NixInt;
typedef double NixFloat; typedef double NixFloat;
/* External values must descend from ExternalValueBase, so that /* External values must descend from ExternalValueBase, so that