#define YYSTYPE PARSER_VALUE_TYPE
-extern int lexer_input(char* buffer, int *nbytes, int buffersize);
+extern int lexer_input(char* buffer, size_t *nbytes, int buffersize);
#undef YY_INPUT
-#define YY_INPUT(buffer, bytes_read, bytes_requested) \
- lexer_input((buffer), &(bytes_read), (bytes_requested))
+#define YY_INPUT(buffer, bytes_read, bytes_requested) \
+({ \
+ int __ret; \
+ size_t __bread = bytes_read; \
+ __ret = lexer_input((buffer), &__bread, (bytes_requested)); \
+ bytes_read = __bread; \
+ __ret; \
+})
extern int yyerror(long long *result, double *dresult,
- int *has_error, int *bye, const char *msg);
+ int *has_error, int *units_specified, const char *msg);
static void __attribute__((unused)) yyunput(int c,char *buf_ptr);
static int __attribute__((unused)) input(void);
%%
-bye return BYE;
[kK]|[kK][bB] {
set_suffix_value(yylval, 1024, 1024.0, 0);
return SUFFIX;
return SUFFIX;
}
[ \t] ; /* ignore whitespace */
-#.+ ; /* ignore comments */
-[0-9]*[.][0-9]+ {
+[#:,].* ; /* ignore comments, and everything after colons and commas */
+[0-9]*[.][0-9]+|[0-9]*[.]?[0-9]+[eE][-+]*[0-9]+ {
int rc;
double dval;