X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=exp%2Fexpression-parser.l;h=50bd38320bbaedc2eec487d0e8d09b95d95faa7b;hb=14d0261ecd26020dfc114e1240c35e6dcca14cff;hp=f688da11684e16b68b88df9a1837c894e8b484b3;hpb=18722a18d75aaf487917776e077a8e61d14c8b8d;p=fio.git

diff --git a/exp/expression-parser.l b/exp/expression-parser.l
index f688da11..50bd3832 100644
--- a/exp/expression-parser.l
+++ b/exp/expression-parser.l
@@ -24,18 +24,27 @@
 
 #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); \
@@ -47,12 +56,11 @@ static int __attribute__((unused)) input(void);
 %%
 
 
-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;
 		}
@@ -98,6 +106,14 @@ bye		return BYE;
 			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);
@@ -109,8 +125,8 @@ bye		return BYE;
 			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;
 
@@ -158,7 +174,8 @@ bye		return BYE;
 		}
 	}
 \n	return 0;
-[+-/*()]	return yytext[0];
+[+-/*()^%]	return yytext[0];
+
 .	{
 		yylval.v.has_error = 1;
 		return NUMBER;