#include <stdio.h>
#include <string.h>
#include <math.h>
+
struct parser_value_type {
double dval;
long long ival;
int yyerror(__attribute__((unused)) long long *result,
__attribute__((unused)) double *dresult,
__attribute__((unused)) int *has_error,
- __attribute__((unused)) int *bye, const char *msg);
+ __attribute__((unused)) int *units_specified,
+ __attribute__((unused)) const char *msg);
extern int yylex(void);
extern void yyrestart(FILE *file);
+extern int lexer_value_is_time;
%}
%token <v> BYE
%token <v> SUFFIX
%left '-' '+'
+%right SUFFIX
%left '*' '/'
%right '^'
%left '%'
%parse-param { long long *result }
%parse-param { double *dresult }
%parse-param { int *has_error }
-%parse-param { int *bye }
+%parse-param { int *units_specified }
%type <v> expression
%%
else
$$.dval = $1.ival * $2.ival;
$$.has_error = $1.has_error || $2.has_error;
+ *units_specified = 1;
}
| expression '%' expression {
if ($1.has_dval || $3.has_dval)
$$.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;
lexer_read_offset = 0;
}
-int evaluate_arithmetic_expression(const char *buffer, long long *ival, double *dval)
+int evaluate_arithmetic_expression(const char *buffer, long long *ival, double *dval,
+ double implied_units, int is_time)
{
- int rc, 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, &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;
}
+ if (!units_specified) {
+ *ival = (int) ((double) *ival * implied_units);
+ *dval = *dval * implied_units;
+ }
return has_error;
}
int yyerror(__attribute__((unused)) long long *result,
__attribute__((unused)) double *dresult,
__attribute__((unused)) int *has_error,
- __attribute__((unused)) int *bye, const char *msg)
+ __attribute__((unused)) int *units_specified,
+ __attribute__((unused)) const char *msg)
{
- fprintf(stderr, "%s\n", msg);
+ /* We do not need to do anything here. */
return 0;
}