factor out interpolation

ljharb · Apr 15, 2013 · 1b21b01 · 1b21b01
1 parent 5891471
commit 1b21b01
Showing 1 changed file with 11 additions and 13 deletions.
diff --git a/index.js b/index.js
@@ -23,23 +23,21 @@ exports.parse = function (s, env) {
                 ;
             }
             else if (/^"/.test(s)) {
-                return s
-                    .replace(/^"|"$/g, '')
-                    .replace(/\\(["'\\$`(){}!#&*|])/g, '$1')
-                    .replace(/\$(\w+)/g, getVar)
-                    .replace(/\${(\w+)}/g, getVar)
-                ;
-            }
-            else {
-                return s
-                    .replace(/\\([ "'\\$`(){}!#&*|])/g, '$1')
-                    .replace(/\$(\w+)/g, getVar)
-                    .replace(/\${(\w+)}/g, getVar)
-                ;
+                return interpolate(s.replace(/^"|"$/g, ''))
             }
+            else return interpolate(s);
         })
     ;
+
     function getVar (_, x) {
         return String(env[x])
     }
+
+    function interpolate (s) {
+        return s
+            .replace(/\\([ "'\\$`(){}!#&*|])/g, '$1')
+            .replace(/\$(\w+)/g, getVar)
+            .replace(/\${(\w+)}/g, getVar)
+        ;
+    }
 };