commit 08c586a507b6b165be164821beea925e730aca99
author Jack Palevich <jackpal@google.com> Fri Sep 18 16:30:19 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 18 16:30:19 2009 -0700
tree 4a1ecb255f0b9ce0b62ba7dd88767a9de1352f2d
parent 656944243786dc4e7569f4ae22b5943aeba9e919
parent 119dcd8400b33241a6081b2f4ba4e3a8764896d7

am 119dcd84: Merge change 25859 into eclair

Merge commit '119dcd8400b33241a6081b2f4ba4e3a8764896d7' into eclair-plus-aosp

* commit '119dcd8400b33241a6081b2f4ba4e3a8764896d7':
  Improve error-handling when an expected token is missing.

libacc/acc.cpp

diff --git a/libacc/acc.cpp b/libacc/acc.cpp
index 436f806..6d9213c 100644
--- a/libacc/acc.cpp
+++ b/libacc/acc.cpp
@@ -4537,10 +4537,9 @@
     }
 
     void skip(intptr_t c) {
-        if (tok != c) {
+        if (!accept(c)) {
             error("'%c' expected", c);
         }
-        next();
     }
 
     bool accept(intptr_t c) {