Add scope to foreach

dlang-community · Oct 16, 2022 · abeefa2 · abeefa2
1 parent fc790d9
commit abeefa2
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 1 deletion.
diff --git a/src/dparse/ast.d b/src/dparse/ast.d
@@ -1696,6 +1696,7 @@ final class ForeachType : BaseNode
     /** */ bool isAlias;
     /** */ bool isEnum;
     /** */ bool isRef;
+    /** */ bool isScope;
     /** */ IdType[] typeConstructors;
     /** */ Type type;
     /** */ Token identifier;

diff --git a/src/dparse/astprinter.d b/src/dparse/astprinter.d
@@ -393,6 +393,10 @@ class XMLPrinter : ASTVisitor
 	override void visit(const ForeachType foreachType)
 	{
 		output.writeln("<foreachType>");
+		if (foreachType.isAlias) output.writeln("<alias/>");
+		if (foreachType.isEnum) output.writeln("<enum/>");
+		if (foreachType.isRef) output.writeln("<ref/>");
+		if (foreachType.isScope) output.writeln("<scope/>");
 		foreach (constructor; foreachType.typeConstructors)
 		{
 			output.writeln("<typeConstructor>", str(constructor), "</typeConstructor>");

diff --git a/src/dparse/parser.d b/src/dparse/parser.d
@@ -3287,7 +3287,7 @@ class Parser
      * Parses a ForeachType
      *
      * $(GRAMMAR $(RULEDEF foreachType):
-     *       ($(LITERAL 'ref') | $(LITERAL 'alias') | $(LITERAL 'enum') | $(RULE typeConstructor))* $(RULE type)? $(LITERAL Identifier)
+     *       ($(LITERAL 'ref') | $(LITERAL 'alias') | $(LITERAL 'enum') | $(LITERAL 'scope') | $(RULE typeConstructor))* $(RULE type)? $(LITERAL Identifier)
      *     ;)
      */
     ForeachType parseForeachType()
@@ -3313,6 +3313,11 @@ class Parser
                 node.isEnum = true;
                 advance();
             }
+            else if (currentIs(tok!"scope"))
+            {
+                node.isScope = true;
+                advance();
+            }
             else if (tok!"" != (typeConstructor = parseTypeConstructor(false)))
             {
                 trace("\033[01;36mType constructor");

diff --git a/test/ast_checks/foreach.d b/test/ast_checks/foreach.d
@@ -0,0 +1,4 @@
+void foo(T)(T[] arr)
+{
+	foreach (enum ref scope const inout alias f; arr) {}
+}
diff --git a/test/ast_checks/foreach.txt b/test/ast_checks/foreach.txt
@@ -0,0 +1,6 @@
+//functionDeclaration//foreachStatement//foreachType/alias
+//functionDeclaration//foreachStatement//foreachType/enum
+//functionDeclaration//foreachStatement//foreachType/ref
+//functionDeclaration//foreachStatement//foreachType/scope
+//functionDeclaration//foreachStatement//foreachType/typeConstructor[text()='const']
+//functionDeclaration//foreachStatement//foreachType/typeConstructor[text()='inout']