2010-03-03 Rolf Bjarne Kvinge <RKvinge@novell.com>

* trace.c: We need to parse exclude tokens ('-') before string tokens, since the exclude token is a valid string character. svn path=/trunk/mono/; revision=152906
mono · Sep 22, 2010 · 034acd4 · 034acd4
1 parent 961432a
commit 034acd4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-03  Rolf Bjarne Kvinge  <RKvinge@novell.com>
+
+	* trace.c: We need to parse exclude tokens ('-') before string tokens,
+	since the exclude token is a valid string character.
+
 2010-07-30 Rodrigo Kumpera  <rkumpera@novell.com>
 
 	* method-to-ir.c (mono_method_to_ir): Handle method with invalid

diff --git a/mono/mini/trace.c b/mono/mini/trace.c
@@ -132,6 +132,10 @@ get_token (void)
 		get_string ();
 		return TOKEN_CLASS;
 	}
+	if (*input == '-'){
+		input++;
+		return TOKEN_EXCLUDE;
+	}
 	if (is_filenamechar (*input)){
 		get_string ();
 		if (strcmp (value, "all") == 0)
@@ -142,10 +146,6 @@ get_token (void)
 			return TOKEN_DISABLED;
 		return TOKEN_STRING;
 	}
-	if (*input == '-'){
-		input++;
-		return TOKEN_EXCLUDE;
-	}
 	if (*input == ','){
 		input++;
 		return TOKEN_SEPARATOR;