Merge pull request #424 from dlang-community/issue-423

Support 'throw' as a function attribute
dlang-community · Jul 30, 2020 · 1393ee4 · 1393ee4
2 parents ddafc62 + d8e3515
commit 1393ee4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/src/dparse/parser.d b/src/dparse/parser.d
@@ -1210,6 +1210,7 @@ class Parser
      *     | $(LITERAL 'nothrow')
      *     | $(LITERAL 'pure')
      *     | $(LITERAL 'ref')
+     *     | $(LITERAL 'throw')
      *     ;)
      */
     Attribute parseAttribute()
@@ -1267,6 +1268,7 @@ class Parser
         case tok!"nothrow":
         case tok!"pure":
         case tok!"ref":
+        case tok!"throw":
             node.attribute = advance();
             break;
         default:
@@ -4638,10 +4640,11 @@ class Parser
         case tok!"nothrow":
         case tok!"return":
         case tok!"scope":
+        case tok!"throw":
             node.tokenType = advance().type;
             break;
         default:
-            error(`Member funtion attribute expected`);
+            error(`Member function attribute expected`);
         }
         node.tokens = tokens[startIndex .. index];
         return node;
@@ -6113,6 +6116,7 @@ class Parser
      *     | $(LITERAL 'scope')
      *     | $(LITERAL 'static')
      *     | $(LITERAL 'synchronized')
+     *     | $(LITERAL 'throw')
      *     ;)
      */
     StorageClass parseStorageClass()
@@ -6155,6 +6159,7 @@ class Parser
         case tok!"scope":
         case tok!"static":
         case tok!"synchronized":
+        case tok!"throw":
             node.token = advance();
             break;
         default:
@@ -8255,6 +8260,7 @@ protected: final:
         case tok!"ref":
         case tok!"extern":
         case tok!"align":
+        case tok!"throw":
             return true;
         default:
             return false;
@@ -8274,6 +8280,7 @@ protected: final:
         case tok!"nothrow":
         case tok!"return":
         case tok!"scope":
+        case tok!"throw":
             return true;
         default:
             return false;

diff --git a/test/fail_files/throwattribute.d b/test/fail_files/throwattribute.d
@@ -0,0 +1,3 @@
+void doThings(throw int x)
+{
+}
diff --git a/test/pass_files/throwattribute.d b/test/pass_files/throwattribute.d
@@ -0,0 +1,10 @@
+void doStuff() throw {
+	throw void doThings()
+	{
+
+	}
+	throw new Exception("OH NO!");
+}
+
+throw:
+	extern void throwsSomething();