#include <stdio.h>
#include <string.h>
#include <math.h>
+
struct parser_value_type {
double dval;
long long ival;
__attribute__((unused)) double *dresult,
__attribute__((unused)) int *has_error,
__attribute__((unused)) int *units_specified,
- __attribute__((unused)) int *bye, const char *msg);
+ __attribute__((unused)) const char *msg);
extern int yylex(void);
extern void yyrestart(FILE *file);
+extern int lexer_value_is_time;
%}
%parse-param { double *dresult }
%parse-param { int *has_error }
%parse-param { int *units_specified }
-%parse-param { int *bye }
%type <v> expression
%%
}
| expression '/' expression {
if ($3.ival == 0)
- yyerror(0, 0, 0, 0, 0, "divide by zero");
+ yyerror(0, 0, 0, 0, "divide by zero");
else
$$.ival = $1.ival / $3.ival;
if ($3.dval < 1e-20 && $3.dval > -1e-20)
- yyerror(0, 0, 0, 0, 0, "divide by zero");
+ yyerror(0, 0, 0, 0, "divide by zero");
else
$$.dval = $1.dval / $3.dval;
if ($3.has_dval || $1.has_dval)
}
| expression '%' expression {
if ($1.has_dval || $3.has_dval)
- yyerror(0, 0, 0, 0, 0, "modulo on floats");
+ yyerror(0, 0, 0, 0, "modulo on floats");
if ($3.ival == 0)
- yyerror(0, 0, 0, 0, 0, "divide by zero");
+ yyerror(0, 0, 0, 0, "divide by zero");
else {
$$.ival = $1.ival % $3.ival;
$$.dval = $$.ival;
$$.ival = (long long) $$.dval;
}
}
- | NUMBER { $$ = $1; }
- | BYE { $$ = $1; *bye = 1; };
+ | NUMBER { $$ = $1; };
%%
#include <stdio.h>
static int lexer_read_offset = 0;
static char lexer_input_buffer[1000];
-int lexer_input(char* buffer, int *bytes_read, int bytes_requested)
+int lexer_input(char* buffer, unsigned int *bytes_read, int bytes_requested)
{
int bytes_left = strlen(lexer_input_buffer) - lexer_read_offset;
}
int evaluate_arithmetic_expression(const char *buffer, long long *ival, double *dval,
- double implied_units)
+ double implied_units, int is_time)
{
- int rc, units_specified = 0, bye = 0, has_error = 0;
+ int rc, units_specified = 0, has_error = 0;
+ lexer_value_is_time = is_time;
setup_to_parse_string(buffer);
- rc = yyparse(ival, dval, &has_error, &units_specified, &bye);
+ rc = yyparse(ival, dval, &has_error, &units_specified);
yyrestart(NULL);
- if (rc || bye || has_error) {
+ if (rc || has_error) {
*ival = 0;
*dval = 0;
has_error = 1;
__attribute__((unused)) double *dresult,
__attribute__((unused)) int *has_error,
__attribute__((unused)) int *units_specified,
- __attribute__((unused)) int *bye,
__attribute__((unused)) const char *msg)
{
/* We do not need to do anything here. */