Report syntax errors even though Antlr can recover

This CL makes Antlr parser more strict by not allowing errors.
Antlr usually tries to recover from these errors but thats
not what we really want for this use case.

This CL also updates version codes to rc4 since rc3 is already out.

Change-Id: I0d305e06a6cdcbae2f37573c3c6ae4233cdd7958

2 files changed, 3 insertions, 1 deletions

diff --git a/compilerCommon/src/main/java/android/databinding/tool/processing/ErrorMessages.java b/compilerCommon/src/main/java/android/databinding/tool/processing/ErrorMessages.java
index 6853ddba..5d7cb313 100644
--- a/compilerCommon/src/main/java/android/databinding/tool/processing/ErrorMessages.java
+++ b/compilerCommon/src/main/java/android/databinding/tool/processing/ErrorMessages.java
@@ -39,4 +39,5 @@ public class ErrorMessages {
     public static final String ROOT_TAG_NOT_SUPPORTED = "android:tag is not supported on root " +
             "elements of data bound layouts unless targeting API version 14 or greater. Value " +
             "is '%s'";
+    public static final String SYNTAX_ERROR = "Syntax error: %s";
 }
diff --git a/compilerCommon/src/main/java/android/databinding/tool/processing/ScopedException.java b/compilerCommon/src/main/java/android/databinding/tool/processing/ScopedException.java
index 238a895b..d60c2d5f 100644
--- a/compilerCommon/src/main/java/android/databinding/tool/processing/ScopedException.java
+++ b/compilerCommon/src/main/java/android/databinding/tool/processing/ScopedException.java
@@ -40,7 +40,8 @@ public class ScopedException extends RuntimeException {
     private String mScopeLog;
 
     public ScopedException(String message, Object... args) {
-        super(message == null ? "unknown data binding exception" : String.format(message, args));
+        super(message == null ? "unknown data binding exception" :
+                args.length == 0 ? message : String.format(message, args));
         mScopedErrorReport = Scope.createReport();
         mScopeLog = L.isDebugEnabled() ? Scope.produceScopeLog() : null;
     }