From d3204d35269819985934bffe34b7db1320f409cc Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Fri, 5 Sep 2014 18:41:12 -0700
Subject: [PATCH] Include '_' in '\w' regex character class

---
 spec/compiler/prepare_grammar/parse_regex_spec.cc | 2 +-
 src/compiler/prepare_grammar/parse_regex.cc       | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/spec/compiler/prepare_grammar/parse_regex_spec.cc b/spec/compiler/prepare_grammar/parse_regex_spec.cc
index 2b1f530b..df094583 100644
--- a/spec/compiler/prepare_grammar/parse_regex_spec.cc
+++ b/spec/compiler/prepare_grammar/parse_regex_spec.cc
@@ -35,7 +35,7 @@ describe("parse_regex", []() {
                 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
                 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
                 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
-                '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+                '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '_',
               }),
               character({ '-' }),
               character({ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' }) })
diff --git a/src/compiler/prepare_grammar/parse_regex.cc b/src/compiler/prepare_grammar/parse_regex.cc
index 1d400ed7..3dba5d96 100644
--- a/src/compiler/prepare_grammar/parse_regex.cc
+++ b/src/compiler/prepare_grammar/parse_regex.cc
@@ -174,8 +174,11 @@ class PatternParser {
       case 'a':
         return CharacterSet().include('a', 'z').include('A', 'Z');
       case 'w':
-        return CharacterSet().include('a', 'z').include('A', 'Z').include('0',
-                                                                          '9');
+        return CharacterSet()
+            .include('a', 'z')
+            .include('A', 'Z')
+            .include('0', '9')
+            .include('_');
       case 'd':
         return CharacterSet().include('0', '9');
       case 't':