Code cleanup

Author: kuilpd

lldb/docs/dil-expr-lang.ebnf

@@ -15,7 +15,8 @@ postfix_expression = primary_expression
                    | postfix_expression "." id_expression
                    | postfix_expression "->" id_expression ;
 
-primary_expression = id_expression
+primary_expression = numeric_literal
+                   | id_expression
                    | "(" expression ")" ;
 
 id_expression = unqualified_id

lldb/include/lldb/ValueObject/DILLexer.h

@@ -28,7 +28,7 @@ class Token {
     arrow,
     coloncolon,
     eof,
-    floating_constant,
+    float_constant,
     identifier,
     integer_constant,
     l_paren,

lldb/source/ValueObject/DILEval.cpp

@@ -512,11 +512,9 @@ GetTypeSystemFromCU(std::shared_ptr<StackFrame> ctx) {
 static CompilerType GetBasicType(lldb::TypeSystemSP type_system,
                                  lldb::BasicType basic_type) {
   if (type_system)
-    if (auto compiler_type = type_system.get()->GetBasicTypeFromAST(basic_type))
-      return compiler_type;
+    return type_system.get()->GetBasicTypeFromAST(basic_type);
 
-  CompilerType empty_type;
-  return empty_type;
+  return CompilerType();
 }
 
 llvm::Expected<CompilerType>

lldb/source/ValueObject/DILLexer.cpp

@@ -28,8 +28,8 @@ llvm::StringRef Token::GetTokenName(Kind kind) {
     return "coloncolon";
   case Kind::eof:
     return "eof";
-  case Kind::floating_constant:
-    return "floating_constant";
+  case Kind::float_constant:
+    return "float_constant";
   case Kind::identifier:
     return "identifier";
   case Kind::integer_constant:
@@ -133,7 +133,7 @@ llvm::Expected<Token> DILLexer::Lex(llvm::StringRef expr,
   bool isFloat = false;
   std::optional<llvm::StringRef> maybe_number = IsNumber(remainder, isFloat);
   if (maybe_number) {
-    auto kind = isFloat ? Token::floating_constant : Token::integer_constant;
+    auto kind = isFloat ? Token::float_constant : Token::integer_constant;
     return Token(kind, maybe_number->str(), position);
   }
   std::optional<llvm::StringRef> maybe_word = IsWord(expr, remainder);

lldb/source/ValueObject/DILParser.cpp

@@ -184,7 +184,7 @@ ASTNodeUP DILParser::ParsePostfixExpression() {
 //    "(" expression ")"
 //
 ASTNodeUP DILParser::ParsePrimaryExpression() {
-  if (CurToken().IsOneOf({Token::integer_constant, Token::floating_constant}))
+  if (CurToken().IsOneOf({Token::integer_constant, Token::float_constant}))
     return ParseNumericLiteral();
   if (CurToken().IsOneOf(
           {Token::coloncolon, Token::identifier, Token::l_paren})) {

lldb/test/API/commands/frame/var-dil/basics/ArraySubscript/TestFrameVarDILArraySubscript.py

@@ -66,7 +66,7 @@ def test_subscript(self):
         self.expect(
             "frame var 'int_arr[1.0]'",
             error=True,
-            substrs=["failed to parse integer constant: <'1.0' (floating_constant)>"],
+            substrs=["failed to parse integer constant: <'1.0' (float_constant)>"],
         )
 
         # Test accessing bits in scalar types.

lldb/unittests/ValueObject/DILLexerTests.cpp

@@ -176,7 +176,7 @@ TEST(DILLexerTests, NumbersTest) {
     SCOPED_TRACE(str);
     EXPECT_THAT_EXPECTED(ExtractTokenData(str),
                          llvm::HasValue(testing::ElementsAre(
-                             testing::Pair(Token::floating_constant, str))));
+                             testing::Pair(Token::float_constant, str))));
   }
   // Verify that none of the invalid numbers come out as numeric tokens.
   for (auto &str : invalid_numbers) {
@@ -200,7 +200,7 @@ TEST(DILLexerTests, NumbersTest) {
     DILLexer lexer(*maybe_lexer);
     Token token = lexer.GetCurrentToken();
     EXPECT_TRUE(
-        token.IsOneOf({Token::integer_constant, Token::floating_constant}));
+        token.IsOneOf({Token::integer_constant, Token::float_constant}));
     lexer.Advance();
     token = lexer.GetCurrentToken();
     EXPECT_TRUE(token.IsOneOf({Token::plus, Token::minus}));