config/lang: add (expr) for order of ops

hashicorp · Feb 26, 2015 · 3c4a036 · VladRassokhin · Jun 8, 2015 · 3c4a036
1 parent 6750318
commit 3c4a036
Show file tree

Hide file tree

Showing 4 changed files with 162 additions and 101 deletions.
diff --git a/config/lang/eval_test.go b/config/lang/eval_test.go
@@ -95,6 +95,22 @@ func TestEval(t *testing.T) {
 			ast.TypeString,
 		},
 
+		{
+			"foo ${42+2*2}",
+			nil,
+			false,
+			"foo 88",
+			ast.TypeString,
+		},
+
+		{
+			"foo ${42+(2*2)}",
+			nil,
+			false,
+			"foo 46",
+			ast.TypeString,
+		},
+
 		{
 			"foo ${bar+1}",
 			&ast.BasicScope{

diff --git a/config/lang/lang.y b/config/lang/lang.y
@@ -98,7 +98,11 @@ interpolation:
     }
 
 expr:
-    literalModeTop
+    PAREN_LEFT expr PAREN_RIGHT
+    {
+        $$ = $2
+    }
+|   literalModeTop
     {
         $$ = $1
     }

diff --git a/config/lang/y.go b/config/lang/y.go
@@ -50,7 +50,7 @@ const parserEofCode = 1
 const parserErrCode = 2
 const parserMaxDepth = 200
 
-//line lang.y:161
+//line lang.y:165
 
 //line yacctab:1
 var parserExca = []int{
@@ -59,51 +59,51 @@ var parserExca = []int{
 	-2, 0,
 }
 
-const parserNprod = 18
+const parserNprod = 19
 const parserPrivate = 57344
 
 var parserTokenNames []string
 var parserStates []string
 
-const parserLast = 26
+const parserLast = 30
 
 var parserAct = []int{
 
-	9, 7, 7, 15, 3, 20, 21, 8, 14, 13,
-	11, 12, 6, 6, 15, 8, 17, 19, 16, 10,
-	2, 1, 22, 18, 4, 5,
+	9, 20, 16, 16, 7, 7, 3, 18, 10, 8,
+	1, 17, 14, 12, 13, 6, 6, 19, 8, 22,
+	15, 23, 24, 11, 2, 25, 16, 21, 4, 5,
 }
 var parserPact = []int{
 
-	-2, -1000, -2, -1000, -1000, -1000, -1000, -3, -1000, 3,
-	-2, -1000, -1000, 10, -1000, -3, -3, -1000, -4, -8,
-	-1000, -3, -8,
+	1, -1000, 1, -1000, -1000, -1000, -1000, 0, -1000, 15,
+	0, 1, -1000, -1000, -1, -1000, 0, -8, 0, -1000,
+	-1000, 12, -9, -1000, 0, -9,
 }
 var parserPgo = []int{
 
-	0, 0, 25, 24, 19, 4, 23, 21,
+	0, 0, 29, 28, 23, 6, 27, 10,
 }
 var parserR1 = []int{
 
 	0, 7, 7, 4, 4, 5, 5, 2, 1, 1,
-	1, 1, 1, 1, 6, 6, 6, 3,
+	1, 1, 1, 1, 1, 6, 6, 6, 3,
 }
 var parserR2 = []int{
 
-	0, 0, 1, 1, 2, 1, 1, 3, 1, 1,
-	1, 3, 1, 4, 0, 3, 1, 1,
+	0, 0, 1, 1, 2, 1, 1, 3, 3, 1,
+	1, 1, 3, 1, 4, 0, 3, 1, 1,
 }
 var parserChk = []int{
 
 	-1000, -7, -4, -5, -3, -2, 15, 4, -5, -1,
-	-4, 13, 14, 12, 5, 11, 8, -1, -6, -1,
-	9, 10, -1,
+	8, -4, 13, 14, 12, 5, 11, -1, 8, -1,
+	9, -6, -1, 9, 10, -1,
 }
 var parserDef = []int{
 
-	1, -2, 2, 3, 5, 6, 17, 0, 4, 0,
-	8, 9, 10, 12, 7, 0, 14, 11, 0, 16,
-	13, 0, 15,
+	1, -2, 2, 3, 5, 6, 18, 0, 4, 0,
+	0, 9, 10, 11, 13, 7, 0, 0, 15, 12,
+	8, 0, 17, 14, 0, 16,
 }
 var parserTok1 = []int{
 
@@ -412,62 +412,67 @@ parserdefault:
 	case 8:
 		//line lang.y:102
 		{
-			parserVAL.node = parserS[parserpt-0].node
+			parserVAL.node = parserS[parserpt-1].node
 		}
 	case 9:
 		//line lang.y:106
+		{
+			parserVAL.node = parserS[parserpt-0].node
+		}
+	case 10:
+		//line lang.y:110
 		{
 			parserVAL.node = &ast.LiteralNode{
 				Value: parserS[parserpt-0].token.Value.(int),
 				Typex: ast.TypeInt,
 				Posx:  parserS[parserpt-0].token.Pos,
 			}
 		}
-	case 10:
-		//line lang.y:114
+	case 11:
+		//line lang.y:118
 		{
 			parserVAL.node = &ast.LiteralNode{
 				Value: parserS[parserpt-0].token.Value.(float64),
 				Typex: ast.TypeFloat,
 				Posx:  parserS[parserpt-0].token.Pos,
 			}
 		}
-	case 11:
-		//line lang.y:122
+	case 12:
+		//line lang.y:126
 		{
 			parserVAL.node = &ast.Arithmetic{
 				Op:    parserS[parserpt-1].token.Value.(ast.ArithmeticOp),
 				Exprs: []ast.Node{parserS[parserpt-2].node, parserS[parserpt-0].node},
 				Posx:  parserS[parserpt-2].node.Pos(),
 			}
 		}
-	case 12:
-		//line lang.y:130
-		{
-			parserVAL.node = &ast.VariableAccess{Name: parserS[parserpt-0].token.Value.(string), Posx: parserS[parserpt-0].token.Pos}
-		}
 	case 13:
 		//line lang.y:134
 		{
-			parserVAL.node = &ast.Call{Func: parserS[parserpt-3].token.Value.(string), Args: parserS[parserpt-1].nodeList, Posx: parserS[parserpt-3].token.Pos}
+			parserVAL.node = &ast.VariableAccess{Name: parserS[parserpt-0].token.Value.(string), Posx: parserS[parserpt-0].token.Pos}
 		}
 	case 14:
-		//line lang.y:139
+		//line lang.y:138
 		{
-			parserVAL.nodeList = nil
+			parserVAL.node = &ast.Call{Func: parserS[parserpt-3].token.Value.(string), Args: parserS[parserpt-1].nodeList, Posx: parserS[parserpt-3].token.Pos}
 		}
 	case 15:
 		//line lang.y:143
 		{
-			parserVAL.nodeList = append(parserS[parserpt-2].nodeList, parserS[parserpt-0].node)
+			parserVAL.nodeList = nil
 		}
 	case 16:
 		//line lang.y:147
 		{
-			parserVAL.nodeList = append(parserVAL.nodeList, parserS[parserpt-0].node)
+			parserVAL.nodeList = append(parserS[parserpt-2].nodeList, parserS[parserpt-0].node)
 		}
 	case 17:
-		//line lang.y:153
+		//line lang.y:151
+		{
+			parserVAL.nodeList = append(parserVAL.nodeList, parserS[parserpt-0].node)
+		}
+	case 18:
+		//line lang.y:157
 		{
 			parserVAL.node = &ast.LiteralNode{
 				Value: parserS[parserpt-0].token.Value.(string),
-Original file line number
+Diff line change
@@ Expand Up / @@ -98,7 +98,11 @@ interpolation: @@
         }
     expr:
-        literalModeTop
+        PAREN_LEFT expr PAREN_RIGHT
+        {
+            $$ = $2
+        }
+    |   literalModeTop
         {
             $$ = $1
         }
@@ Expand Down @@