// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#if NET_2_0
-
using System;
using System.Collections;
using System.Collections.Specialized;
else if (falseValues [evaluatedToken.Value] != null)
return false;
else
- throw new InvalidProjectFileException ();
+ throw new ExpressionEvaluationException (
+ String.Format ("Expression \"{0}\" evaluated to \"{1}\" instead of a boolean value",
+ token.Value, evaluatedToken.Value));
}
public override float NumberEvaluate (Project context)
static Token EvaluateToken (Token token, Project context)
{
Expression oe = new Expression ();
- oe.Parse (token.Value, true);
- return new Token ((string) oe.ConvertTo (context, typeof (string)), token.Type);
+ oe.Parse (token.Value, ParseOptions.AllowItemsMetadataAndSplit);
+ return new Token ((string) oe.ConvertTo (context, typeof (string)), token.Type, token.Position);
}
}
}
-
-#endif