Merge branch 'bugfix-main-thread-root'

[mono.git] / mcs / class / System.Web / System.Web.Compilation / ExpressionBuilder.cs

diff --git a/mcs/class/System.Web/System.Web.Compilation/ExpressionBuilder.cs b/mcs/class/System.Web/System.Web.Compilation/ExpressionBuilder.cs
index d8e0d25e3b7fc1365b84c4615072776f2174c974..88437b65c1dc8c676b54b81a802e3ccba24be180 100644 (file)
--- a/mcs/class/System.Web/System.Web.Compilation/ExpressionBuilder.cs
+++ b/mcs/class/System.Web/System.Web.Compilation/ExpressionBuilder.cs
@@ -27,7 +27,7 @@
 // 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.CodeDom;
 using System.Web.UI;
 
@@ -38,20 +38,25 @@ namespace System.Web.Compilation
                {
                }
 
-               public virtual bool SupportsEvaluate {
-                       get { return false; }
-               }
+               public abstract CodeExpression GetCodeExpression (BoundPropertyEntry entry, object parsedData,
+                                                                 ExpressionBuilderContext context);
 
                public virtual object EvaluateExpression (object target, BoundPropertyEntry entry, object parsedData,
-                                                               ExpressionBuilderContext context)
+                                                         ExpressionBuilderContext context)
                {
                        return null;
                }
 
-               public abstract CodeExpression GetCodeExpression (BoundPropertyEntry entry, object parsedData,
-                                                               ExpressionBuilderContext context);
+               public virtual object ParseExpression (string expression, Type propertyType, ExpressionBuilderContext context)
+               {
+                       return null;
+               }
+
+               public virtual bool SupportsEvaluate {
+                       get { return false; }
+               }
        }
        
 }
-#endif // NET_2_0
+