Renamed Ident to Identifier, added some helper methods and refactored two methods.

--
MOS_MIGRATED_REVID=98922811

1 files changed, 10 insertions, 10 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/syntax/ParserTest.java b/src/test/java/com/google/devtools/build/lib/syntax/ParserTest.java
index de59d2a987..dad2d46e89 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/ParserTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/ParserTest.java
@@ -145,7 +145,7 @@ public class ParserTest extends EvaluationTestCase {
   public void testFuncallExpr() throws Exception {
     FuncallExpression e = (FuncallExpression) parseExpression("foo(1, 2, bar=wiz)");
 
-    Ident ident = e.getFunction();
+    Identifier ident = e.getFunction();
     assertEquals("foo", ident.getName());
 
     assertThat(e.getArguments()).hasSize(3);
@@ -159,7 +159,7 @@ public class ParserTest extends EvaluationTestCase {
 
     Argument.Passed arg2 = e.getArguments().get(2);
     assertEquals("bar", arg2.getName());
-    Ident arg2val = (Ident) arg2.getValue();
+    Identifier arg2val = (Identifier) arg2.getValue();
     assertEquals("wiz", arg2val.getName());
   }
 
@@ -168,7 +168,7 @@ public class ParserTest extends EvaluationTestCase {
     FuncallExpression e =
       (FuncallExpression) parseExpression("foo.foo(1, 2, bar=wiz)");
 
-    Ident ident = e.getFunction();
+    Identifier ident = e.getFunction();
     assertEquals("foo", ident.getName());
 
     assertThat(e.getArguments()).hasSize(3);
@@ -182,7 +182,7 @@ public class ParserTest extends EvaluationTestCase {
 
     Argument.Passed arg2 = e.getArguments().get(2);
     assertEquals("bar", arg2.getName());
-    Ident arg2val = (Ident) arg2.getValue();
+    Identifier arg2val = (Identifier) arg2.getValue();
     assertEquals("wiz", arg2val.getName());
   }
 
@@ -191,7 +191,7 @@ public class ParserTest extends EvaluationTestCase {
     FuncallExpression e =
       (FuncallExpression) parseExpression("foo.replace().split(1)");
 
-    Ident ident = e.getFunction();
+    Identifier ident = e.getFunction();
     assertEquals("split", ident.getName());
 
     assertThat(e.getArguments()).hasSize(1);
@@ -205,7 +205,7 @@ public class ParserTest extends EvaluationTestCase {
   public void testPropRefExpr() throws Exception {
     DotExpression e = (DotExpression) parseExpression("foo.foo");
 
-    Ident ident = e.getField();
+    Identifier ident = e.getField();
     assertEquals("foo", ident.getName());
   }
 
@@ -213,7 +213,7 @@ public class ParserTest extends EvaluationTestCase {
   public void testStringMethExpr() throws Exception {
     FuncallExpression e = (FuncallExpression) parseExpression("'foo'.foo()");
 
-    Ident ident = e.getFunction();
+    Identifier ident = e.getFunction();
     assertEquals("foo", ident.getName());
 
     assertThat(e.getArguments()).isEmpty();
@@ -280,7 +280,7 @@ public class ParserTest extends EvaluationTestCase {
 
     // Test that the actual parameters are: (1, $error$, 3):
 
-    Ident ident = e.getFunction();
+    Identifier ident = e.getFunction();
     assertEquals("f", ident.getName());
 
     assertThat(e.getArguments()).hasSize(3);
@@ -290,7 +290,7 @@ public class ParserTest extends EvaluationTestCase {
     assertEquals(1, (int) arg0.getValue());
 
     Argument.Passed arg1 = e.getArguments().get(1);
-    Ident arg1val = ((Ident) arg1.getValue());
+    Identifier arg1val = ((Identifier) arg1.getValue());
     assertEquals("$error$", arg1val.getName());
 
     assertLocation(5, 29, arg1val.getLocation());
@@ -658,7 +658,7 @@ public class ParserTest extends EvaluationTestCase {
     assertThat(clauses.get(0).getLValue().getExpression().toString()).isEqualTo("x");
     assertThat(clauses.get(0).getExpression()).isInstanceOf(ListLiteral.class);
     assertThat(clauses.get(1).getLValue().getExpression().toString()).isEqualTo("y");
-    assertThat(clauses.get(1).getExpression()).isInstanceOf(Ident.class);
+    assertThat(clauses.get(1).getExpression()).isInstanceOf(Identifier.class);
   }
 
   @Test