spanish-quizzer

commit 4fee5a0b49db290a36d1c2d63baa1874ad1007e3
parent c29f04e04fc8b5be5bbf7bc150da8588f03e5a48
Author: AsherMorgan <59518073+AsherMorgan@users.noreply.github.com>
Date:   Sun, 14 Mar 2021 18:26:48 -0700

Simplify stem changing filter regex

Diffstat:
M
js/filters.js
 | 
4
++--
M
tests/test.filters.js
 | 
176
++++++++++++++++++++++++++++++++++++++++----------------------------------------

2 files changed, 90 insertions(+), 90 deletions(-)
diff --git a/js/filters.js b/js/filters.js
@@ -111,13 +111,13 @@ function GetVerbFilters(rawFilters) {
                 filter.type = "Irregular";
                 break;
             case "stem changing":
-                filter.type = "Stem.?Changing";
+                filter.type = "Stem Changing";
                 break;
             case "orthographic":
                 filter.type = "Orthographic";
                 break;
             case "nonregular":
-                filter.type = "Irregular|Stem.?Changing|Orthographic";
+                filter.type = "Irregular|Stem Changing|Orthographic";
                 break;
             case "all types":
                 filter.type = ".*";
diff --git a/tests/test.filters.js b/tests/test.filters.js
@@ -155,33 +155,33 @@ describe("Filters", function() {
         it("Should correctly filter verbs for multiple filters", function() {
             // Initialize expected
             let expected = [
-                {outputIndex:0, inputIndex:03, filters:[{index:02, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                {outputIndex:0, inputIndex:05, filters:[{index:04, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                {outputIndex:0, inputIndex:07, filters:[{index:06, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                {outputIndex:0, inputIndex:08, filters:[{index:06, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                {outputIndex:0, inputIndex:09, filters:[{index:06, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                {outputIndex:0, inputIndex:10, filters:[{index:06, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                {outputIndex:0, inputIndex:11, filters:[{index:06, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                {outputIndex:0, inputIndex:13, filters:[{index:12, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                {outputIndex:0, inputIndex:14, filters:[{index:12, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                {outputIndex:0, inputIndex:15, filters:[{index:12, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                {outputIndex:0, inputIndex:16, filters:[{index:12, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                {outputIndex:0, inputIndex:17, filters:[{index:12, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                {outputIndex:0, inputIndex:19, filters:[{index:18, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                {outputIndex:0, inputIndex:20, filters:[{index:18, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                {outputIndex:0, inputIndex:21, filters:[{index:18, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                {outputIndex:0, inputIndex:22, filters:[{index:18, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                {outputIndex:0, inputIndex:23, filters:[{index:18, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                {outputIndex:0, inputIndex:25, filters:[{index:24, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                {outputIndex:0, inputIndex:26, filters:[{index:24, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                {outputIndex:0, inputIndex:27, filters:[{index:24, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                {outputIndex:0, inputIndex:28, filters:[{index:24, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                {outputIndex:0, inputIndex:29, filters:[{index:24, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                {outputIndex:0, inputIndex:31, filters:[{index:30, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                {outputIndex:0, inputIndex:32, filters:[{index:30, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                {outputIndex:0, inputIndex:33, filters:[{index:30, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                {outputIndex:0, inputIndex:34, filters:[{index:30, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                {outputIndex:0, inputIndex:35, filters:[{index:30, value:"Irregular|Stem.?Changing|Orthographic"}]},
+                {outputIndex:0, inputIndex:03, filters:[{index:02, value:"Irregular|Stem Changing|Orthographic"}]},
+                {outputIndex:0, inputIndex:05, filters:[{index:04, value:"Irregular|Stem Changing|Orthographic"}]},
+                {outputIndex:0, inputIndex:07, filters:[{index:06, value:"Irregular|Stem Changing|Orthographic"}]},
+                {outputIndex:0, inputIndex:08, filters:[{index:06, value:"Irregular|Stem Changing|Orthographic"}]},
+                {outputIndex:0, inputIndex:09, filters:[{index:06, value:"Irregular|Stem Changing|Orthographic"}]},
+                {outputIndex:0, inputIndex:10, filters:[{index:06, value:"Irregular|Stem Changing|Orthographic"}]},
+                {outputIndex:0, inputIndex:11, filters:[{index:06, value:"Irregular|Stem Changing|Orthographic"}]},
+                {outputIndex:0, inputIndex:13, filters:[{index:12, value:"Irregular|Stem Changing|Orthographic"}]},
+                {outputIndex:0, inputIndex:14, filters:[{index:12, value:"Irregular|Stem Changing|Orthographic"}]},
+                {outputIndex:0, inputIndex:15, filters:[{index:12, value:"Irregular|Stem Changing|Orthographic"}]},
+                {outputIndex:0, inputIndex:16, filters:[{index:12, value:"Irregular|Stem Changing|Orthographic"}]},
+                {outputIndex:0, inputIndex:17, filters:[{index:12, value:"Irregular|Stem Changing|Orthographic"}]},
+                {outputIndex:0, inputIndex:19, filters:[{index:18, value:"Irregular|Stem Changing|Orthographic"}]},
+                {outputIndex:0, inputIndex:20, filters:[{index:18, value:"Irregular|Stem Changing|Orthographic"}]},
+                {outputIndex:0, inputIndex:21, filters:[{index:18, value:"Irregular|Stem Changing|Orthographic"}]},
+                {outputIndex:0, inputIndex:22, filters:[{index:18, value:"Irregular|Stem Changing|Orthographic"}]},
+                {outputIndex:0, inputIndex:23, filters:[{index:18, value:"Irregular|Stem Changing|Orthographic"}]},
+                {outputIndex:0, inputIndex:25, filters:[{index:24, value:"Irregular|Stem Changing|Orthographic"}]},
+                {outputIndex:0, inputIndex:26, filters:[{index:24, value:"Irregular|Stem Changing|Orthographic"}]},
+                {outputIndex:0, inputIndex:27, filters:[{index:24, value:"Irregular|Stem Changing|Orthographic"}]},
+                {outputIndex:0, inputIndex:28, filters:[{index:24, value:"Irregular|Stem Changing|Orthographic"}]},
+                {outputIndex:0, inputIndex:29, filters:[{index:24, value:"Irregular|Stem Changing|Orthographic"}]},
+                {outputIndex:0, inputIndex:31, filters:[{index:30, value:"Irregular|Stem Changing|Orthographic"}]},
+                {outputIndex:0, inputIndex:32, filters:[{index:30, value:"Irregular|Stem Changing|Orthographic"}]},
+                {outputIndex:0, inputIndex:33, filters:[{index:30, value:"Irregular|Stem Changing|Orthographic"}]},
+                {outputIndex:0, inputIndex:34, filters:[{index:30, value:"Irregular|Stem Changing|Orthographic"}]},
+                {outputIndex:0, inputIndex:35, filters:[{index:30, value:"Irregular|Stem Changing|Orthographic"}]},
 
                 {outputIndex:0, inputIndex:07, filters:[{index:06, value:".*"}]},
                 {outputIndex:0, inputIndex:08, filters:[{index:06, value:".*"}]},
@@ -189,13 +189,13 @@ describe("Filters", function() {
                 {outputIndex:0, inputIndex:10, filters:[{index:06, value:".*"}]},
                 {outputIndex:0, inputIndex:11, filters:[{index:06, value:".*"}]},
 
-                {outputIndex:03, inputIndex:1, filters:[{index:02, value:"Stem.?Changing"}]},
-                {outputIndex:05, inputIndex:1, filters:[{index:04, value:"Stem.?Changing"}]},
-                {outputIndex:10, inputIndex:1, filters:[{index:06, value:"Stem.?Changing"}]},
-                {outputIndex:16, inputIndex:1, filters:[{index:12, value:"Stem.?Changing"}]},
-                {outputIndex:22, inputIndex:1, filters:[{index:18, value:"Stem.?Changing"}]},
-                {outputIndex:28, inputIndex:1, filters:[{index:24, value:"Stem.?Changing"}]},
-                {outputIndex:34, inputIndex:1, filters:[{index:30, value:"Stem.?Changing"}]},
+                {outputIndex:03, inputIndex:1, filters:[{index:02, value:"Stem Changing"}]},
+                {outputIndex:05, inputIndex:1, filters:[{index:04, value:"Stem Changing"}]},
+                {outputIndex:10, inputIndex:1, filters:[{index:06, value:"Stem Changing"}]},
+                {outputIndex:16, inputIndex:1, filters:[{index:12, value:"Stem Changing"}]},
+                {outputIndex:22, inputIndex:1, filters:[{index:18, value:"Stem Changing"}]},
+                {outputIndex:28, inputIndex:1, filters:[{index:24, value:"Stem Changing"}]},
+                {outputIndex:34, inputIndex:1, filters:[{index:30, value:"Stem Changing"}]},
             ];
 
             // Filter verbs
@@ -387,33 +387,33 @@ describe("Filters", function() {
             it("Should correctly filter stem changing verbs", function() {
                 // Initialize expected
                 let expected = [
-                    {outputIndex:0, inputIndex:03, filters:[{index:02, value:"Stem.?Changing"}]},
-                    {outputIndex:0, inputIndex:05, filters:[{index:04, value:"Stem.?Changing"}]},
-                    {outputIndex:0, inputIndex:07, filters:[{index:06, value:"Stem.?Changing"}]},
-                    {outputIndex:0, inputIndex:08, filters:[{index:06, value:"Stem.?Changing"}]},
-                    {outputIndex:0, inputIndex:09, filters:[{index:06, value:"Stem.?Changing"}]},
-                    {outputIndex:0, inputIndex:10, filters:[{index:06, value:"Stem.?Changing"}]},
-                    {outputIndex:0, inputIndex:11, filters:[{index:06, value:"Stem.?Changing"}]},
-                    {outputIndex:0, inputIndex:13, filters:[{index:12, value:"Stem.?Changing"}]},
-                    {outputIndex:0, inputIndex:14, filters:[{index:12, value:"Stem.?Changing"}]},
-                    {outputIndex:0, inputIndex:15, filters:[{index:12, value:"Stem.?Changing"}]},
-                    {outputIndex:0, inputIndex:16, filters:[{index:12, value:"Stem.?Changing"}]},
-                    {outputIndex:0, inputIndex:17, filters:[{index:12, value:"Stem.?Changing"}]},
-                    {outputIndex:0, inputIndex:19, filters:[{index:18, value:"Stem.?Changing"}]},
-                    {outputIndex:0, inputIndex:20, filters:[{index:18, value:"Stem.?Changing"}]},
-                    {outputIndex:0, inputIndex:21, filters:[{index:18, value:"Stem.?Changing"}]},
-                    {outputIndex:0, inputIndex:22, filters:[{index:18, value:"Stem.?Changing"}]},
-                    {outputIndex:0, inputIndex:23, filters:[{index:18, value:"Stem.?Changing"}]},
-                    {outputIndex:0, inputIndex:25, filters:[{index:24, value:"Stem.?Changing"}]},
-                    {outputIndex:0, inputIndex:26, filters:[{index:24, value:"Stem.?Changing"}]},
-                    {outputIndex:0, inputIndex:27, filters:[{index:24, value:"Stem.?Changing"}]},
-                    {outputIndex:0, inputIndex:28, filters:[{index:24, value:"Stem.?Changing"}]},
-                    {outputIndex:0, inputIndex:29, filters:[{index:24, value:"Stem.?Changing"}]},
-                    {outputIndex:0, inputIndex:31, filters:[{index:30, value:"Stem.?Changing"}]},
-                    {outputIndex:0, inputIndex:32, filters:[{index:30, value:"Stem.?Changing"}]},
-                    {outputIndex:0, inputIndex:33, filters:[{index:30, value:"Stem.?Changing"}]},
-                    {outputIndex:0, inputIndex:34, filters:[{index:30, value:"Stem.?Changing"}]},
-                    {outputIndex:0, inputIndex:35, filters:[{index:30, value:"Stem.?Changing"}]},
+                    {outputIndex:0, inputIndex:03, filters:[{index:02, value:"Stem Changing"}]},
+                    {outputIndex:0, inputIndex:05, filters:[{index:04, value:"Stem Changing"}]},
+                    {outputIndex:0, inputIndex:07, filters:[{index:06, value:"Stem Changing"}]},
+                    {outputIndex:0, inputIndex:08, filters:[{index:06, value:"Stem Changing"}]},
+                    {outputIndex:0, inputIndex:09, filters:[{index:06, value:"Stem Changing"}]},
+                    {outputIndex:0, inputIndex:10, filters:[{index:06, value:"Stem Changing"}]},
+                    {outputIndex:0, inputIndex:11, filters:[{index:06, value:"Stem Changing"}]},
+                    {outputIndex:0, inputIndex:13, filters:[{index:12, value:"Stem Changing"}]},
+                    {outputIndex:0, inputIndex:14, filters:[{index:12, value:"Stem Changing"}]},
+                    {outputIndex:0, inputIndex:15, filters:[{index:12, value:"Stem Changing"}]},
+                    {outputIndex:0, inputIndex:16, filters:[{index:12, value:"Stem Changing"}]},
+                    {outputIndex:0, inputIndex:17, filters:[{index:12, value:"Stem Changing"}]},
+                    {outputIndex:0, inputIndex:19, filters:[{index:18, value:"Stem Changing"}]},
+                    {outputIndex:0, inputIndex:20, filters:[{index:18, value:"Stem Changing"}]},
+                    {outputIndex:0, inputIndex:21, filters:[{index:18, value:"Stem Changing"}]},
+                    {outputIndex:0, inputIndex:22, filters:[{index:18, value:"Stem Changing"}]},
+                    {outputIndex:0, inputIndex:23, filters:[{index:18, value:"Stem Changing"}]},
+                    {outputIndex:0, inputIndex:25, filters:[{index:24, value:"Stem Changing"}]},
+                    {outputIndex:0, inputIndex:26, filters:[{index:24, value:"Stem Changing"}]},
+                    {outputIndex:0, inputIndex:27, filters:[{index:24, value:"Stem Changing"}]},
+                    {outputIndex:0, inputIndex:28, filters:[{index:24, value:"Stem Changing"}]},
+                    {outputIndex:0, inputIndex:29, filters:[{index:24, value:"Stem Changing"}]},
+                    {outputIndex:0, inputIndex:31, filters:[{index:30, value:"Stem Changing"}]},
+                    {outputIndex:0, inputIndex:32, filters:[{index:30, value:"Stem Changing"}]},
+                    {outputIndex:0, inputIndex:33, filters:[{index:30, value:"Stem Changing"}]},
+                    {outputIndex:0, inputIndex:34, filters:[{index:30, value:"Stem Changing"}]},
+                    {outputIndex:0, inputIndex:35, filters:[{index:30, value:"Stem Changing"}]},
                 ];
 
                 // Filter verbs
@@ -504,33 +504,33 @@ describe("Filters", function() {
             it("Should correctly filter nonregular verbs", function() {
                 // Initialize expected
                 let expected = [
-                    {outputIndex:0, inputIndex:03, filters:[{index:02, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                    {outputIndex:0, inputIndex:05, filters:[{index:04, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                    {outputIndex:0, inputIndex:07, filters:[{index:06, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                    {outputIndex:0, inputIndex:08, filters:[{index:06, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                    {outputIndex:0, inputIndex:09, filters:[{index:06, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                    {outputIndex:0, inputIndex:10, filters:[{index:06, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                    {outputIndex:0, inputIndex:11, filters:[{index:06, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                    {outputIndex:0, inputIndex:13, filters:[{index:12, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                    {outputIndex:0, inputIndex:14, filters:[{index:12, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                    {outputIndex:0, inputIndex:15, filters:[{index:12, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                    {outputIndex:0, inputIndex:16, filters:[{index:12, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                    {outputIndex:0, inputIndex:17, filters:[{index:12, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                    {outputIndex:0, inputIndex:19, filters:[{index:18, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                    {outputIndex:0, inputIndex:20, filters:[{index:18, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                    {outputIndex:0, inputIndex:21, filters:[{index:18, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                    {outputIndex:0, inputIndex:22, filters:[{index:18, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                    {outputIndex:0, inputIndex:23, filters:[{index:18, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                    {outputIndex:0, inputIndex:25, filters:[{index:24, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                    {outputIndex:0, inputIndex:26, filters:[{index:24, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                    {outputIndex:0, inputIndex:27, filters:[{index:24, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                    {outputIndex:0, inputIndex:28, filters:[{index:24, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                    {outputIndex:0, inputIndex:29, filters:[{index:24, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                    {outputIndex:0, inputIndex:31, filters:[{index:30, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                    {outputIndex:0, inputIndex:32, filters:[{index:30, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                    {outputIndex:0, inputIndex:33, filters:[{index:30, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                    {outputIndex:0, inputIndex:34, filters:[{index:30, value:"Irregular|Stem.?Changing|Orthographic"}]},
-                    {outputIndex:0, inputIndex:35, filters:[{index:30, value:"Irregular|Stem.?Changing|Orthographic"}]},
+                    {outputIndex:0, inputIndex:03, filters:[{index:02, value:"Irregular|Stem Changing|Orthographic"}]},
+                    {outputIndex:0, inputIndex:05, filters:[{index:04, value:"Irregular|Stem Changing|Orthographic"}]},
+                    {outputIndex:0, inputIndex:07, filters:[{index:06, value:"Irregular|Stem Changing|Orthographic"}]},
+                    {outputIndex:0, inputIndex:08, filters:[{index:06, value:"Irregular|Stem Changing|Orthographic"}]},
+                    {outputIndex:0, inputIndex:09, filters:[{index:06, value:"Irregular|Stem Changing|Orthographic"}]},
+                    {outputIndex:0, inputIndex:10, filters:[{index:06, value:"Irregular|Stem Changing|Orthographic"}]},
+                    {outputIndex:0, inputIndex:11, filters:[{index:06, value:"Irregular|Stem Changing|Orthographic"}]},
+                    {outputIndex:0, inputIndex:13, filters:[{index:12, value:"Irregular|Stem Changing|Orthographic"}]},
+                    {outputIndex:0, inputIndex:14, filters:[{index:12, value:"Irregular|Stem Changing|Orthographic"}]},
+                    {outputIndex:0, inputIndex:15, filters:[{index:12, value:"Irregular|Stem Changing|Orthographic"}]},
+                    {outputIndex:0, inputIndex:16, filters:[{index:12, value:"Irregular|Stem Changing|Orthographic"}]},
+                    {outputIndex:0, inputIndex:17, filters:[{index:12, value:"Irregular|Stem Changing|Orthographic"}]},
+                    {outputIndex:0, inputIndex:19, filters:[{index:18, value:"Irregular|Stem Changing|Orthographic"}]},
+                    {outputIndex:0, inputIndex:20, filters:[{index:18, value:"Irregular|Stem Changing|Orthographic"}]},
+                    {outputIndex:0, inputIndex:21, filters:[{index:18, value:"Irregular|Stem Changing|Orthographic"}]},
+                    {outputIndex:0, inputIndex:22, filters:[{index:18, value:"Irregular|Stem Changing|Orthographic"}]},
+                    {outputIndex:0, inputIndex:23, filters:[{index:18, value:"Irregular|Stem Changing|Orthographic"}]},
+                    {outputIndex:0, inputIndex:25, filters:[{index:24, value:"Irregular|Stem Changing|Orthographic"}]},
+                    {outputIndex:0, inputIndex:26, filters:[{index:24, value:"Irregular|Stem Changing|Orthographic"}]},
+                    {outputIndex:0, inputIndex:27, filters:[{index:24, value:"Irregular|Stem Changing|Orthographic"}]},
+                    {outputIndex:0, inputIndex:28, filters:[{index:24, value:"Irregular|Stem Changing|Orthographic"}]},
+                    {outputIndex:0, inputIndex:29, filters:[{index:24, value:"Irregular|Stem Changing|Orthographic"}]},
+                    {outputIndex:0, inputIndex:31, filters:[{index:30, value:"Irregular|Stem Changing|Orthographic"}]},
+                    {outputIndex:0, inputIndex:32, filters:[{index:30, value:"Irregular|Stem Changing|Orthographic"}]},
+                    {outputIndex:0, inputIndex:33, filters:[{index:30, value:"Irregular|Stem Changing|Orthographic"}]},
+                    {outputIndex:0, inputIndex:34, filters:[{index:30, value:"Irregular|Stem Changing|Orthographic"}]},
+                    {outputIndex:0, inputIndex:35, filters:[{index:30, value:"Irregular|Stem Changing|Orthographic"}]},
                 ];
 
                 // Filter verbs