fix rep

nissy · Jun 28, 2019 · 4e77ea7 · 4e77ea7
1 parent e151fe6
commit 4e77ea7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -20,10 +20,10 @@ glossary:
     title: S
     GlossList: 
       GlossEntry: 
-        ID: "$ID"
-        SortAs: "$ID"
+        ID: "${ID}"
+        SortAs: "${ID}"
         GlossTerm: "Standard Generalized Markup Language"
-        Acronym: "$ID"
+        Acronym: "${ID}"
         Abbrev: "ISO 8879:1986"
         GlossDef: 
           para: "A meta-markup language, used to create markup languages such as DocBook."
@@ -97,29 +97,29 @@ type (
 
 func main() {
     data := ABC{
-        A: "$A",
+        A: "${A}",
         B: []string{
-            "$B",
-            "$B",
-            "$B",
+            "${B}",
+            "${B}",
+            "${B}",
         },
         D: &D{
             F: &F{
                 I: []*I{
                     {
-                        J: "$J",
+                        J: "${J}",
                     },
                     {
-                        J: "$J",
+                        J: "${J}",
                         K: []map[int]string{
                             {
-                                1: "$K",
-                                2: "$K",
+                                1: "${K}",
+                                2: "${K}",
                             },
                         },
                         L: []string{
-                            "$L",
-                            "$L",
+                            "${L}",
+                            "${L}",
                         },
                     },
                 },

diff --git a/envexpand.go b/envexpand.go
@@ -14,7 +14,7 @@ type (
 )
 
 var (
-	rep = regexp.MustCompile(`\$[a-zA-Z_]{1,}[a-zA-Z0-9_]{0,}|\$\{[a-zA-Z_]{1,}[a-zA-Z0-9_]{0,}\}`)
+	rep = regexp.MustCompile(`\$\{[a-zA-Z_]{1,}[a-zA-Z0-9_]{0,}\}`)
 )
 
 func CompileRegexp(s string) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,7 @@ type ( @@
     )
     var (
-    	rep = regexp.MustCompile(`\$[a-zA-Z_]{1,}[a-zA-Z0-9_]{0,}|\$\{[a-zA-Z_]{1,}[a-zA-Z0-9_]{0,}\}`)
+    	rep = regexp.MustCompile(`\$\{[a-zA-Z_]{1,}[a-zA-Z0-9_]{0,}\}`)
     )
     func CompileRegexp(s string) {
@@ Expand Down @@