Mojo: Mojom: Remove integer suffixes (e.g., u, l, ul, etc.).

mojo/public/tools/bindings/pylib/mojom_tests/parse/lexer_unittest.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import imp
 import os.path
 import sys
 import unittest
 
 # Disable lint check for finding modules:
@@ skipping 45 matching lines @@
 
 
 class LexerTest(unittest.TestCase):
   """Tests |mojom.parse.lexer.Lexer|."""
 
   def __init__(self, *args, **kwargs):
     unittest.TestCase.__init__(self, *args, **kwargs)
     # Clone all lexer instances from this one, since making a lexer is slow.
     self._zygote_lexer = lex.lex(mojom.parse.lexer.Lexer("my_file.mojom"))
 
-  def testValidIdentifiers(self):
-    """Tests identifiers."""
-    self.assertEquals(self._SingleTokenForInput("abcd"),
-                      _MakeLexToken("NAME", "abcd"))
-    self.assertEquals(self._SingleTokenForInput("AbC_d012_"),
-                      _MakeLexToken("NAME", "AbC_d012_"))
-    self.assertEquals(self._SingleTokenForInput("_0123"),
-                      _MakeLexToken("NAME", "_0123"))
-
-  def testInvalidIdentifiers(self):
-    with self.assertRaisesRegexp(
-        mojom.parse.lexer.LexError,
-        r"^my_file\.mojom:1: Error: Illegal character '\$'$"):
-      self._TokensForInput("$abc")
-    with self.assertRaisesRegexp(
-        mojom.parse.lexer.LexError,
-        r"^my_file\.mojom:1: Error: Illegal character '\$'$"):
-      self._TokensForInput("a$bc")
-
-  def testValidSingleKeywords(self):
-    """Tests valid, single keywords."""
+  def testValidKeywords(self):
+    """Tests valid keywords."""
     self.assertEquals(self._SingleTokenForInput("handle"),
                       _MakeLexTokenForKeyword("handle"))
     self.assertEquals(self._SingleTokenForInput("data_pipe_consumer"),
                       _MakeLexTokenForKeyword("data_pipe_consumer"))
     self.assertEquals(self._SingleTokenForInput("data_pipe_producer"),
                       _MakeLexTokenForKeyword("data_pipe_producer"))
     self.assertEquals(self._SingleTokenForInput("message_pipe"),
                       _MakeLexTokenForKeyword("message_pipe"))
     self.assertEquals(self._SingleTokenForInput("import"),
                       _MakeLexTokenForKeyword("import"))
     self.assertEquals(self._SingleTokenForInput("module"),
                       _MakeLexTokenForKeyword("module"))
     self.assertEquals(self._SingleTokenForInput("struct"),
                       _MakeLexTokenForKeyword("struct"))
     self.assertEquals(self._SingleTokenForInput("interface"),
                       _MakeLexTokenForKeyword("interface"))
     self.assertEquals(self._SingleTokenForInput("enum"),
                       _MakeLexTokenForKeyword("enum"))
 
-  def testValidSingleTokens(self):
-    """Tests valid, single (non-keyword) tokens."""
+  def testValidIdentifiers(self):
+    """Tests identifiers."""
+    self.assertEquals(self._SingleTokenForInput("abcd"),
+                      _MakeLexToken("NAME", "abcd"))
+    self.assertEquals(self._SingleTokenForInput("AbC_d012_"),
+                      _MakeLexToken("NAME", "AbC_d012_"))
+    self.assertEquals(self._SingleTokenForInput("_0123"),
+                      _MakeLexToken("NAME", "_0123"))
+
+  def testInvalidIdentifiers(self):
+    with self.assertRaisesRegexp(
+        mojom.parse.lexer.LexError,
+        r"^my_file\.mojom:1: Error: Illegal character '\$'$"):
+      self._TokensForInput("$abc")
+    with self.assertRaisesRegexp(
+        mojom.parse.lexer.LexError,
+        r"^my_file\.mojom:1: Error: Illegal character '\$'$"):
+      self._TokensForInput("a$bc")
+
+  def testDecimalIntegerConstants(self):
+    self.assertEquals(self._SingleTokenForInput("0"),
+                      _MakeLexToken("INT_CONST_DEC", "0"))
+    self.assertEquals(self._SingleTokenForInput("1"),
+                      _MakeLexToken("INT_CONST_DEC", "1"))
+    self.assertEquals(self._SingleTokenForInput("123"),
+                      _MakeLexToken("INT_CONST_DEC", "123"))
+    self.assertEquals(self._SingleTokenForInput("10"),
+                      _MakeLexToken("INT_CONST_DEC", "10"))
+
+  def testValidTokens(self):
+    """Tests valid tokens (which aren't tested elsewhere)."""
+    # Keywords tested in |testValidKeywords|.
     # NAME tested in |testValidIdentifiers|.
     self.assertEquals(self._SingleTokenForInput("@123"),
                       _MakeLexToken("ORDINAL", "@123"))
     self.assertEquals(self._SingleTokenForInput("456"),
                       _MakeLexToken("INT_CONST_DEC", "456"))
     self.assertEquals(self._SingleTokenForInput("0765"),
                       _MakeLexToken("INT_CONST_OCT", "0765"))
     self.assertEquals(self._SingleTokenForInput("0x01aB2eF3"),
                       _MakeLexToken("INT_CONST_HEX", "0x01aB2eF3"))
     self.assertEquals(self._SingleTokenForInput("123.456"),
@@ skipping 63 matching lines @@
   def _SingleTokenForInput(self, input_string):
     """Gets the single token for the given input string. (Raises an exception if
     the input string does not result in exactly one token.)"""
     toks = self._TokensForInput(input_string)
     assert len(toks) == 1
     return toks[0]
 
 
 if __name__ == "__main__":
   unittest.main()