Merge pull request #3253 from techee/rust2

rust: Add support for constant parsing

Author: masatake

Units/parser-rust.r/rust-test_input.d/expected.tags

@@ -12,6 +12,7 @@ Foo	input.rs	/^impl Foo {$/;"	c
 Foo	input.rs	/^impl Testable for Foo {$/;"	c
 Foo	input.rs	/^struct Foo{foo_field_1:isize}$/;"	s
 Foo2	input.rs	/^struct Foo2 {$/;"	s
+N	input.rs	/^const N: usize = 10;$/;"	C
 ParametrizedTrait	input.rs	/^trait ParametrizedTrait<T> {$/;"	i
 S1	input.rs	/^struct S1 {$/;"	s
 SomeStruct	input.rs	/^	pub struct SomeStruct;$/;"	s	module:test_input2

Units/parser-rust.r/rust-test_input.d/input.rs

@@ -63,6 +63,7 @@ fn array_param(arr: [[u32; 3]; 4])
  */
 
 static size: usize = 1;
+const N: usize = 10;
 
 #[cfg(test)]
 struct S1 {

parsers/rust.c

@@ -43,6 +43,7 @@ typedef enum {
 	K_FIELD,
 	K_VARIANT,
 	K_METHOD,
+	K_CONST,
 	K_NONE
 } RustKind;
 
@@ -59,6 +60,7 @@ static kindDefinition rustKinds[] = {
 	{true, 'm', "field", "A struct field"},
 	{true, 'e', "enumerator", "An enum variant"},
 	{true, 'P', "method", "A method"},
+	{true, 'C', "constant", "A constant"},
 };
 
 typedef enum {
@@ -725,6 +727,18 @@ static void parseStatic (lexerState *lexer, vString *scope, int parent_kind)
 	addTag(lexer->token_str, NULL, K_STATIC, lexer->line, lexer->pos, scope, parent_kind);
 }
 
+/* Const format:
+ * "const" <ident>
+ */
+static void parseConst (lexerState *lexer, vString *scope, int parent_kind)
+{
+	advanceToken(lexer, true);
+	if (lexer->cur_token != TOKEN_IDENT)
+		return;
+
+	addTag(lexer->token_str, NULL, K_CONST, lexer->line, lexer->pos, scope, parent_kind);
+}
+
 /* Type format:
  * "type" <ident>
  */
@@ -918,6 +932,10 @@ static void parseBlock (lexerState *lexer, bool delim, int kind, vString *scope)
 			{
 				parseStatic(lexer, scope, kind);
 			}
+			else if(strcmp(vStringValue(lexer->token_str), "const") == 0)
+			{
+				parseConst(lexer, scope, kind);
+			}
 			else if(strcmp(vStringValue(lexer->token_str), "trait") == 0)
 			{
 				parseTrait(lexer, scope, kind);