From 6011811beb50d8df9216b9932ab375f7576860de Mon Sep 17 00:00:00 2001
From: Rui Ueyama <ruiu@google.com>
Date: Wed, 20 Apr 2016 20:54:13 +0000
Subject: [PATCH] Define and use a utility function. NFC.

llvm-svn: 266914
---
 lld/ELF/LinkerScript.cpp | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/lld/ELF/LinkerScript.cpp b/lld/ELF/LinkerScript.cpp
index 0db250c4ccae..dd67fdb38ab4 100644
--- a/lld/ELF/LinkerScript.cpp
+++ b/lld/ELF/LinkerScript.cpp
@@ -64,6 +64,20 @@ static StringRef next(ArrayRef<StringRef> &Tokens) {
   return Tok;
 }
 
+static bool expect(ArrayRef<StringRef> &Tokens, StringRef S) {
+  if (Tokens.empty()) {
+    error(S + " expected");
+    return false;
+  }
+  StringRef Tok = Tokens.front();
+  if (Tok != S) {
+    error(S + " expected, but got " + Tok);
+    return false;
+  }
+  Tokens = Tokens.slice(1);
+  return true;
+}
+
 static uint64_t parseExpr(ArrayRef<StringRef> &Tokens, uint64_t Dot);
 
 // This is a part of the operator-precedence parser to evaluate
@@ -75,13 +89,8 @@ static uint64_t parsePrimary(ArrayRef<StringRef> &Tokens, uint64_t Dot) {
     return Dot;
   if (Tok == "(") {
     uint64_t V = parseExpr(Tokens, Dot);
-    if (Tokens.empty()) {
-      error(") expected");
-    } else {
-      Tok = next(Tokens);
-      if (Tok != ")")
-        error(") expected, but got " + Tok);
-    }
+    if (!expect(Tokens, ")"))
+      return 0;
     return V;
   }
   return getInteger(Tok);