Added support for Observable fields.

Added support for ObservableField and it primitive siblings.

Bug 19268016

Change-Id: I28322e5adc44d40013e876271e7d40010c2fe0bb

27 files changed, 819 insertions, 241 deletions

diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/ObservableFieldTest.java b/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/ObservableFieldTest.java
new file mode 100644
index 0000000..5529696
--- /dev/null
+++ b/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/ObservableFieldTest.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.databinding.testapp;
+
+import com.android.databinding.testapp.generated.ObservableFieldTestBinder;
+import com.android.databinding.testapp.vo.ObservableFieldBindingObject;
+
+import android.test.UiThreadTest;
+import android.widget.TextView;
+
+public class ObservableFieldTest extends BaseDataBinderTest<ObservableFieldTestBinder> {
+    private ObservableFieldBindingObject mObj;
+
+    public ObservableFieldTest() {
+        super(ObservableFieldTestBinder.class, R.layout.observable_field_test);
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        try {
+            runTestOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    mObj = new ObservableFieldBindingObject();
+                    mBinder.setObj(mObj);
+                    mBinder.rebindDirty();
+                }
+            });
+        } catch (Throwable throwable) {
+            throw new Exception(throwable);
+        }
+    }
+
+    @UiThreadTest
+    public void testBoolean() {
+        TextView view = mBinder.getBField();
+        assertEquals("false", view.getText());
+
+        mObj.bField.set(true);
+        mBinder.rebindDirty();
+
+        assertEquals("true", view.getText());
+    }
+
+    @UiThreadTest
+    public void testByte() {
+        TextView view = mBinder.getTField();
+        assertEquals("0", view.getText());
+
+        mObj.tField.set((byte) 1);
+        mBinder.rebindDirty();
+
+        assertEquals("1", view.getText());
+    }
+
+    @UiThreadTest
+    public void testShort() {
+        TextView view = mBinder.getSField();
+        assertEquals("0", view.getText());
+
+        mObj.sField.set((short) 1);
+        mBinder.rebindDirty();
+
+        assertEquals("1", view.getText());
+    }
+
+    @UiThreadTest
+    public void testChar() {
+        TextView view = mBinder.getCField();
+        assertEquals("\u0000", view.getText());
+
+        mObj.cField.set('A');
+        mBinder.rebindDirty();
+
+        assertEquals("A", view.getText());
+    }
+
+    @UiThreadTest
+    public void testInt() {
+        TextView view = mBinder.getIField();
+        assertEquals("0", view.getText());
+
+        mObj.iField.set(1);
+        mBinder.rebindDirty();
+
+        assertEquals("1", view.getText());
+    }
+
+    @UiThreadTest
+    public void testLong() {
+        TextView view = mBinder.getLField();
+        assertEquals("0", view.getText());
+
+        mObj.lField.set(1);
+        mBinder.rebindDirty();
+
+        assertEquals("1", view.getText());
+    }
+
+    @UiThreadTest
+    public void testFloat() {
+        TextView view = mBinder.getFField();
+        assertEquals("0.0", view.getText());
+
+        mObj.fField.set(1);
+        mBinder.rebindDirty();
+
+        assertEquals("1.0", view.getText());
+    }
+
+    @UiThreadTest
+    public void testDouble() {
+        TextView view = mBinder.getDField();
+        assertEquals("0.0", view.getText());
+
+        mObj.dField.set(1);
+        mBinder.rebindDirty();
+
+        assertEquals("1.0", view.getText());
+    }
+
+    @UiThreadTest
+    public void testObject() {
+        TextView view = mBinder.getOField();
+        assertEquals("Hello", view.getText());
+
+        mObj.oField.set("World");
+        mBinder.rebindDirty();
+
+        assertEquals("World", view.getText());
+    }
+}
diff --git a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/ObservableFieldBindingObject.java b/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/ObservableFieldBindingObject.java
new file mode 100644
index 0000000..651a8cf
--- /dev/null
+++ b/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/ObservableFieldBindingObject.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.databinding.testapp.vo;
+
+import com.android.databinding.library.BaseObservable;
+import com.android.databinding.library.ObservableBoolean;
+import com.android.databinding.library.ObservableByte;
+import com.android.databinding.library.ObservableChar;
+import com.android.databinding.library.ObservableDouble;
+import com.android.databinding.library.ObservableField;
+import com.android.databinding.library.ObservableFloat;
+import com.android.databinding.library.ObservableInt;
+import com.android.databinding.library.ObservableLong;
+import com.android.databinding.library.ObservableShort;
+
+import android.binding.Bindable;
+
+public class ObservableFieldBindingObject {
+    public final ObservableBoolean bField = new ObservableBoolean();
+    public final ObservableByte tField = new ObservableByte();
+    public final ObservableShort sField = new ObservableShort();
+    public final ObservableChar cField = new ObservableChar();
+    public final ObservableInt iField = new ObservableInt();
+    public final ObservableLong lField = new ObservableLong();
+    public final ObservableFloat fField = new ObservableFloat();
+    public final ObservableDouble dField = new ObservableDouble();
+    public final ObservableField<String> oField = new ObservableField<>();
+
+    public ObservableFieldBindingObject() {
+        oField.set("Hello");
+    }
+}
diff --git a/tools/data-binding/TestApp/src/main/res/layout/observable_field_test.xml b/tools/data-binding/TestApp/src/main/res/layout/observable_field_test.xml
new file mode 100644
index 0000000..61dff3e
--- /dev/null
+++ b/tools/data-binding/TestApp/src/main/res/layout/observable_field_test.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+    <variable name="obj" type="com.android.databinding.testapp.vo.ObservableFieldBindingObject"/>
+    <TextView
+            android:id="@+id/bField"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@{`` + obj.bField}"/>
+    <TextView
+            android:id="@+id/tField"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@{`` + obj.tField}"/>
+    <TextView
+            android:id="@+id/sField"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@{`` + obj.sField}"/>
+    <TextView
+            android:id="@+id/cField"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@{`` + obj.cField}"/>
+    <TextView
+            android:id="@+id/iField"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@{`` + obj.iField}"/>
+    <TextView
+            android:id="@+id/lField"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@{`` + obj.lField}"/>
+    <TextView
+            android:id="@+id/fField"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@{`` + obj.fField}"/>
+    <TextView
+            android:id="@+id/dField"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@{`` + obj.dField}"/>
+    <TextView
+            android:id="@+id/oField"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@{obj.oField}"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/tools/data-binding/compiler/src/main/java/com/android/databinding/ClassAnalyzer.java b/tools/data-binding/compiler/src/main/java/com/android/databinding/ClassAnalyzer.java
index d9661d4..50a2b30 100644
--- a/tools/data-binding/compiler/src/main/java/com/android/databinding/ClassAnalyzer.java
+++ b/tools/data-binding/compiler/src/main/java/com/android/databinding/ClassAnalyzer.java
@@ -37,6 +37,17 @@ public class ClassAnalyzer {
     private static final String OBSERVABLE_LIST_CLASS_NAME = "android.binding.ObservableList";
     private static final String OBSERVABLE_MAP_CLASS_NAME = "android.binding.ObservableMap";
     private static final String BINDABLE_ANNOTATION_NAME = "android.binding.Bindable";
+    private static final String[] OBSERVABLE_FIELDS = {
+            "com.android.databinding.library.ObservableBoolean",
+            "com.android.databinding.library.ObservableByte",
+            "com.android.databinding.library.ObservableChar",
+            "com.android.databinding.library.ObservableShort",
+            "com.android.databinding.library.ObservableInt",
+            "com.android.databinding.library.ObservableLong",
+            "com.android.databinding.library.ObservableFloat",
+            "com.android.databinding.library.ObservableDouble",
+            "com.android.databinding.library.ObservableField",
+    };
     private static final String I_VIEW_DATA_BINDER = "com.android.databinding.library.IViewDataBinder";
 
     private static Map<String, String> sTestClassNameMapping = ImmutableMap.of(
@@ -60,6 +71,8 @@ public class ClassAnalyzer {
 
     private final Class mObservableMap;
 
+    private final Class[] mObservableFields;
+
     private final Class mBindable;
 
     private final boolean mTestMode;
@@ -75,6 +88,11 @@ public class ClassAnalyzer {
             mObservableList = classLoader.loadClass(getClassName(OBSERVABLE_LIST_CLASS_NAME));
             mObservableMap = classLoader.loadClass(getClassName(OBSERVABLE_MAP_CLASS_NAME));
             mBindable = classLoader.loadClass(getClassName(BINDABLE_ANNOTATION_NAME));
+            mObservableFields = new Class[OBSERVABLE_FIELDS.length];
+            for (int i = 0; i < OBSERVABLE_FIELDS.length; i++) {
+                mObservableFields[i] = classLoader.loadClass(getClassName(OBSERVABLE_FIELDS[i]));
+            }
+
         } catch (ClassNotFoundException e) {
             throw new RuntimeException(e);
         }
@@ -134,6 +152,15 @@ public class ClassAnalyzer {
             mObservableMap.isAssignableFrom(klass);
     }
 
+    public boolean isObservableField(Class klass) {
+        for (Class observableField : mObservableFields) {
+            if (observableField.isAssignableFrom(klass)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     public boolean isBindable(Field field) {
         return field.getAnnotation(mBindable) != null;
     }
@@ -270,6 +297,12 @@ public class ClassAnalyzer {
         if("boolean".equals(className)) {
             return "false";
         }
+        if ("char".equals(className)) {
+            return "'\\u0000'";
+        }
+        if ("byte".equals(className)) {
+            return "0";
+        }
         return "null";
     }
 
diff --git a/tools/data-binding/compiler/src/main/java/com/android/databinding/expr/BracketExpr.java b/tools/data-binding/compiler/src/main/java/com/android/databinding/expr/BracketExpr.java
index 11f1369..b576554 100644
--- a/tools/data-binding/compiler/src/main/java/com/android/databinding/expr/BracketExpr.java
+++ b/tools/data-binding/compiler/src/main/java/com/android/databinding/expr/BracketExpr.java
@@ -29,21 +29,15 @@ public class BracketExpr extends Expr {
         MAP,
     }
 
-    final private Expr mTarget;
-
-    final private Expr mArg;
-
     private BracketAccessor mAccessor;
 
     BracketExpr(Expr target, Expr arg) {
         super(target, arg);
-        mTarget = target;
-        mArg = arg;
     }
 
     @Override
     protected Class resolveType(ClassAnalyzer classAnalyzer) {
-        Class<?> targetType = mTarget.resolveType(classAnalyzer);
+        Class<?> targetType = getTarget().resolveType(classAnalyzer);
         if (targetType.isArray()) {
             mAccessor = BracketAccessor.ARRAY;
         } else if (List.class.isAssignableFrom(targetType)) {
@@ -68,15 +62,15 @@ public class BracketExpr extends Expr {
     }
 
     protected String computeUniqueKey() {
-        return sUniqueKeyJoiner.join(mTarget.computeUniqueKey(), "$", mArg.computeUniqueKey(), "$");
+        return sUniqueKeyJoiner.join(getTarget().computeUniqueKey(), "$", getArg().computeUniqueKey(), "$");
     }
 
     public Expr getTarget() {
-        return mTarget;
+        return getChildren().get(0);
     }
 
     public Expr getArg() {
-        return mArg;
+        return getChildren().get(1);
     }
 
     public BracketAccessor getAccessor() {
@@ -84,6 +78,6 @@ public class BracketExpr extends Expr {
     }
 
     public boolean argCastsInteger() {
-        return Object.class.equals(mArg.getResolvedType());
+        return Object.class.equals(getArg().getResolvedType());
     }
 }
diff --git a/tools/data-binding/compiler/src/main/java/com/android/databinding/expr/ComparisonExpr.java b/tools/data-binding/compiler/src/main/java/com/android/databinding/expr/ComparisonExpr.java
index d0bbcc7..82b0035 100644
--- a/tools/data-binding/compiler/src/main/java/com/android/databinding/expr/ComparisonExpr.java
+++ b/tools/data-binding/compiler/src/main/java/com/android/databinding/expr/ComparisonExpr.java
@@ -22,13 +22,9 @@ import java.util.List;
 
 public class ComparisonExpr extends Expr {
     final String mOp;
-    final Expr mLeft;
-    final Expr mRight;
     ComparisonExpr(String op, Expr left, Expr right) {
         super(left, right);
         mOp = op;
-        mLeft = left;
-        mRight = right;
     }
 
     @Override
@@ -51,11 +47,11 @@ public class ComparisonExpr extends Expr {
     }
 
     public Expr getLeft() {
-        return mLeft;
+        return getChildren().get(0);
     }
 
     public Expr getRight() {
-        return mRight;
+        return getChildren().get(1);
     }
 
     @Override
diff --git a/tools/data-binding/compiler/src/main/java/com/android/databinding/expr/Expr.java b/tools/data-binding/compiler/src/main/java/com/android/databinding/expr/Expr.java
index a773d66..d4821fe 100644
--- a/tools/data-binding/compiler/src/main/java/com/android/databinding/expr/Expr.java
+++ b/tools/data-binding/compiler/src/main/java/com/android/databinding/expr/Expr.java
@@ -29,6 +29,7 @@ import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 
 import com.android.databinding.ClassAnalyzer;
+import com.android.databinding.util.L;
 
 abstract public class Expr {
 
@@ -143,6 +144,10 @@ abstract public class Expr {
         return mIsBindingExpression;
     }
 
+    public boolean isObservable() {
+        return ClassAnalyzer.getInstance().isObservable(getResolvedType());
+    }
+
     public BitSet getShouldReadFlags() {
         if (mShouldReadFlags == null) {
             getShouldReadFlagsWithConditionals();
@@ -564,6 +569,9 @@ abstract public class Expr {
         return mIsUsed;
     }
 
+    public void updateExpr(ClassAnalyzer classAnalyzer) {
+    }
+
     static class Node {
 
         BitSet mBitSet = new BitSet();
diff --git a/tools/data-binding/compiler/src/main/java/com/android/databinding/expr/ExprModel.java b/tools/data-binding/compiler/src/main/java/com/android/databinding/expr/ExprModel.java
index 97eec9d..c308ea8 100644
--- a/tools/data-binding/compiler/src/main/java/com/android/databinding/expr/ExprModel.java
+++ b/tools/data-binding/compiler/src/main/java/com/android/databinding/expr/ExprModel.java
@@ -101,6 +101,10 @@ public class ExprModel {
         return register(new FieldAccessExpr(parent, name));
     }
 
+    public FieldAccessExpr observableField(Expr parent, String name) {
+        return register(new FieldAccessExpr(parent, name, true));
+    }
+
     public SymbolExpr symbol(String text, Class type) {
         return register(new SymbolExpr(text, type));
     }
@@ -189,6 +193,18 @@ public class ExprModel {
         //ensure class analyzer. We need to know observables at this point
         final ClassAnalyzer classAnalyzer = ClassAnalyzer.getInstance();
 
+        ArrayList<Expr> processedExprs = new ArrayList<>();
+        ArrayList<Expr> exprs = new ArrayList<>();
+        do {
+            exprs.clear();
+            exprs.addAll(mExprMap.values());
+            exprs.removeAll(processedExprs);
+            for (Expr expr: exprs) {
+                expr.updateExpr(classAnalyzer);
+            }
+            processedExprs.addAll(exprs);
+        } while (!exprs.isEmpty());
+
         int counter = 0;
         final Iterable<Expr> observables = filterObservables(classAnalyzer);
         List<String> flagMapping = Lists.newArrayList();
@@ -218,7 +234,8 @@ public class ExprModel {
                     continue;// already has some id, means observable
                 }
                 // only fields earn an id
-                if (parent instanceof FieldAccessExpr && parent.isDynamic()) {
+                if (parent instanceof FieldAccessExpr && parent.isDynamic() &&
+                        !((FieldAccessExpr) parent).getName().isEmpty()) {
                     flagMapping.add(parent.getUniqueKey());
                     parent.setId(counter++);
                     notifiableExpressions.add(parent);
@@ -232,6 +249,9 @@ public class ExprModel {
 
         // non-dynamic binding expressions receive some ids so that they can be invalidated
         for (Expr expr : mBindingExpressions) {
+            if (!(expr.isDynamic() || !expr.hasId())) {
+                L.d("Expr " + expr + " is dynamic? " + expr.isDynamic() + ", has ID? " + expr.hasId());
+            }
             Preconditions.checkState(expr.isDynamic() || !expr.hasId());
             if (!expr.isDynamic()) {
                 // give it an id for invalidateAll
diff --git a/tools/data-binding/compiler/src/main/java/com/android/databinding/expr/FieldAccessExpr.java b/tools/data-binding/compiler/src/main/java/com/android/databinding/expr/FieldAccessExpr.java
index 5a41573..10a4584 100644
--- a/tools/data-binding/compiler/src/main/java/com/android/databinding/expr/FieldAccessExpr.java
+++ b/tools/data-binding/compiler/src/main/java/com/android/databinding/expr/FieldAccessExpr.java
@@ -17,22 +17,33 @@
 package com.android.databinding.expr;
 
 import com.android.databinding.ClassAnalyzer;
+import com.android.databinding.util.L;
 
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class FieldAccessExpr extends Expr {
     String mName;
     ClassAnalyzer.Callable mGetter;
-    Expr mParent;
+    final boolean mIsObservableField;
 
     FieldAccessExpr(Expr parent, String name) {
         super(parent);
         mName = name;
-        mParent = parent;
+        mIsObservableField = false;
+    }
+
+    FieldAccessExpr(Expr parent, String name, boolean isObservableField) {
+        super(parent);
+        mName = name;
+        mIsObservableField = isObservableField;
     }
 
     public Expr getParent() {
-        return mParent;
+        return getChildren().get(0);
     }
 
     public ClassAnalyzer.Callable getGetter() {
@@ -41,7 +52,7 @@ public class FieldAccessExpr extends Expr {
 
     @Override
     public boolean isDynamic() {
-        if (!mParent.isDynamic()) {
+        if (!getParent().isDynamic()) {
             return false;
         }
         if (mGetter == null) {
@@ -55,7 +66,7 @@ public class FieldAccessExpr extends Expr {
     protected List<Dependency> constructDependencies() {
         final List<Dependency> dependencies = constructDynamicChildrenDependencies();
         for (Dependency dependency : dependencies) {
-            if (dependency.getOther() == mParent) {
+            if (dependency.getOther() == getParent()) {
                 dependency.setMandatory(true);
             }
         }
@@ -64,6 +75,9 @@ public class FieldAccessExpr extends Expr {
 
     @Override
     protected String computeUniqueKey() {
+        if (mIsObservableField) {
+            return sUniqueKeyJoiner.join(mName, "..", super.computeUniqueKey());
+        }
         return sUniqueKeyJoiner.join(mName, ".", super.computeUniqueKey());
     }
 
@@ -72,6 +86,28 @@ public class FieldAccessExpr extends Expr {
     }
 
     @Override
+    public void updateExpr(ClassAnalyzer classAnalyzer) {
+        if (mGetter == null) {
+            mGetter = classAnalyzer.findMethodOrField(mChildren.get(0).getResolvedType(), mName);
+            if (classAnalyzer.isObservableField(mGetter.resolvedType)) {
+                // Make this the ".get()" and add an extra field access for the observable field
+                Expr parent = getParent();
+                parent.getParents().remove(this);
+                getChildren().remove(parent);
+
+                FieldAccessExpr observableField = getModel().observableField(parent, mName);
+                observableField.mGetter = mGetter;
+
+                getChildren().add(observableField);
+                observableField.getParents().add(this);
+                mGetter = classAnalyzer.findMethod(mGetter.resolvedType, "get",
+                        Collections.EMPTY_LIST);
+                mName = "";
+            }
+        }
+    }
+
+    @Override
     protected Class resolveType(ClassAnalyzer classAnalyzer) {
         if (mGetter == null) {
             mGetter = classAnalyzer.findMethodOrField(mChildren.get(0).getResolvedType(), mName);
diff --git a/tools/data-binding/compiler/src/main/java/com/android/databinding/expr/GroupExpr.java b/tools/data-binding/compiler/src/main/java/com/android/databinding/expr/GroupExpr.java
index df7d3d2..b5ef3ce 100644
--- a/tools/data-binding/compiler/src/main/java/com/android/databinding/expr/GroupExpr.java
+++ b/tools/data-binding/compiler/src/main/java/com/android/databinding/expr/GroupExpr.java
@@ -21,24 +21,21 @@ import com.android.databinding.ClassAnalyzer;
 import java.util.List;
 
 public class GroupExpr extends Expr {
-    Expr mWrapped;
-
     public GroupExpr(Expr wrapped) {
         super(wrapped);
-        mWrapped = wrapped;
     }
 
     @Override
     protected Class resolveType(ClassAnalyzer classAnalyzer) {
-        return mWrapped.resolveType(classAnalyzer);
+        return getWrapped().resolveType(classAnalyzer);
     }
 
     @Override
     protected List<Dependency> constructDependencies() {
-        return mWrapped.constructDependencies();
+        return getWrapped().constructDependencies();
     }
 
     public Expr getWrapped() {
-        return mWrapped;
+        return getChildren().get(0);
     }
 }
diff --git a/tools/data-binding/compiler/src/main/java/com/android/databinding/expr/MathExpr.java b/tools/data-binding/compiler/src/main/java/com/android/databinding/expr/MathExpr.java
index 2187ada..e14a143 100644
--- a/tools/data-binding/compiler/src/main/java/com/android/databinding/expr/MathExpr.java
+++ b/tools/data-binding/compiler/src/main/java/com/android/databinding/expr/MathExpr.java
@@ -22,30 +22,27 @@ import java.util.List;
 
 public class MathExpr extends Expr {
     final String mOp;
-    final Expr mLeft;
-    final Expr mRight;
     MathExpr(Expr left, String op, Expr right) {
         super(left, right);
         mOp = op;
-        mLeft = left;
-        mRight = right;
     }
 
     @Override
     protected String computeUniqueKey() {
-        return sUniqueKeyJoiner.join(mLeft.getUniqueKey(), mOp, mRight.getUniqueKey());
+        return sUniqueKeyJoiner.join(getLeft().getUniqueKey(), mOp, getRight().getUniqueKey());
     }
 
     @Override
     protected Class resolveType(ClassAnalyzer classAnalyzer) {
         if ("+".equals(mOp)) {
             // TODO we need upper casting etc.
-            if (String.class.equals(mLeft.getResolvedType())
-                    || String.class.equals(mRight.getResolvedType())) {
+            if (String.class.equals(getLeft().getResolvedType())
+                    || String.class.equals(getRight().getResolvedType())) {
                 return String.class;
             }
         }
-        return classAnalyzer.findCommonParentOf(mLeft.getResolvedType(), mRight.getResolvedType());
+        return classAnalyzer.findCommonParentOf(getLeft().getResolvedType(),
+                getRight().getResolvedType());
     }
 
     @Override
@@ -58,10 +55,10 @@ public class MathExpr extends Expr {
     }
 
     public Expr getLeft() {
-        return mLeft;
+        return getChildren().get(0);
     }
 
     public Expr getRight() {
-        return mRight;
+        return getChildren().get(1);
     }
 }
diff --git a/tools/data-binding/compiler/src/main/java/com/android/databinding/expr/MethodCallExpr.java b/tools/data-binding/compiler/src/main/java/com/android/databinding/expr/MethodCallExpr.java
index 6c1fa18..5ed387e 100644
--- a/tools/data-binding/compiler/src/main/java/com/android/databinding/expr/MethodCallExpr.java
+++ b/tools/data-binding/compiler/src/main/java/com/android/databinding/expr/MethodCallExpr.java
@@ -25,27 +25,23 @@ import java.util.Arrays;
 import java.util.List;
 
 public class MethodCallExpr extends Expr {
-    final Expr mTarget;
     final String mName;
-    final List<Expr> mArgs;
 
     ClassAnalyzer.Callable mGetter;
 
     MethodCallExpr(Expr target, String name, List<Expr> args) {
         super(Iterables.concat(Arrays.asList(target), args));
-        mTarget = target;
         mName = name;
-        mArgs = args;
     }
 
     @Override
     protected Class resolveType(ClassAnalyzer classAnalyzer) {
         if (mGetter == null) {
             List<Class> args = new ArrayList<>();
-            for (Expr expr : mArgs) {
+            for (Expr expr : getArgs()) {
                 args.add(expr.getResolvedType());
             }
-            mGetter = classAnalyzer.findMethod(mTarget.getResolvedType(), mName, args);
+            mGetter = classAnalyzer.findMethod(getTarget().getResolvedType(), mName, args);
         }
         return mGetter.resolvedType;
     }
@@ -54,7 +50,7 @@ public class MethodCallExpr extends Expr {
     protected List<Dependency> constructDependencies() {
         final List<Dependency> dependencies = constructDynamicChildrenDependencies();
         for (Dependency dependency : dependencies) {
-            if (dependency.getOther() == mTarget) {
+            if (dependency.getOther() == getTarget()) {
                 dependency.setMandatory(true);
             }
         }
@@ -63,11 +59,12 @@ public class MethodCallExpr extends Expr {
 
     @Override
     protected String computeUniqueKey() {
-        return sUniqueKeyJoiner.join(mTarget.computeUniqueKey(), mName, super.computeUniqueKey());
+        return sUniqueKeyJoiner.join(getTarget().computeUniqueKey(), mName,
+                super.computeUniqueKey());
     }
 
     public Expr getTarget() {
-        return mTarget;
+        return getChildren().get(0);
     }
 
     public String getName() {
@@ -75,7 +72,7 @@ public class MethodCallExpr extends Expr {
     }
 
     public List<Expr> getArgs() {
-        return mArgs;
+        return getChildren().subList(1, getChildren().size());
     }
 
     public ClassAnalyzer.Callable getGetter() {
diff --git a/tools/data-binding/compiler/src/main/java/com/android/databinding/expr/TernaryExpr.java b/tools/data-binding/compiler/src/main/java/com/android/databinding/expr/TernaryExpr.java
index 5afa3b4..fc25e6d 100644
--- a/tools/data-binding/compiler/src/main/java/com/android/databinding/expr/TernaryExpr.java
+++ b/tools/data-binding/compiler/src/main/java/com/android/databinding/expr/TernaryExpr.java
@@ -24,26 +24,20 @@ import java.util.BitSet;
 import java.util.List;
 
 public class TernaryExpr extends Expr {
-    final Expr mIfTrue;
-    final Expr mIfFalse;
-    final Expr mPred;
     TernaryExpr(Expr pred, Expr ifTrue, Expr ifFalse) {
         super(pred, ifTrue, ifFalse);
-        mPred = pred;
-        mIfTrue = ifTrue;
-        mIfFalse = ifFalse;
     }
 
     public Expr getPred() {
-        return mPred;
+        return getChildren().get(0);
     }
 
     public Expr getIfTrue() {
-        return mIfTrue;
+        return getChildren().get(1);
     }
 
     public Expr getIfFalse() {
-        return mIfFalse;
+        return getChildren().get(2);
     }
 
     @Override
@@ -53,29 +47,33 @@ public class TernaryExpr extends Expr {
 
     @Override
     protected Class resolveType(ClassAnalyzer classAnalyzer) {
-        return classAnalyzer.findCommonParentOf(mIfTrue.getResolvedType(), mIfFalse.getResolvedType());
+        return classAnalyzer.findCommonParentOf(getIfTrue().getResolvedType(),
+                getIfFalse().getResolvedType());
     }
 
     @Override
     protected List<Dependency> constructDependencies() {
         List<Dependency> deps = Lists.newArrayList();
-        if (mPred.isDynamic()) {
-            final Dependency pred = new Dependency(this, mPred);
+        Expr predExpr = getPred();
+        if (predExpr.isDynamic()) {
+            final Dependency pred = new Dependency(this, predExpr);
             pred.setMandatory(true);
             deps.add(pred);
         }
-        if (mIfTrue.isDynamic()) {
-            deps.add(new Dependency(this, mIfTrue, mPred, true));
+        Expr ifTrueExpr = getIfTrue();
+        if (ifTrueExpr.isDynamic()) {
+            deps.add(new Dependency(this, ifTrueExpr, predExpr, true));
         }
-        if (mIfFalse.isDynamic()) {
-            deps.add(new Dependency(this, mIfFalse, mPred, false));
+        Expr ifFalseExpr = getIfFalse();
+        if (ifFalseExpr.isDynamic()) {
+            deps.add(new Dependency(this, ifFalseExpr, predExpr, false));
         }
         return deps;
     }
 
     @Override
     protected BitSet getPredicateInvalidFlags() {
-        return mPred.getInvalidFlags();
+        return getPred().getInvalidFlags();
     }
 
     @Override
diff --git a/tools/data-binding/compiler/src/main/java/com/android/databinding/store/SetterStore.java b/tools/data-binding/compiler/src/main/java/com/android/databinding/store/SetterStore.java
index 3c73347..8a1e338 100644
--- a/tools/data-binding/compiler/src/main/java/com/android/databinding/store/SetterStore.java
+++ b/tools/data-binding/compiler/src/main/java/com/android/databinding/store/SetterStore.java
@@ -327,6 +327,9 @@ public class SetterStore {
             }
         }
 
+        if (Object.class.equals(valueType) && !bestValueType.isAssignableFrom(valueType)) {
+            valueExpression = "(" + bestValueType.getCanonicalName() + ") " + valueExpression;
+        }
         MethodDescription conversionMethod = getConversionMethod(valueType, bestValueType);
         if (conversionMethod != null) {
             valueExpression = conversionMethod.type + "." + conversionMethod.method + "(" +
diff --git a/tools/data-binding/compiler/src/main/kotlin/com/android/databinding/ext/ext.kt b/tools/data-binding/compiler/src/main/kotlin/com/android/databinding/ext/ext.kt
index aec90f0..946c7cc 100644
--- a/tools/data-binding/compiler/src/main/kotlin/com/android/databinding/ext/ext.kt
+++ b/tools/data-binding/compiler/src/main/kotlin/com/android/databinding/ext/ext.kt
@@ -38,7 +38,6 @@ public fun Class<*>.toJavaCode() : String {
     val name = getName();
     if (name.startsWith('[')) {
         val numArray = name.lastIndexOf('[') + 1;
-        val isClass = name.endsWith(';') && name.charAt(numArray) == 'L';
         val componentType : String;
         when (name.charAt(numArray)) {
             'Z' -> componentType = "boolean"
diff --git a/tools/data-binding/compiler/src/main/kotlin/com/android/databinding/writer/LayoutBinderWriter.kt b/tools/data-binding/compiler/src/main/kotlin/com/android/databinding/writer/LayoutBinderWriter.kt
index 1bf0109..9d6a95c 100644
--- a/tools/data-binding/compiler/src/main/kotlin/com/android/databinding/writer/LayoutBinderWriter.kt
+++ b/tools/data-binding/compiler/src/main/kotlin/com/android/databinding/writer/LayoutBinderWriter.kt
@@ -46,8 +46,6 @@ import com.android.databinding.ext.isObservable
 import com.android.databinding.expr.ResourceExpr
 import com.android.databinding.expr.BracketExpr
 
-fun Expr.isObservable() = com.android.databinding.ClassAnalyzer.getInstance().isObservable(this.getResolvedType())
-
 fun String.stripNonJava() = this.split("[^a-zA-Z0-9]").map{ it.trim() }.joinToCamelCaseAsVar()
 
 class ExprModelExt {
@@ -618,7 +616,7 @@ class LayoutBinderWriter(val layoutBinder : LayoutBinder) {
                     tab("${expr.localName}").app(" = ", expr.toCode(true)).app(";")
                     //tab("""log("${expr}" + ${expr.localName},0);""")
                 }
-                if (expr.getResolvedType().isObservable()) {
+                if (expr.isObservable()) {
                     tab("updateRegistration(${expr.getId()}, ${expr.localName});")
                 }
             }
diff --git a/tools/data-binding/grammarBuilder/BindingExpression.g4 b/tools/data-binding/grammarBuilder/BindingExpression.g4
index f406bec..5bbbb8c 100644
--- a/tools/data-binding/grammarBuilder/BindingExpression.g4
+++ b/tools/data-binding/grammarBuilder/BindingExpression.g4
@@ -333,7 +333,7 @@ SingleCharacter
     ;
 // §3.10.5 String Literals
 SingleQuoteString
-    :   '`' SingleQuoteStringCharacter SingleQuoteStringCharacter+ '`'
+    :   '`' SingleQuoteStringCharacter* '`'
     ;
 
 DoubleQuoteString
diff --git a/tools/data-binding/grammarBuilder/src/main/java-gen/com/android/databinding/BindingExpressionLexer.java b/tools/data-binding/grammarBuilder/src/main/java-gen/com/android/databinding/BindingExpressionLexer.java
index 43f55c9..830a935 100644
--- a/tools/data-binding/grammarBuilder/src/main/java-gen/com/android/databinding/BindingExpressionLexer.java
+++ b/tools/data-binding/grammarBuilder/src/main/java-gen/com/android/databinding/BindingExpressionLexer.java
@@ -159,7 +159,7 @@ public class BindingExpressionLexer extends Lexer {
 		"\3I\3I\3J\5J\u020c\nJ\3J\3J\3K\3K\3L\3L\3M\3M\3M\5M\u0217\nM\3N\3N\5N"+
 		"\u021b\nN\3N\3N\3N\5N\u0220\nN\3N\3N\5N\u0224\nN\3O\3O\3O\3P\3P\3Q\3Q"+
 		"\3Q\3Q\3Q\3Q\3Q\3Q\3Q\5Q\u0234\nQ\3R\3R\3R\3R\3R\3R\3R\3R\5R\u023e\nR"+
-		"\3S\3S\3T\3T\3T\6T\u0245\nT\rT\16T\u0246\3T\3T\3U\3U\5U\u024d\nU\3U\3"+
+		"\3S\3S\3T\3T\7T\u0244\nT\fT\16T\u0247\13T\3T\3T\3U\3U\5U\u024d\nU\3U\3"+
 		"U\3V\6V\u0252\nV\rV\16V\u0253\3W\3W\5W\u0258\nW\3X\3X\5X\u025c\nX\3Y\3"+
 		"Y\3Y\3Y\5Y\u0262\nY\3Z\3Z\3Z\3Z\3Z\3Z\3Z\3Z\3Z\3Z\3Z\5Z\u026f\nZ\3[\3"+
 		"[\3[\3[\3[\3[\3[\3\\\3\\\3]\3]\3]\3]\3]\3^\3^\7^\u0281\n^\f^\16^\u0284"+
@@ -185,68 +185,68 @@ public class BindingExpressionLexer extends Lexer {
 		"\2\61\u00a3\2\62\u00a5\2\2\u00a7\2\63\u00a9\2\64\u00ab\2\2\u00ad\2\2\u00af"+
 		"\2\2\u00b1\2\2\u00b3\2\2\u00b5\2\2\u00b7\2\2\u00b9\2\65\u00bb\2\66\u00bd"+
 		"\2\2\u00bf\2\2\u00c1\2\67\u00c3\28\u00c5\2\2\u00c7\2\2\u00c9\29\u00cb"+
-		"\2\2\u00cd\2\2\3\2\33\4\2NNnn\3\2\63;\4\2ZZzz\5\2\62;CHch\3\2\629\4\2"+
-		"DDdd\3\2\62\63\4\2GGgg\4\2--//\6\2FFHHffhh\4\2RRrr\3\2))\4\2))^^\4\2$"+
-		"$^^\4\2^^bb\13\2$$))^^bbddhhppttvv\3\2\62\65\6\2&&C\\aac|\4\2\2\u0101"+
-		"\ud802\udc01\3\2\ud802\udc01\3\2\udc02\ue001\7\2&&\62;C\\aac|\5\2\13\f"+
-		"\16\17\"\"\5\2&&aac|\6\2&&\62;aac|\u0399\2\3\3\2\2\2\2\5\3\2\2\2\2\7\3"+
-		"\2\2\2\2\t\3\2\2\2\2\13\3\2\2\2\2\r\3\2\2\2\2\17\3\2\2\2\2\21\3\2\2\2"+
-		"\2\23\3\2\2\2\2\25\3\2\2\2\2\27\3\2\2\2\2\31\3\2\2\2\2\33\3\2\2\2\2\35"+
-		"\3\2\2\2\2\37\3\2\2\2\2!\3\2\2\2\2#\3\2\2\2\2%\3\2\2\2\2\'\3\2\2\2\2)"+
-		"\3\2\2\2\2+\3\2\2\2\2-\3\2\2\2\2/\3\2\2\2\2\61\3\2\2\2\2\63\3\2\2\2\2"+
-		"\65\3\2\2\2\2\67\3\2\2\2\29\3\2\2\2\2;\3\2\2\2\2=\3\2\2\2\2?\3\2\2\2\2"+
-		"A\3\2\2\2\2C\3\2\2\2\2E\3\2\2\2\2G\3\2\2\2\2I\3\2\2\2\2K\3\2\2\2\2M\3"+
-		"\2\2\2\2O\3\2\2\2\2Q\3\2\2\2\2S\3\2\2\2\2U\3\2\2\2\2W\3\2\2\2\2Y\3\2\2"+
-		"\2\2[\3\2\2\2\2\u008b\3\2\2\2\2\u00a1\3\2\2\2\2\u00a3\3\2\2\2\2\u00a7"+
-		"\3\2\2\2\2\u00a9\3\2\2\2\2\u00b9\3\2\2\2\2\u00bb\3\2\2\2\2\u00c1\3\2\2"+
-		"\2\2\u00c3\3\2\2\2\2\u00c9\3\2\2\2\3\u00cf\3\2\2\2\5\u00d4\3\2\2\2\7\u00d8"+
-		"\3\2\2\2\t\u00da\3\2\2\2\13\u00e0\3\2\2\2\r\u00e2\3\2\2\2\17\u00ea\3\2"+
-		"\2\2\21\u00ec\3\2\2\2\23\u00ee\3\2\2\2\25\u00f0\3\2\2\2\27\u00f2\3\2\2"+
-		"\2\31\u00f4\3\2\2\2\33\u00f6\3\2\2\2\35\u00f8\3\2\2\2\37\u00fc\3\2\2\2"+
-		"!\u00ff\3\2\2\2#\u0102\3\2\2\2%\u0104\3\2\2\2\'\u0107\3\2\2\2)\u010c\3"+
-		"\2\2\2+\u0113\3\2\2\2-\u011b\3\2\2\2/\u0121\3\2\2\2\61\u0124\3\2\2\2\63"+
-		"\u0129\3\2\2\2\65\u012b\3\2\2\2\67\u012d\3\2\2\29\u0132\3\2\2\2;\u0134"+
-		"\3\2\2\2=\u0136\3\2\2\2?\u0138\3\2\2\2A\u013a\3\2\2\2C\u013d\3\2\2\2E"+
-		"\u0140\3\2\2\2G\u0142\3\2\2\2I\u0145\3\2\2\2K\u0148\3\2\2\2M\u014a\3\2"+
-		"\2\2O\u014c\3\2\2\2Q\u014f\3\2\2\2S\u0155\3\2\2\2U\u0157\3\2\2\2W\u0162"+
-		"\3\2\2\2Y\u0164\3\2\2\2[\u016d\3\2\2\2]\u016f\3\2\2\2_\u0173\3\2\2\2a"+
-		"\u0177\3\2\2\2c\u017b\3\2\2\2e\u017f\3\2\2\2g\u018b\3\2\2\2i\u018d\3\2"+
-		"\2\2k\u0199\3\2\2\2m\u019b\3\2\2\2o\u019f\3\2\2\2q\u01a2\3\2\2\2s\u01a6"+
-		"\3\2\2\2u\u01aa\3\2\2\2w\u01b4\3\2\2\2y\u01b8\3\2\2\2{\u01ba\3\2\2\2}"+
-		"\u01c0\3\2\2\2\177\u01ca\3\2\2\2\u0081\u01ce\3\2\2\2\u0083\u01d0\3\2\2"+
-		"\2\u0085\u01d4\3\2\2\2\u0087\u01de\3\2\2\2\u0089\u01e2\3\2\2\2\u008b\u01e6"+
-		"\3\2\2\2\u008d\u0203\3\2\2\2\u008f\u0205\3\2\2\2\u0091\u0208\3\2\2\2\u0093"+
-		"\u020b\3\2\2\2\u0095\u020f\3\2\2\2\u0097\u0211\3\2\2\2\u0099\u0213\3\2"+
-		"\2\2\u009b\u0223\3\2\2\2\u009d\u0225\3\2\2\2\u009f\u0228\3\2\2\2\u00a1"+
-		"\u0233\3\2\2\2\u00a3\u023d\3\2\2\2\u00a5\u023f\3\2\2\2\u00a7\u0241\3\2"+
-		"\2\2\u00a9\u024a\3\2\2\2\u00ab\u0251\3\2\2\2\u00ad\u0257\3\2\2\2\u00af"+
-		"\u025b\3\2\2\2\u00b1\u0261\3\2\2\2\u00b3\u026e\3\2\2\2\u00b5\u0270\3\2"+
-		"\2\2\u00b7\u0277\3\2\2\2\u00b9\u0279\3\2\2\2\u00bb\u027e\3\2\2\2\u00bd"+
-		"\u028b\3\2\2\2\u00bf\u0293\3\2\2\2\u00c1\u0296\3\2\2\2\u00c3\u029c\3\2"+
-		"\2\2\u00c5\u02ae\3\2\2\2\u00c7\u035c\3\2\2\2\u00c9\u035e\3\2\2\2\u00cb"+
-		"\u036b\3\2\2\2\u00cd\u0373\3\2\2\2\u00cf\u00d0\7n\2\2\u00d0\u00d1\7q\2"+
-		"\2\u00d1\u00d2\7p\2\2\u00d2\u00d3\7i\2\2\u00d3\4\3\2\2\2\u00d4\u00d5\7"+
-		"@\2\2\u00d5\u00d6\7@\2\2\u00d6\u00d7\7@\2\2\u00d7\6\3\2\2\2\u00d8\u00d9"+
-		"\7_\2\2\u00d9\b\3\2\2\2\u00da\u00db\7u\2\2\u00db\u00dc\7j\2\2\u00dc\u00dd"+
-		"\7q\2\2\u00dd\u00de\7t\2\2\u00de\u00df\7v\2\2\u00df\n\3\2\2\2\u00e0\u00e1"+
-		"\7(\2\2\u00e1\f\3\2\2\2\u00e2\u00e3\7f\2\2\u00e3\u00e4\7g\2\2\u00e4\u00e5"+
-		"\7h\2\2\u00e5\u00e6\7c\2\2\u00e6\u00e7\7w\2\2\u00e7\u00e8\7n\2\2\u00e8"+
-		"\u00e9\7v\2\2\u00e9\16\3\2\2\2\u00ea\u00eb\7.\2\2\u00eb\20\3\2\2\2\u00ec"+
-		"\u00ed\7,\2\2\u00ed\22\3\2\2\2\u00ee\u00ef\7]\2\2\u00ef\24\3\2\2\2\u00f0"+
-		"\u00f1\7/\2\2\u00f1\26\3\2\2\2\u00f2\u00f3\7*\2\2\u00f3\30\3\2\2\2\u00f4"+
-		"\u00f5\7<\2\2\u00f5\32\3\2\2\2\u00f6\u00f7\7>\2\2\u00f7\34\3\2\2\2\u00f8"+
-		"\u00f9\7k\2\2\u00f9\u00fa\7p\2\2\u00fa\u00fb\7v\2\2\u00fb\36\3\2\2\2\u00fc"+
-		"\u00fd\7#\2\2\u00fd\u00fe\7?\2\2\u00fe \3\2\2\2\u00ff\u0100\7>\2\2\u0100"+
-		"\u0101\7?\2\2\u0101\"\3\2\2\2\u0102\u0103\7A\2\2\u0103$\3\2\2\2\u0104"+
-		"\u0105\7>\2\2\u0105\u0106\7>\2\2\u0106&\3\2\2\2\u0107\u0108\7x\2\2\u0108"+
-		"\u0109\7q\2\2\u0109\u010a\7k\2\2\u010a\u010b\7f\2\2\u010b(\3\2\2\2\u010c"+
-		"\u010d\7f\2\2\u010d\u010e\7q\2\2\u010e\u010f\7w\2\2\u010f\u0110\7d\2\2"+
-		"\u0110\u0111\7n\2\2\u0111\u0112\7g\2\2\u0112*\3\2\2\2\u0113\u0114\7d\2"+
-		"\2\u0114\u0115\7q\2\2\u0115\u0116\7q\2\2\u0116\u0117\7n\2\2\u0117\u0118"+
-		"\7g\2\2\u0118\u0119\7c\2\2\u0119\u011a\7p\2\2\u011a,\3\2\2\2\u011b\u011c"+
-		"\7h\2\2\u011c\u011d\7n\2\2\u011d\u011e\7q\2\2\u011e\u011f\7c\2\2\u011f"+
-		"\u0120\7v\2\2\u0120.\3\2\2\2\u0121\u0122\7@\2\2\u0122\u0123\7@\2\2\u0123"+
-		"\60\3\2\2\2\u0124\u0125\7e\2\2\u0125\u0126\7j\2\2\u0126\u0127\7c\2\2\u0127"+
+		"\2\2\u00cd\2\2\3\2\32\4\2NNnn\3\2\63;\4\2ZZzz\5\2\62;CHch\3\2\629\4\2"+
+		"DDdd\3\2\62\63\4\2GGgg\4\2--//\6\2FFHHffhh\4\2RRrr\4\2))^^\4\2$$^^\4\2"+
+		"^^bb\13\2$$))^^bbddhhppttvv\3\2\62\65\6\2&&C\\aac|\4\2\2\u0101\ud802\udc01"+
+		"\3\2\ud802\udc01\3\2\udc02\ue001\7\2&&\62;C\\aac|\5\2\13\f\16\17\"\"\5"+
+		"\2&&aac|\6\2&&\62;aac|\u0399\2\3\3\2\2\2\2\5\3\2\2\2\2\7\3\2\2\2\2\t\3"+
+		"\2\2\2\2\13\3\2\2\2\2\r\3\2\2\2\2\17\3\2\2\2\2\21\3\2\2\2\2\23\3\2\2\2"+
+		"\2\25\3\2\2\2\2\27\3\2\2\2\2\31\3\2\2\2\2\33\3\2\2\2\2\35\3\2\2\2\2\37"+
+		"\3\2\2\2\2!\3\2\2\2\2#\3\2\2\2\2%\3\2\2\2\2\'\3\2\2\2\2)\3\2\2\2\2+\3"+
+		"\2\2\2\2-\3\2\2\2\2/\3\2\2\2\2\61\3\2\2\2\2\63\3\2\2\2\2\65\3\2\2\2\2"+
+		"\67\3\2\2\2\29\3\2\2\2\2;\3\2\2\2\2=\3\2\2\2\2?\3\2\2\2\2A\3\2\2\2\2C"+
+		"\3\2\2\2\2E\3\2\2\2\2G\3\2\2\2\2I\3\2\2\2\2K\3\2\2\2\2M\3\2\2\2\2O\3\2"+
+		"\2\2\2Q\3\2\2\2\2S\3\2\2\2\2U\3\2\2\2\2W\3\2\2\2\2Y\3\2\2\2\2[\3\2\2\2"+
+		"\2\u008b\3\2\2\2\2\u00a1\3\2\2\2\2\u00a3\3\2\2\2\2\u00a7\3\2\2\2\2\u00a9"+
+		"\3\2\2\2\2\u00b9\3\2\2\2\2\u00bb\3\2\2\2\2\u00c1\3\2\2\2\2\u00c3\3\2\2"+
+		"\2\2\u00c9\3\2\2\2\3\u00cf\3\2\2\2\5\u00d4\3\2\2\2\7\u00d8\3\2\2\2\t\u00da"+
+		"\3\2\2\2\13\u00e0\3\2\2\2\r\u00e2\3\2\2\2\17\u00ea\3\2\2\2\21\u00ec\3"+
+		"\2\2\2\23\u00ee\3\2\2\2\25\u00f0\3\2\2\2\27\u00f2\3\2\2\2\31\u00f4\3\2"+
+		"\2\2\33\u00f6\3\2\2\2\35\u00f8\3\2\2\2\37\u00fc\3\2\2\2!\u00ff\3\2\2\2"+
+		"#\u0102\3\2\2\2%\u0104\3\2\2\2\'\u0107\3\2\2\2)\u010c\3\2\2\2+\u0113\3"+
+		"\2\2\2-\u011b\3\2\2\2/\u0121\3\2\2\2\61\u0124\3\2\2\2\63\u0129\3\2\2\2"+
+		"\65\u012b\3\2\2\2\67\u012d\3\2\2\29\u0132\3\2\2\2;\u0134\3\2\2\2=\u0136"+
+		"\3\2\2\2?\u0138\3\2\2\2A\u013a\3\2\2\2C\u013d\3\2\2\2E\u0140\3\2\2\2G"+
+		"\u0142\3\2\2\2I\u0145\3\2\2\2K\u0148\3\2\2\2M\u014a\3\2\2\2O\u014c\3\2"+
+		"\2\2Q\u014f\3\2\2\2S\u0155\3\2\2\2U\u0157\3\2\2\2W\u0162\3\2\2\2Y\u0164"+
+		"\3\2\2\2[\u016d\3\2\2\2]\u016f\3\2\2\2_\u0173\3\2\2\2a\u0177\3\2\2\2c"+
+		"\u017b\3\2\2\2e\u017f\3\2\2\2g\u018b\3\2\2\2i\u018d\3\2\2\2k\u0199\3\2"+
+		"\2\2m\u019b\3\2\2\2o\u019f\3\2\2\2q\u01a2\3\2\2\2s\u01a6\3\2\2\2u\u01aa"+
+		"\3\2\2\2w\u01b4\3\2\2\2y\u01b8\3\2\2\2{\u01ba\3\2\2\2}\u01c0\3\2\2\2\177"+
+		"\u01ca\3\2\2\2\u0081\u01ce\3\2\2\2\u0083\u01d0\3\2\2\2\u0085\u01d4\3\2"+
+		"\2\2\u0087\u01de\3\2\2\2\u0089\u01e2\3\2\2\2\u008b\u01e6\3\2\2\2\u008d"+
+		"\u0203\3\2\2\2\u008f\u0205\3\2\2\2\u0091\u0208\3\2\2\2\u0093\u020b\3\2"+
+		"\2\2\u0095\u020f\3\2\2\2\u0097\u0211\3\2\2\2\u0099\u0213\3\2\2\2\u009b"+
+		"\u0223\3\2\2\2\u009d\u0225\3\2\2\2\u009f\u0228\3\2\2\2\u00a1\u0233\3\2"+
+		"\2\2\u00a3\u023d\3\2\2\2\u00a5\u023f\3\2\2\2\u00a7\u0241\3\2\2\2\u00a9"+
+		"\u024a\3\2\2\2\u00ab\u0251\3\2\2\2\u00ad\u0257\3\2\2\2\u00af\u025b\3\2"+
+		"\2\2\u00b1\u0261\3\2\2\2\u00b3\u026e\3\2\2\2\u00b5\u0270\3\2\2\2\u00b7"+
+		"\u0277\3\2\2\2\u00b9\u0279\3\2\2\2\u00bb\u027e\3\2\2\2\u00bd\u028b\3\2"+
+		"\2\2\u00bf\u0293\3\2\2\2\u00c1\u0296\3\2\2\2\u00c3\u029c\3\2\2\2\u00c5"+
+		"\u02ae\3\2\2\2\u00c7\u035c\3\2\2\2\u00c9\u035e\3\2\2\2\u00cb\u036b\3\2"+
+		"\2\2\u00cd\u0373\3\2\2\2\u00cf\u00d0\7n\2\2\u00d0\u00d1\7q\2\2\u00d1\u00d2"+
+		"\7p\2\2\u00d2\u00d3\7i\2\2\u00d3\4\3\2\2\2\u00d4\u00d5\7@\2\2\u00d5\u00d6"+
+		"\7@\2\2\u00d6\u00d7\7@\2\2\u00d7\6\3\2\2\2\u00d8\u00d9\7_\2\2\u00d9\b"+
+		"\3\2\2\2\u00da\u00db\7u\2\2\u00db\u00dc\7j\2\2\u00dc\u00dd\7q\2\2\u00dd"+
+		"\u00de\7t\2\2\u00de\u00df\7v\2\2\u00df\n\3\2\2\2\u00e0\u00e1\7(\2\2\u00e1"+
+		"\f\3\2\2\2\u00e2\u00e3\7f\2\2\u00e3\u00e4\7g\2\2\u00e4\u00e5\7h\2\2\u00e5"+
+		"\u00e6\7c\2\2\u00e6\u00e7\7w\2\2\u00e7\u00e8\7n\2\2\u00e8\u00e9\7v\2\2"+
+		"\u00e9\16\3\2\2\2\u00ea\u00eb\7.\2\2\u00eb\20\3\2\2\2\u00ec\u00ed\7,\2"+
+		"\2\u00ed\22\3\2\2\2\u00ee\u00ef\7]\2\2\u00ef\24\3\2\2\2\u00f0\u00f1\7"+
+		"/\2\2\u00f1\26\3\2\2\2\u00f2\u00f3\7*\2\2\u00f3\30\3\2\2\2\u00f4\u00f5"+
+		"\7<\2\2\u00f5\32\3\2\2\2\u00f6\u00f7\7>\2\2\u00f7\34\3\2\2\2\u00f8\u00f9"+
+		"\7k\2\2\u00f9\u00fa\7p\2\2\u00fa\u00fb\7v\2\2\u00fb\36\3\2\2\2\u00fc\u00fd"+
+		"\7#\2\2\u00fd\u00fe\7?\2\2\u00fe \3\2\2\2\u00ff\u0100\7>\2\2\u0100\u0101"+
+		"\7?\2\2\u0101\"\3\2\2\2\u0102\u0103\7A\2\2\u0103$\3\2\2\2\u0104\u0105"+
+		"\7>\2\2\u0105\u0106\7>\2\2\u0106&\3\2\2\2\u0107\u0108\7x\2\2\u0108\u0109"+
+		"\7q\2\2\u0109\u010a\7k\2\2\u010a\u010b\7f\2\2\u010b(\3\2\2\2\u010c\u010d"+
+		"\7f\2\2\u010d\u010e\7q\2\2\u010e\u010f\7w\2\2\u010f\u0110\7d\2\2\u0110"+
+		"\u0111\7n\2\2\u0111\u0112\7g\2\2\u0112*\3\2\2\2\u0113\u0114\7d\2\2\u0114"+
+		"\u0115\7q\2\2\u0115\u0116\7q\2\2\u0116\u0117\7n\2\2\u0117\u0118\7g\2\2"+
+		"\u0118\u0119\7c\2\2\u0119\u011a\7p\2\2\u011a,\3\2\2\2\u011b\u011c\7h\2"+
+		"\2\u011c\u011d\7n\2\2\u011d\u011e\7q\2\2\u011e\u011f\7c\2\2\u011f\u0120"+
+		"\7v\2\2\u0120.\3\2\2\2\u0121\u0122\7@\2\2\u0122\u0123\7@\2\2\u0123\60"+
+		"\3\2\2\2\u0124\u0125\7e\2\2\u0125\u0126\7j\2\2\u0126\u0127\7c\2\2\u0127"+
 		"\u0128\7t\2\2\u0128\62\3\2\2\2\u0129\u012a\7\'\2\2\u012a\64\3\2\2\2\u012b"+
 		"\u012c\7`\2\2\u012c\66\3\2\2\2\u012d\u012e\7d\2\2\u012e\u012f\7{\2\2\u012f"+
 		"\u0130\7v\2\2\u0130\u0131\7g\2\2\u01318\3\2\2\2\u0132\u0133\7+\2\2\u0133"+
@@ -332,113 +332,113 @@ public class BindingExpressionLexer extends Lexer {
 		"\7v\2\2\u022b\u022c\7t\2\2\u022c\u022d\7w\2\2\u022d\u0234\7g\2\2\u022e"+
 		"\u022f\7h\2\2\u022f\u0230\7c\2\2\u0230\u0231\7n\2\2\u0231\u0232\7u\2\2"+
 		"\u0232\u0234\7g\2\2\u0233\u022a\3\2\2\2\u0233\u022e\3\2\2\2\u0234\u00a2"+
-		"\3\2\2\2\u0235\u0236\t\r\2\2\u0236\u0237\5\u00a5S\2\u0237\u0238\t\r\2"+
-		"\2\u0238\u023e\3\2\2\2\u0239\u023a\t\r\2\2\u023a\u023b\5\u00b1Y\2\u023b"+
-		"\u023c\t\r\2\2\u023c\u023e\3\2\2\2\u023d\u0235\3\2\2\2\u023d\u0239\3\2"+
-		"\2\2\u023e\u00a4\3\2\2\2\u023f\u0240\n\16\2\2\u0240\u00a6\3\2\2\2\u0241"+
-		"\u0242\7b\2\2\u0242\u0244\5\u00afX\2\u0243\u0245\5\u00afX\2\u0244\u0243"+
-		"\3\2\2\2\u0245\u0246\3\2\2\2\u0246\u0244\3\2\2\2\u0246\u0247\3\2\2\2\u0247"+
-		"\u0248\3\2\2\2\u0248\u0249\7b\2\2\u0249\u00a8\3\2\2\2\u024a\u024c\7$\2"+
-		"\2\u024b\u024d\5\u00abV\2\u024c\u024b\3\2\2\2\u024c\u024d\3\2\2\2\u024d"+
-		"\u024e\3\2\2\2\u024e\u024f\7$\2\2\u024f\u00aa\3\2\2\2\u0250\u0252\5\u00ad"+
-		"W\2\u0251\u0250\3\2\2\2\u0252\u0253\3\2\2\2\u0253\u0251\3\2\2\2\u0253"+
-		"\u0254\3\2\2\2\u0254\u00ac\3\2\2\2\u0255\u0258\n\17\2\2\u0256\u0258\5"+
-		"\u00b1Y\2\u0257\u0255\3\2\2\2\u0257\u0256\3\2\2\2\u0258\u00ae\3\2\2\2"+
-		"\u0259\u025c\n\20\2\2\u025a\u025c\5\u00b1Y\2\u025b\u0259\3\2\2\2\u025b"+
-		"\u025a\3\2\2\2\u025c\u00b0\3\2\2\2\u025d\u025e\7^\2\2\u025e\u0262\t\21"+
-		"\2\2\u025f\u0262\5\u00b3Z\2\u0260\u0262\5\u00b5[\2\u0261\u025d\3\2\2\2"+
-		"\u0261\u025f\3\2\2\2\u0261\u0260\3\2\2\2\u0262\u00b2\3\2\2\2\u0263\u0264"+
-		"\7^\2\2\u0264\u026f\5\177@\2\u0265\u0266\7^\2\2\u0266\u0267\5\177@\2\u0267"+
-		"\u0268\5\177@\2\u0268\u026f\3\2\2\2\u0269\u026a\7^\2\2\u026a\u026b\5\u00b7"+
-		"\\\2\u026b\u026c\5\177@\2\u026c\u026d\5\177@\2\u026d\u026f\3\2\2\2\u026e"+
-		"\u0263\3\2\2\2\u026e\u0265\3\2\2\2\u026e\u0269\3\2\2\2\u026f\u00b4\3\2"+
-		"\2\2\u0270\u0271\7^\2\2\u0271\u0272\7w\2\2\u0272\u0273\5w<\2\u0273\u0274"+
-		"\5w<\2\u0274\u0275\5w<\2\u0275\u0276\5w<\2\u0276\u00b6\3\2\2\2\u0277\u0278"+
-		"\t\22\2\2\u0278\u00b8\3\2\2\2\u0279\u027a\7p\2\2\u027a\u027b\7w\2\2\u027b"+
-		"\u027c\7n\2\2\u027c\u027d\7n\2\2\u027d\u00ba\3\2\2\2\u027e\u0282\5\u00bd"+
-		"_\2\u027f\u0281\5\u00bf`\2\u0280\u027f\3\2\2\2\u0281\u0284\3\2\2\2\u0282"+
-		"\u0280\3\2\2\2\u0282\u0283\3\2\2\2\u0283\u00bc\3\2\2\2\u0284\u0282\3\2"+
-		"\2\2\u0285\u028c\t\23\2\2\u0286\u0287\n\24\2\2\u0287\u028c\6_\2\2\u0288"+
-		"\u0289\t\25\2\2\u0289\u028a\t\26\2\2\u028a\u028c\6_\3\2\u028b\u0285\3"+
-		"\2\2\2\u028b\u0286\3\2\2\2\u028b\u0288\3\2\2\2\u028c\u00be\3\2\2\2\u028d"+
-		"\u0294\t\27\2\2\u028e\u028f\n\24\2\2\u028f\u0294\6`\4\2\u0290\u0291\t"+
-		"\25\2\2\u0291\u0292\t\26\2\2\u0292\u0294\6`\5\2\u0293\u028d\3\2\2\2\u0293"+
-		"\u028e\3\2\2\2\u0293\u0290\3\2\2\2\u0294\u00c0\3\2\2\2\u0295\u0297\t\30"+
-		"\2\2\u0296\u0295\3\2\2\2\u0297\u0298\3\2\2\2\u0298\u0296\3\2\2\2\u0298"+
-		"\u0299\3\2\2\2\u0299\u029a\3\2\2\2\u029a\u029b\ba\2\2\u029b\u00c2\3\2"+
-		"\2\2\u029c\u02a0\7B\2\2\u029d\u029e\5\u00c5c\2\u029e\u029f\7<\2\2\u029f"+
-		"\u02a1\3\2\2\2\u02a0\u029d\3\2\2\2\u02a0\u02a1\3\2\2\2\u02a1\u02a2\3\2"+
-		"\2\2\u02a2\u02a3\5\u00c7d\2\u02a3\u02a4\7\61\2\2\u02a4\u02a5\5\u00c9e"+
-		"\2\u02a5\u00c4\3\2\2\2\u02a6\u02a7\7c\2\2\u02a7\u02a8\7p\2\2\u02a8\u02a9"+
-		"\7f\2\2\u02a9\u02aa\7t\2\2\u02aa\u02ab\7q\2\2\u02ab\u02ac\7k\2\2\u02ac"+
-		"\u02af\7f\2\2\u02ad\u02af\5\u00bb^\2\u02ae\u02a6\3\2\2\2\u02ae\u02ad\3"+
-		"\2\2\2\u02af\u00c6\3\2\2\2\u02b0\u02b1\7c\2\2\u02b1\u02b2\7p\2\2\u02b2"+
-		"\u02b3\7k\2\2\u02b3\u035d\7o\2\2\u02b4\u02b5\7c\2\2\u02b5\u02b6\7p\2\2"+
-		"\u02b6\u02b7\7k\2\2\u02b7\u02b8\7o\2\2\u02b8\u02b9\7c\2\2\u02b9\u02ba"+
-		"\7v\2\2\u02ba\u02bb\7q\2\2\u02bb\u035d\7t\2\2\u02bc\u02bd\7d\2\2\u02bd"+
-		"\u02be\7q\2\2\u02be\u02bf\7q\2\2\u02bf\u035d\7n\2\2\u02c0\u02c1\7e\2\2"+
-		"\u02c1\u02c2\7q\2\2\u02c2\u02c3\7n\2\2\u02c3\u02c4\7q\2\2\u02c4\u035d"+
-		"\7t\2\2\u02c5\u02c6\7e\2\2\u02c6\u02c7\7q\2\2\u02c7\u02c8\7n\2\2\u02c8"+
-		"\u02c9\7q\2\2\u02c9\u02ca\7t\2\2\u02ca\u02cb\7U\2\2\u02cb\u02cc\7v\2\2"+
-		"\u02cc\u02cd\7c\2\2\u02cd\u02ce\7v\2\2\u02ce\u02cf\7g\2\2\u02cf\u02d0"+
-		"\7N\2\2\u02d0\u02d1\7k\2\2\u02d1\u02d2\7u\2\2\u02d2\u035d\7v\2\2\u02d3"+
-		"\u02d4\7f\2\2\u02d4\u02d5\7k\2\2\u02d5\u02d6\7o\2\2\u02d6\u02d7\7g\2\2"+
-		"\u02d7\u035d\7p\2\2\u02d8\u02d9\7f\2\2\u02d9\u02da\7k\2\2\u02da\u02db"+
-		"\7o\2\2\u02db\u02dc\7g\2\2\u02dc\u02dd\7p\2\2\u02dd\u02de\7Q\2\2\u02de"+
-		"\u02df\7h\2\2\u02df\u02e0\7h\2\2\u02e0\u02e1\7u\2\2\u02e1\u02e2\7g\2\2"+
-		"\u02e2\u035d\7v\2\2\u02e3\u02e4\7f\2\2\u02e4\u02e5\7k\2\2\u02e5\u02e6"+
-		"\7o\2\2\u02e6\u02e7\7g\2\2\u02e7\u02e8\7p\2\2\u02e8\u02e9\7U\2\2\u02e9"+
-		"\u02ea\7k\2\2\u02ea\u02eb\7|\2\2\u02eb\u035d\7g\2\2\u02ec\u02ed\7f\2\2"+
-		"\u02ed\u02ee\7t\2\2\u02ee\u02ef\7c\2\2\u02ef\u02f0\7y\2\2\u02f0\u02f1"+
-		"\7c\2\2\u02f1\u02f2\7d\2\2\u02f2\u02f3\7n\2\2\u02f3\u035d\7g\2\2\u02f4"+
-		"\u02f5\7h\2\2\u02f5\u02f6\7t\2\2\u02f6\u02f7\7c\2\2\u02f7\u02f8\7e\2\2"+
-		"\u02f8\u02f9\7v\2\2\u02f9\u02fa\7k\2\2\u02fa\u02fb\7q\2\2\u02fb\u035d"+
-		"\7p\2\2\u02fc\u02fd\7k\2\2\u02fd\u035d\7f\2\2\u02fe\u02ff\7k\2\2\u02ff"+
-		"\u0300\7p\2\2\u0300\u0301\7v\2\2\u0301\u0302\7g\2\2\u0302\u0303\7i\2\2"+
-		"\u0303\u0304\7g\2\2\u0304\u035d\7t\2\2\u0305\u0306\7k\2\2\u0306\u0307"+
-		"\7p\2\2\u0307\u0308\7v\2\2\u0308\u0309\7C\2\2\u0309\u030a\7t\2\2\u030a"+
-		"\u030b\7t\2\2\u030b\u030c\7c\2\2\u030c\u035d\7{\2\2\u030d\u030e\7k\2\2"+
-		"\u030e\u030f\7p\2\2\u030f\u0310\7v\2\2\u0310\u0311\7g\2\2\u0311\u0312"+
-		"\7t\2\2\u0312\u0313\7r\2\2\u0313\u0314\7q\2\2\u0314\u0315\7n\2\2\u0315"+
-		"\u0316\7c\2\2\u0316\u0317\7v\2\2\u0317\u0318\7q\2\2\u0318\u035d\7t\2\2"+
-		"\u0319\u031a\7n\2\2\u031a\u031b\7c\2\2\u031b\u031c\7{\2\2\u031c\u031d"+
-		"\7q\2\2\u031d\u031e\7w\2\2\u031e\u035d\7v\2\2\u031f\u0320\7r\2\2\u0320"+
-		"\u0321\7n\2\2\u0321\u0322\7w\2\2\u0322\u0323\7t\2\2\u0323\u0324\7c\2\2"+
-		"\u0324\u0325\7n\2\2\u0325\u035d\7u\2\2\u0326\u0327\7u\2\2\u0327\u0328"+
-		"\7v\2\2\u0328\u0329\7c\2\2\u0329\u032a\7v\2\2\u032a\u032b\7g\2\2\u032b"+
-		"\u032c\7N\2\2\u032c\u032d\7k\2\2\u032d\u032e\7u\2\2\u032e\u032f\7v\2\2"+
-		"\u032f\u0330\7C\2\2\u0330\u0331\7p\2\2\u0331\u0332\7k\2\2\u0332\u0333"+
-		"\7o\2\2\u0333\u0334\7c\2\2\u0334\u0335\7v\2\2\u0335\u0336\7q\2\2\u0336"+
-		"\u035d\7t\2\2\u0337\u0338\7u\2\2\u0338\u0339\7v\2\2\u0339\u033a\7t\2\2"+
-		"\u033a\u033b\7k\2\2\u033b\u033c\7p\2\2\u033c\u035d\7i\2\2\u033d\u033e"+
-		"\7u\2\2\u033e\u033f\7v\2\2\u033f\u0340\7t\2\2\u0340\u0341\7k\2\2\u0341"+
-		"\u0342\7p\2\2\u0342\u0343\7i\2\2\u0343\u0344\7C\2\2\u0344\u0345\7t\2\2"+
-		"\u0345\u0346\7t\2\2\u0346\u0347\7c\2\2\u0347\u035d\7{\2\2\u0348\u0349"+
-		"\7v\2\2\u0349\u034a\7t\2\2\u034a\u034b\7c\2\2\u034b\u034c\7p\2\2\u034c"+
-		"\u034d\7u\2\2\u034d\u034e\7k\2\2\u034e\u034f\7v\2\2\u034f\u0350\7k\2\2"+
-		"\u0350\u0351\7q\2\2\u0351\u035d\7p\2\2\u0352\u0353\7v\2\2\u0353\u0354"+
-		"\7{\2\2\u0354\u0355\7r\2\2\u0355\u0356\7g\2\2\u0356\u0357\7f\2\2\u0357"+
-		"\u0358\7C\2\2\u0358\u0359\7t\2\2\u0359\u035a\7t\2\2\u035a\u035b\7c\2\2"+
-		"\u035b\u035d\7{\2\2\u035c\u02b0\3\2\2\2\u035c\u02b4\3\2\2\2\u035c\u02bc"+
-		"\3\2\2\2\u035c\u02c0\3\2\2\2\u035c\u02c5\3\2\2\2\u035c\u02d3\3\2\2\2\u035c"+
-		"\u02d8\3\2\2\2\u035c\u02e3\3\2\2\2\u035c\u02ec\3\2\2\2\u035c\u02f4\3\2"+
-		"\2\2\u035c\u02fc\3\2\2\2\u035c\u02fe\3\2\2\2\u035c\u0305\3\2\2\2\u035c"+
-		"\u030d\3\2\2\2\u035c\u0319\3\2\2\2\u035c\u031f\3\2\2\2\u035c\u0326\3\2"+
-		"\2\2\u035c\u0337\3\2\2\2\u035c\u033d\3\2\2\2\u035c\u0348\3\2\2\2\u035c"+
-		"\u0352\3\2\2\2\u035d\u00c8\3\2\2\2\u035e\u0362\5\u00cbf\2\u035f\u0361"+
-		"\5\u00cdg\2\u0360\u035f\3\2\2\2\u0361\u0364\3\2\2\2\u0362\u0360\3\2\2"+
-		"\2\u0362\u0363\3\2\2\2\u0363\u00ca\3\2\2\2\u0364\u0362\3\2\2\2\u0365\u036c"+
-		"\t\31\2\2\u0366\u0367\n\24\2\2\u0367\u036c\6f\6\2\u0368\u0369\t\25\2\2"+
-		"\u0369\u036a\t\26\2\2\u036a\u036c\6f\7\2\u036b\u0365\3\2\2\2\u036b\u0366"+
-		"\3\2\2\2\u036b\u0368\3\2\2\2\u036c\u00cc\3\2\2\2\u036d\u0374\t\32\2\2"+
-		"\u036e\u036f\n\24\2\2\u036f\u0374\6g\b\2\u0370\u0371\t\25\2\2\u0371\u0372"+
-		"\t\26\2\2\u0372\u0374\6g\t\2\u0373\u036d\3\2\2\2\u0373\u036e\3\2\2\2\u0373"+
-		"\u0370\3\2\2\2\u0374\u00ce\3\2\2\2:\2\u016d\u0171\u0175\u0179\u017d\u0184"+
-		"\u0189\u018b\u0191\u0195\u0199\u019f\u01a4\u01ae\u01b2\u01b8\u01bc\u01c4"+
-		"\u01c8\u01ce\u01d8\u01dc\u01e2\u01e6\u01eb\u01ee\u01f1\u01f6\u01f9\u01fe"+
-		"\u0203\u020b\u0216\u021a\u021f\u0223\u0233\u023d\u0246\u024c\u0253\u0257"+
-		"\u025b\u0261\u026e\u0282\u028b\u0293\u0298\u02a0\u02ae\u035c\u0362\u036b"+
-		"\u0373\3\b\2\2";
+		"\3\2\2\2\u0235\u0236\7)\2\2\u0236\u0237\5\u00a5S\2\u0237\u0238\7)\2\2"+
+		"\u0238\u023e\3\2\2\2\u0239\u023a\7)\2\2\u023a\u023b\5\u00b1Y\2\u023b\u023c"+
+		"\7)\2\2\u023c\u023e\3\2\2\2\u023d\u0235\3\2\2\2\u023d\u0239\3\2\2\2\u023e"+
+		"\u00a4\3\2\2\2\u023f\u0240\n\r\2\2\u0240\u00a6\3\2\2\2\u0241\u0245\7b"+
+		"\2\2\u0242\u0244\5\u00afX\2\u0243\u0242\3\2\2\2\u0244\u0247\3\2\2\2\u0245"+
+		"\u0243\3\2\2\2\u0245\u0246\3\2\2\2\u0246\u0248\3\2\2\2\u0247\u0245\3\2"+
+		"\2\2\u0248\u0249\7b\2\2\u0249\u00a8\3\2\2\2\u024a\u024c\7$\2\2\u024b\u024d"+
+		"\5\u00abV\2\u024c\u024b\3\2\2\2\u024c\u024d\3\2\2\2\u024d\u024e\3\2\2"+
+		"\2\u024e\u024f\7$\2\2\u024f\u00aa\3\2\2\2\u0250\u0252\5\u00adW\2\u0251"+
+		"\u0250\3\2\2\2\u0252\u0253\3\2\2\2\u0253\u0251\3\2\2\2\u0253\u0254\3\2"+
+		"\2\2\u0254\u00ac\3\2\2\2\u0255\u0258\n\16\2\2\u0256\u0258\5\u00b1Y\2\u0257"+
+		"\u0255\3\2\2\2\u0257\u0256\3\2\2\2\u0258\u00ae\3\2\2\2\u0259\u025c\n\17"+
+		"\2\2\u025a\u025c\5\u00b1Y\2\u025b\u0259\3\2\2\2\u025b\u025a\3\2\2\2\u025c"+
+		"\u00b0\3\2\2\2\u025d\u025e\7^\2\2\u025e\u0262\t\20\2\2\u025f\u0262\5\u00b3"+
+		"Z\2\u0260\u0262\5\u00b5[\2\u0261\u025d\3\2\2\2\u0261\u025f\3\2\2\2\u0261"+
+		"\u0260\3\2\2\2\u0262\u00b2\3\2\2\2\u0263\u0264\7^\2\2\u0264\u026f\5\177"+
+		"@\2\u0265\u0266\7^\2\2\u0266\u0267\5\177@\2\u0267\u0268\5\177@\2\u0268"+
+		"\u026f\3\2\2\2\u0269\u026a\7^\2\2\u026a\u026b\5\u00b7\\\2\u026b\u026c"+
+		"\5\177@\2\u026c\u026d\5\177@\2\u026d\u026f\3\2\2\2\u026e\u0263\3\2\2\2"+
+		"\u026e\u0265\3\2\2\2\u026e\u0269\3\2\2\2\u026f\u00b4\3\2\2\2\u0270\u0271"+
+		"\7^\2\2\u0271\u0272\7w\2\2\u0272\u0273\5w<\2\u0273\u0274\5w<\2\u0274\u0275"+
+		"\5w<\2\u0275\u0276\5w<\2\u0276\u00b6\3\2\2\2\u0277\u0278\t\21\2\2\u0278"+
+		"\u00b8\3\2\2\2\u0279\u027a\7p\2\2\u027a\u027b\7w\2\2\u027b\u027c\7n\2"+
+		"\2\u027c\u027d\7n\2\2\u027d\u00ba\3\2\2\2\u027e\u0282\5\u00bd_\2\u027f"+
+		"\u0281\5\u00bf`\2\u0280\u027f\3\2\2\2\u0281\u0284\3\2\2\2\u0282\u0280"+
+		"\3\2\2\2\u0282\u0283\3\2\2\2\u0283\u00bc\3\2\2\2\u0284\u0282\3\2\2\2\u0285"+
+		"\u028c\t\22\2\2\u0286\u0287\n\23\2\2\u0287\u028c\6_\2\2\u0288\u0289\t"+
+		"\24\2\2\u0289\u028a\t\25\2\2\u028a\u028c\6_\3\2\u028b\u0285\3\2\2\2\u028b"+
+		"\u0286\3\2\2\2\u028b\u0288\3\2\2\2\u028c\u00be\3\2\2\2\u028d\u0294\t\26"+
+		"\2\2\u028e\u028f\n\23\2\2\u028f\u0294\6`\4\2\u0290\u0291\t\24\2\2\u0291"+
+		"\u0292\t\25\2\2\u0292\u0294\6`\5\2\u0293\u028d\3\2\2\2\u0293\u028e\3\2"+
+		"\2\2\u0293\u0290\3\2\2\2\u0294\u00c0\3\2\2\2\u0295\u0297\t\27\2\2\u0296"+
+		"\u0295\3\2\2\2\u0297\u0298\3\2\2\2\u0298\u0296\3\2\2\2\u0298\u0299\3\2"+
+		"\2\2\u0299\u029a\3\2\2\2\u029a\u029b\ba\2\2\u029b\u00c2\3\2\2\2\u029c"+
+		"\u02a0\7B\2\2\u029d\u029e\5\u00c5c\2\u029e\u029f\7<\2\2\u029f\u02a1\3"+
+		"\2\2\2\u02a0\u029d\3\2\2\2\u02a0\u02a1\3\2\2\2\u02a1\u02a2\3\2\2\2\u02a2"+
+		"\u02a3\5\u00c7d\2\u02a3\u02a4\7\61\2\2\u02a4\u02a5\5\u00c9e\2\u02a5\u00c4"+
+		"\3\2\2\2\u02a6\u02a7\7c\2\2\u02a7\u02a8\7p\2\2\u02a8\u02a9\7f\2\2\u02a9"+
+		"\u02aa\7t\2\2\u02aa\u02ab\7q\2\2\u02ab\u02ac\7k\2\2\u02ac\u02af\7f\2\2"+
+		"\u02ad\u02af\5\u00bb^\2\u02ae\u02a6\3\2\2\2\u02ae\u02ad\3\2\2\2\u02af"+
+		"\u00c6\3\2\2\2\u02b0\u02b1\7c\2\2\u02b1\u02b2\7p\2\2\u02b2\u02b3\7k\2"+
+		"\2\u02b3\u035d\7o\2\2\u02b4\u02b5\7c\2\2\u02b5\u02b6\7p\2\2\u02b6\u02b7"+
+		"\7k\2\2\u02b7\u02b8\7o\2\2\u02b8\u02b9\7c\2\2\u02b9\u02ba\7v\2\2\u02ba"+
+		"\u02bb\7q\2\2\u02bb\u035d\7t\2\2\u02bc\u02bd\7d\2\2\u02bd\u02be\7q\2\2"+
+		"\u02be\u02bf\7q\2\2\u02bf\u035d\7n\2\2\u02c0\u02c1\7e\2\2\u02c1\u02c2"+
+		"\7q\2\2\u02c2\u02c3\7n\2\2\u02c3\u02c4\7q\2\2\u02c4\u035d\7t\2\2\u02c5"+
+		"\u02c6\7e\2\2\u02c6\u02c7\7q\2\2\u02c7\u02c8\7n\2\2\u02c8\u02c9\7q\2\2"+
+		"\u02c9\u02ca\7t\2\2\u02ca\u02cb\7U\2\2\u02cb\u02cc\7v\2\2\u02cc\u02cd"+
+		"\7c\2\2\u02cd\u02ce\7v\2\2\u02ce\u02cf\7g\2\2\u02cf\u02d0\7N\2\2\u02d0"+
+		"\u02d1\7k\2\2\u02d1\u02d2\7u\2\2\u02d2\u035d\7v\2\2\u02d3\u02d4\7f\2\2"+
+		"\u02d4\u02d5\7k\2\2\u02d5\u02d6\7o\2\2\u02d6\u02d7\7g\2\2\u02d7\u035d"+
+		"\7p\2\2\u02d8\u02d9\7f\2\2\u02d9\u02da\7k\2\2\u02da\u02db\7o\2\2\u02db"+
+		"\u02dc\7g\2\2\u02dc\u02dd\7p\2\2\u02dd\u02de\7Q\2\2\u02de\u02df\7h\2\2"+
+		"\u02df\u02e0\7h\2\2\u02e0\u02e1\7u\2\2\u02e1\u02e2\7g\2\2\u02e2\u035d"+
+		"\7v\2\2\u02e3\u02e4\7f\2\2\u02e4\u02e5\7k\2\2\u02e5\u02e6\7o\2\2\u02e6"+
+		"\u02e7\7g\2\2\u02e7\u02e8\7p\2\2\u02e8\u02e9\7U\2\2\u02e9\u02ea\7k\2\2"+
+		"\u02ea\u02eb\7|\2\2\u02eb\u035d\7g\2\2\u02ec\u02ed\7f\2\2\u02ed\u02ee"+
+		"\7t\2\2\u02ee\u02ef\7c\2\2\u02ef\u02f0\7y\2\2\u02f0\u02f1\7c\2\2\u02f1"+
+		"\u02f2\7d\2\2\u02f2\u02f3\7n\2\2\u02f3\u035d\7g\2\2\u02f4\u02f5\7h\2\2"+
+		"\u02f5\u02f6\7t\2\2\u02f6\u02f7\7c\2\2\u02f7\u02f8\7e\2\2\u02f8\u02f9"+
+		"\7v\2\2\u02f9\u02fa\7k\2\2\u02fa\u02fb\7q\2\2\u02fb\u035d\7p\2\2\u02fc"+
+		"\u02fd\7k\2\2\u02fd\u035d\7f\2\2\u02fe\u02ff\7k\2\2\u02ff\u0300\7p\2\2"+
+		"\u0300\u0301\7v\2\2\u0301\u0302\7g\2\2\u0302\u0303\7i\2\2\u0303\u0304"+
+		"\7g\2\2\u0304\u035d\7t\2\2\u0305\u0306\7k\2\2\u0306\u0307\7p\2\2\u0307"+
+		"\u0308\7v\2\2\u0308\u0309\7C\2\2\u0309\u030a\7t\2\2\u030a\u030b\7t\2\2"+
+		"\u030b\u030c\7c\2\2\u030c\u035d\7{\2\2\u030d\u030e\7k\2\2\u030e\u030f"+
+		"\7p\2\2\u030f\u0310\7v\2\2\u0310\u0311\7g\2\2\u0311\u0312\7t\2\2\u0312"+
+		"\u0313\7r\2\2\u0313\u0314\7q\2\2\u0314\u0315\7n\2\2\u0315\u0316\7c\2\2"+
+		"\u0316\u0317\7v\2\2\u0317\u0318\7q\2\2\u0318\u035d\7t\2\2\u0319\u031a"+
+		"\7n\2\2\u031a\u031b\7c\2\2\u031b\u031c\7{\2\2\u031c\u031d\7q\2\2\u031d"+
+		"\u031e\7w\2\2\u031e\u035d\7v\2\2\u031f\u0320\7r\2\2\u0320\u0321\7n\2\2"+
+		"\u0321\u0322\7w\2\2\u0322\u0323\7t\2\2\u0323\u0324\7c\2\2\u0324\u0325"+
+		"\7n\2\2\u0325\u035d\7u\2\2\u0326\u0327\7u\2\2\u0327\u0328\7v\2\2\u0328"+
+		"\u0329\7c\2\2\u0329\u032a\7v\2\2\u032a\u032b\7g\2\2\u032b\u032c\7N\2\2"+
+		"\u032c\u032d\7k\2\2\u032d\u032e\7u\2\2\u032e\u032f\7v\2\2\u032f\u0330"+
+		"\7C\2\2\u0330\u0331\7p\2\2\u0331\u0332\7k\2\2\u0332\u0333\7o\2\2\u0333"+
+		"\u0334\7c\2\2\u0334\u0335\7v\2\2\u0335\u0336\7q\2\2\u0336\u035d\7t\2\2"+
+		"\u0337\u0338\7u\2\2\u0338\u0339\7v\2\2\u0339\u033a\7t\2\2\u033a\u033b"+
+		"\7k\2\2\u033b\u033c\7p\2\2\u033c\u035d\7i\2\2\u033d\u033e\7u\2\2\u033e"+
+		"\u033f\7v\2\2\u033f\u0340\7t\2\2\u0340\u0341\7k\2\2\u0341\u0342\7p\2\2"+
+		"\u0342\u0343\7i\2\2\u0343\u0344\7C\2\2\u0344\u0345\7t\2\2\u0345\u0346"+
+		"\7t\2\2\u0346\u0347\7c\2\2\u0347\u035d\7{\2\2\u0348\u0349\7v\2\2\u0349"+
+		"\u034a\7t\2\2\u034a\u034b\7c\2\2\u034b\u034c\7p\2\2\u034c\u034d\7u\2\2"+
+		"\u034d\u034e\7k\2\2\u034e\u034f\7v\2\2\u034f\u0350\7k\2\2\u0350\u0351"+
+		"\7q\2\2\u0351\u035d\7p\2\2\u0352\u0353\7v\2\2\u0353\u0354\7{\2\2\u0354"+
+		"\u0355\7r\2\2\u0355\u0356\7g\2\2\u0356\u0357\7f\2\2\u0357\u0358\7C\2\2"+
+		"\u0358\u0359\7t\2\2\u0359\u035a\7t\2\2\u035a\u035b\7c\2\2\u035b\u035d"+
+		"\7{\2\2\u035c\u02b0\3\2\2\2\u035c\u02b4\3\2\2\2\u035c\u02bc\3\2\2\2\u035c"+
+		"\u02c0\3\2\2\2\u035c\u02c5\3\2\2\2\u035c\u02d3\3\2\2\2\u035c\u02d8\3\2"+
+		"\2\2\u035c\u02e3\3\2\2\2\u035c\u02ec\3\2\2\2\u035c\u02f4\3\2\2\2\u035c"+
+		"\u02fc\3\2\2\2\u035c\u02fe\3\2\2\2\u035c\u0305\3\2\2\2\u035c\u030d\3\2"+
+		"\2\2\u035c\u0319\3\2\2\2\u035c\u031f\3\2\2\2\u035c\u0326\3\2\2\2\u035c"+
+		"\u0337\3\2\2\2\u035c\u033d\3\2\2\2\u035c\u0348\3\2\2\2\u035c\u0352\3\2"+
+		"\2\2\u035d\u00c8\3\2\2\2\u035e\u0362\5\u00cbf\2\u035f\u0361\5\u00cdg\2"+
+		"\u0360\u035f\3\2\2\2\u0361\u0364\3\2\2\2\u0362\u0360\3\2\2\2\u0362\u0363"+
+		"\3\2\2\2\u0363\u00ca\3\2\2\2\u0364\u0362\3\2\2\2\u0365\u036c\t\30\2\2"+
+		"\u0366\u0367\n\23\2\2\u0367\u036c\6f\6\2\u0368\u0369\t\24\2\2\u0369\u036a"+
+		"\t\25\2\2\u036a\u036c\6f\7\2\u036b\u0365\3\2\2\2\u036b\u0366\3\2\2\2\u036b"+
+		"\u0368\3\2\2\2\u036c\u00cc\3\2\2\2\u036d\u0374\t\31\2\2\u036e\u036f\n"+
+		"\23\2\2\u036f\u0374\6g\b\2\u0370\u0371\t\24\2\2\u0371\u0372\t\25\2\2\u0372"+
+		"\u0374\6g\t\2\u0373\u036d\3\2\2\2\u0373\u036e\3\2\2\2\u0373\u0370\3\2"+
+		"\2\2\u0374\u00ce\3\2\2\2:\2\u016d\u0171\u0175\u0179\u017d\u0184\u0189"+
+		"\u018b\u0191\u0195\u0199\u019f\u01a4\u01ae\u01b2\u01b8\u01bc\u01c4\u01c8"+
+		"\u01ce\u01d8\u01dc\u01e2\u01e6\u01eb\u01ee\u01f1\u01f6\u01f9\u01fe\u0203"+
+		"\u020b\u0216\u021a\u021f\u0223\u0233\u023d\u0245\u024c\u0253\u0257\u025b"+
+		"\u0261\u026e\u0282\u028b\u0293\u0298\u02a0\u02ae\u035c\u0362\u036b\u0373"+
+		"\3\b\2\2";
 	public static final ATN _ATN =
 		new ATNDeserializer().deserialize(_serializedATN.toCharArray());
 	static {
diff --git a/tools/data-binding/library/src/main/java/com/android/databinding/library/ObservableBoolean.java b/tools/data-binding/library/src/main/java/com/android/databinding/library/ObservableBoolean.java
new file mode 100644
index 0000000..05ed9c6
--- /dev/null
+++ b/tools/data-binding/library/src/main/java/com/android/databinding/library/ObservableBoolean.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.databinding.library;
+
+public class ObservableBoolean extends BaseObservable {
+    private boolean mValue;
+
+    public boolean get() {
+        return mValue;
+    }
+
+    public void set(boolean value) {
+        mValue = value;
+        notifyChange();
+    }
+}
diff --git a/tools/data-binding/library/src/main/java/com/android/databinding/library/ObservableByte.java b/tools/data-binding/library/src/main/java/com/android/databinding/library/ObservableByte.java
new file mode 100644
index 0000000..7ec6578
--- /dev/null
+++ b/tools/data-binding/library/src/main/java/com/android/databinding/library/ObservableByte.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.databinding.library;
+
+public class ObservableByte extends BaseObservable {
+    private byte mValue;
+
+    public byte get() {
+        return mValue;
+    }
+
+    public void set(byte value) {
+        mValue = value;
+        notifyChange();
+    }
+}
diff --git a/tools/data-binding/library/src/main/java/com/android/databinding/library/ObservableChar.java b/tools/data-binding/library/src/main/java/com/android/databinding/library/ObservableChar.java
new file mode 100644
index 0000000..a7066f3
--- /dev/null
+++ b/tools/data-binding/library/src/main/java/com/android/databinding/library/ObservableChar.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.databinding.library;
+
+public class ObservableChar extends BaseObservable {
+    private char mValue;
+
+    public char get() {
+        return mValue;
+    }
+
+    public void set(char value) {
+        mValue = value;
+        notifyChange();
+    }
+}
diff --git a/tools/data-binding/library/src/main/java/com/android/databinding/library/ObservableDouble.java b/tools/data-binding/library/src/main/java/com/android/databinding/library/ObservableDouble.java
new file mode 100644
index 0000000..4bcadc6
--- /dev/null
+++ b/tools/data-binding/library/src/main/java/com/android/databinding/library/ObservableDouble.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.databinding.library;
+
+public class ObservableDouble extends BaseObservable {
+    private double mValue;
+
+    public double get() {
+        return mValue;
+    }
+
+    public void set(double value) {
+        mValue = value;
+        notifyChange();
+    }
+}
diff --git a/tools/data-binding/library/src/main/java/com/android/databinding/library/ObservableField.java b/tools/data-binding/library/src/main/java/com/android/databinding/library/ObservableField.java
new file mode 100644
index 0000000..6aaf063
--- /dev/null
+++ b/tools/data-binding/library/src/main/java/com/android/databinding/library/ObservableField.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.databinding.library;
+
+public class ObservableField<T> extends BaseObservable {
+    private T mValue;
+
+    public T get() {
+        return mValue;
+    }
+
+    public void set(T value) {
+        mValue = value;
+        notifyChange();
+    }
+}
diff --git a/tools/data-binding/library/src/main/java/com/android/databinding/library/ObservableFloat.java b/tools/data-binding/library/src/main/java/com/android/databinding/library/ObservableFloat.java
new file mode 100644
index 0000000..eec38a8
--- /dev/null
+++ b/tools/data-binding/library/src/main/java/com/android/databinding/library/ObservableFloat.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.databinding.library;
+
+public class ObservableFloat extends BaseObservable {
+    private float mValue;
+
+    public float get() {
+        return mValue;
+    }
+
+    public void set(float value) {
+        mValue = value;
+        notifyChange();
+    }
+}
diff --git a/tools/data-binding/library/src/main/java/com/android/databinding/library/ObservableInt.java b/tools/data-binding/library/src/main/java/com/android/databinding/library/ObservableInt.java
new file mode 100644
index 0000000..04142c2
--- /dev/null
+++ b/tools/data-binding/library/src/main/java/com/android/databinding/library/ObservableInt.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.databinding.library;
+
+public class ObservableInt extends BaseObservable {
+    private int mValue;
+
+    public int get() {
+        return mValue;
+    }
+
+    public void set(int value) {
+        mValue = value;
+        notifyChange();
+    }
+}
diff --git a/tools/data-binding/library/src/main/java/com/android/databinding/library/ObservableLong.java b/tools/data-binding/library/src/main/java/com/android/databinding/library/ObservableLong.java
new file mode 100644
index 0000000..1be4591
--- /dev/null
+++ b/tools/data-binding/library/src/main/java/com/android/databinding/library/ObservableLong.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.databinding.library;
+
+public class ObservableLong extends BaseObservable {
+    private long mValue;
+
+    public long get() {
+        return mValue;
+    }
+
+    public void set(long value) {
+        mValue = value;
+        notifyChange();
+    }
+}
diff --git a/tools/data-binding/library/src/main/java/com/android/databinding/library/ObservableShort.java b/tools/data-binding/library/src/main/java/com/android/databinding/library/ObservableShort.java
new file mode 100644
index 0000000..74bd4eb
--- /dev/null
+++ b/tools/data-binding/library/src/main/java/com/android/databinding/library/ObservableShort.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.databinding.library;
+
+public class ObservableShort extends BaseObservable {
+    private short mValue;
+
+    public short get() {
+        return mValue;
+    }
+
+    public void set(short value) {
+        mValue = value;
+        notifyChange();
+    }
+}