Fixes after rebase

Author: defuz

src/exec.rs

@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use std::collections::HashMap;
+use std::sync::Arc;
+
 use backtrack::{self, Backtrack};
 use dfa::{self, Dfa, DfaResult};
 use input::{ByteInput, CharInput};
@@ -375,6 +378,12 @@ impl Exec {
         &self.prog.cap_names
     }
 
+    /// Return a reference to named groups mapping (from group name to
+    /// group position).
+    pub fn named_groups(&self) -> &Arc<HashMap<String, usize>> {
+        &self.prog.named_groups
+    }
+
     /// Return a fresh allocation for storing all possible captures in the
     /// underlying regular expression.
     pub fn alloc_captures(&self) -> Vec<Option<usize>> {

src/program.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::{char, cmp};
 use std::collections::HashMap;
 use std::sync::Arc;
 
@@ -122,10 +121,17 @@ impl ProgramBuilder {
             insts.anchored_begin(),
             insts.anchored_end(),
         );
+        let mut named_groups = HashMap::new();
+        for (i, name) in cap_names.iter().enumerate() {
+            if let Some(ref name) = *name {
+                named_groups.insert(name.to_owned(), i);
+            }
+        }
         Ok(Program {
             original: self.re,
             insts: insts,
             cap_names: cap_names,
+            named_groups: Arc::new(named_groups),
             prefixes: prefixes,
             anchored_begin: anchored_begin,
             anchored_end: anchored_end,

src/re.rs

@@ -820,8 +820,8 @@ impl NamedGroups {
         match *regex {
             Regex::Native(ExNative { ref groups, .. }) =>
                 NamedGroups::Native(groups),
-            Regex::Dynamic(Program { ref named_groups, .. }) =>
-                NamedGroups::Dynamic(named_groups.clone())
+            Regex::Dynamic(ref exec) =>
+                NamedGroups::Dynamic(exec.named_groups().clone())
         }
     }