Author: msierad
Date: 2007-01-12 04:30:53 -0500 (Fri, 12 Jan 2007)
New Revision: 70904
Modified:
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildItemGroup.cs
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildPropertyGroup.cs
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConditionParser.cs
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ImportCollection.cs
trunk/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/ImportCollectionTest.cs
trunk/mcs/class/Microsoft.Build.Engine/Test/various/Conditions.cs
Log:
2007-01-12 Marek Sieradzki <[EMAIL PROTECTED]>\
* ImportCollection.cs: Don't add imports that are already added.
* BuildItemGroup.cs: MonoTODOs.
* ConditionParser.cs (ParseAndEvaluate): Throw an exception when
condition can't be evaluated to bool.
* BuildPropertyGroup.cs (Evaluate): Simplify.
Modified:
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildItemGroup.cs
===================================================================
---
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildItemGroup.cs
2007-01-12 08:13:03 UTC (rev 70903)
+++
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildItemGroup.cs
2007-01-12 09:30:53 UTC (rev 70904)
@@ -124,11 +124,13 @@
return buildItems.GetEnumerator ();
}
+ [MonoTODO ("Doesn't remove item from XML")]
public void RemoveItem (BuildItem itemToRemove)
{
buildItems.Remove (itemToRemove);
}
+ [MonoTODO ("Doesn't remove item from XML")]
public void RemoveItemAt (int index)
{
buildItems.RemoveAt (index);
Modified:
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildPropertyGroup.cs
===================================================================
---
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildPropertyGroup.cs
2007-01-12 08:13:03 UTC (rev 70903)
+++
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildPropertyGroup.cs
2007-01-12 09:30:53 UTC (rev 70904)
@@ -201,18 +201,9 @@
internal void Evaluate ()
{
- if (!FromXml) {
- throw new InvalidOperationException ();
- }
- foreach (BuildProperty bp in properties) {
- if (bp.Condition == String.Empty)
+ foreach (BuildProperty bp in properties)
+ if (ConditionParser.ParseAndEvaluate
(bp.Condition, parentProject))
bp.Evaluate ();
- else {
- ConditionExpression ce =
ConditionParser.ParseCondition (bp.Condition);
- if (ce.BoolEvaluate (parentProject))
- bp.Evaluate ();
- }
- }
}
public string Condition {
Modified:
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog
===================================================================
---
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog
2007-01-12 08:13:03 UTC (rev 70903)
+++
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog
2007-01-12 09:30:53 UTC (rev 70904)
@@ -1,3 +1,14 @@
+2007-01-12 Marek Sieradzki <[EMAIL PROTECTED]>\
+
+ * ImportCollection.cs: Don't add imports that are already added.
+
+ * BuildItemGroup.cs: MonoTODOs.
+
+ * ConditionParser.cs (ParseAndEvaluate): Throw an exception when
+ condition can't be evaluated to bool.
+
+ * BuildPropertyGroup.cs (Evaluate): Simplify.
+
2007-01-10 Marek Sieradzki <[EMAIL PROTECTED]>
* BuildWhen.cs: Moved BindToXml () code to ctor.
Modified:
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConditionParser.cs
===================================================================
---
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConditionParser.cs
2007-01-12 08:13:03 UTC (rev 70903)
+++
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConditionParser.cs
2007-01-12 09:30:53 UTC (rev 70904)
@@ -39,22 +39,11 @@
ConditionTokenizer tokenizer = new ConditionTokenizer ();
- private ConditionParser (string condition)
+ ConditionParser (string condition)
{
tokenizer.Tokenize (condition);
}
- public static ConditionExpression ParseCondition (string
condition)
- {
- ConditionParser parser = new ConditionParser
(condition);
- ConditionExpression e = parser.ParseExpression ();
-
- if (!parser.tokenizer.IsEOF ())
- throw new ExpressionParseException
(String.Format ("Unexpected token: {0}", parser.tokenizer.Token.Value));
-
- return e;
- }
-
public static bool ParseAndEvaluate (string condition, Project
context)
{
if (String.IsNullOrEmpty (condition))
@@ -63,22 +52,33 @@
ConditionExpression ce = ParseCondition (condition);
if (!ce.CanEvaluateToBool (context))
- return false;
+ throw new InvalidProjectFileException
(String.Format ("Can not evaluate \"{0}\" to bool.", condition));
return ce.BoolEvaluate (context);
}
+
+ public static ConditionExpression ParseCondition (string
condition)
+ {
+ ConditionParser parser = new ConditionParser
(condition);
+ ConditionExpression e = parser.ParseExpression ();
+
+ if (!parser.tokenizer.IsEOF ())
+ throw new ExpressionParseException
(String.Format ("Unexpected token: {0}", parser.tokenizer.Token.Value));
+
+ return e;
+ }
- private ConditionExpression ParseExpression ()
+ ConditionExpression ParseExpression ()
{
return ParseBooleanExpression ();
}
- private ConditionExpression ParseBooleanExpression ()
+ ConditionExpression ParseBooleanExpression ()
{
return ParseBooleanAnd ();
}
- private ConditionExpression ParseBooleanAnd ()
+ ConditionExpression ParseBooleanAnd ()
{
ConditionExpression e = ParseBooleanOr ();
@@ -90,7 +90,7 @@
return e;
}
- private ConditionExpression ParseBooleanOr ()
+ ConditionExpression ParseBooleanOr ()
{
ConditionExpression e = ParseRelationalExpression ();
@@ -102,7 +102,7 @@
return e;
}
- private ConditionExpression ParseRelationalExpression ()
+ ConditionExpression ParseRelationalExpression ()
{
ConditionExpression e = ParseFactorExpression ();
Token opToken;
@@ -148,7 +148,7 @@
}
// FIXME: parse sub expression in parens, parse TokenType.Not,
parse functions
- private ConditionExpression ParseFactorExpression ()
+ ConditionExpression ParseFactorExpression ()
{
Token token = tokenizer.Token;
tokenizer.GetNextToken ();
Modified:
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ImportCollection.cs
===================================================================
---
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ImportCollection.cs
2007-01-12 08:13:03 UTC (rev 70903)
+++
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ImportCollection.cs
2007-01-12 09:30:53 UTC (rev 70904)
@@ -37,15 +37,20 @@
public class ImportCollection : ICollection, IEnumerable {
GroupingCollection groupingCollection;
+ Dictionary <string, object> filenames;
internal ImportCollection (GroupingCollection
groupingCollection)
{
this.groupingCollection = groupingCollection;
+ filenames = new Dictionary <string, object> ();
}
internal void Add (Import import)
{
- groupingCollection.Add (import);
+ if (!filenames.ContainsKey (import.ProjectPath)) {
+ groupingCollection.Add (import);
+ filenames.Add (import.ProjectPath, null);
+ }
}
public void CopyTo (Array array, int index)
Modified:
trunk/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/ImportCollectionTest.cs
===================================================================
---
trunk/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/ImportCollectionTest.cs
2007-01-12 08:13:03 UTC (rev 70903)
+++
trunk/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/ImportCollectionTest.cs
2007-01-12 09:30:53 UTC (rev 70904)
@@ -56,7 +56,6 @@
}
[Test]
- [Category ("NotWorking")]
public void TestAdd2 ()
{
string documentString = @"
Modified: trunk/mcs/class/Microsoft.Build.Engine/Test/various/Conditions.cs
===================================================================
--- trunk/mcs/class/Microsoft.Build.Engine/Test/various/Conditions.cs
2007-01-12 08:13:03 UTC (rev 70903)
+++ trunk/mcs/class/Microsoft.Build.Engine/Test/various/Conditions.cs
2007-01-12 09:30:53 UTC (rev 70904)
@@ -258,6 +258,7 @@
Assert.IsNull (proj.EvaluatedProperties ["D"], "A4");
Assert.IsNotNull (proj.EvaluatedProperties ["E"], "A5");
}
+
[Test]
[ExpectedException (typeof (InvalidProjectFileException))]
public void TestIncorrectCondition1 ()
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches