*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
#define YYSTYPE PARSER_VALUE_TYPE
-extern int lexer_input(char* buffer, int *nbytes, int buffersize);
+extern int lexer_input(char *buffer, unsigned int *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; \
+ unsigned int __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 void __attribute__((unused)) yyunput(int c, char *buf_ptr);
static int __attribute__((unused)) input(void);
+/* set by parser -- this is another thing which makes the parser thread-unsafe :(. */
+int lexer_value_is_time = 0; /* for determining if "m" suffix means mega- or minutes */
+
#define set_suffix_value(yylval, i_val, d_val, has_d_val) \
(yylval).v.dval = (d_val); \
(yylval).v.ival = (i_val); \
%%
-bye return BYE;
[kK]|[kK][bB] {
set_suffix_value(yylval, 1024, 1024.0, 0);
return SUFFIX;
}
-[Mm]|[Mm][bB] {
+[Mm][bB] {
set_suffix_value(yylval, 1024 * 1024, 1024.0 * 1024.0, 0);
return SUFFIX;
}
set_suffix_value(yylval, 1000000LL, 1000000.0 , 0);
return SUFFIX;
}
+[mM] {
+ if (!lexer_value_is_time) {
+ set_suffix_value(yylval, 1024 * 1024, 1024.0 * 1024.0, 0);
+ } else {
+ set_suffix_value(yylval, 60LL * 1000000LL, 60.0 * 1000000.0, 0);
+ }
+ return SUFFIX;
+ }
[dD] {
set_suffix_value(yylval, 60LL * 60LL * 24LL * 1000000LL,
60.0 * 60.0 * 24.0 * 1000000.0, 0);
}
[ \t] ; /* ignore whitespace */
[#:,].* ; /* ignore comments, and everything after colons and commas */
-[0-9]*[.][0-9]+ {
+[0-9]*[.][0-9]+|[0-9]*[.]?[0-9]+[eE][-+]*[0-9]+ {
int rc;
double dval;