go/hcl
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hcl,json: fix list and object ordering

Browse Source
This commit is contained in:
Mitchell Hashimoto 2014-08-04 21:53:39 -07:00
parent 33c2953c5b
commit 398c583f25
4 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hcl/parse.y
View File

@ -52,9 +52,9 @@ objectlist:
{ {
$$ = []ast.AssignmentNode{$1} $$ = []ast.AssignmentNode{$1}
} }
| objectitem objectlist | objectlist objectitem
{ {
$$ = append($2, $1) $$ = append($1, $2)
} }
object: object:

28
hcl/y.go
View File

@ -72,27 +72,27 @@ const hclPrivate = 57344
var hclTokenNames []string var hclTokenNames []string
var hclStates []string var hclStates []string
const hclLast = 42 const hclLast = 46
var hclAct = []int{ var hclAct = []int{
24, 18, 20, 28, 32, 30, 2, 15, 19, 12, 24, 3, 18, 20, 8, 32, 28, 2, 15, 19,
8, 17, 4, 31, 9, 7, 10, 13, 22, 21, 12, 9, 17, 4, 31, 4, 7, 33, 7, 30,
7, 29, 12, 20, 20, 25, 16, 33, 26, 19, 21, 22, 29, 8, 13, 20, 20, 7, 10, 12,
19, 4, 5, 34, 7, 14, 1, 27, 6, 11, 26, 19, 19, 34, 4, 25, 5, 7, 16, 1,
3, 23, 27, 6, 23, 11, 0, 14,
} }
var hclPact = []int{ var hclPact = []int{
25, -1000, -1000, 25, 7, -1000, 11, -1000, -1000, -2, 28, -1000, 28, -1000, 4, -1000, 18, -1000, -1000, -1,
-1000, -1000, 6, -1000, -1000, -1000, -1000, 19, -12, 20, -1000, -1000, 9, -1000, -1000, -1000, -1000, 21, -9, 22,
-1000, -7, -1000, -1, -1000, -1000, -1000, -1000, 23, -1000, -1000, 7, -1000, 0, -1000, -1000, -1000, -1000, 13, -1000,
-1000, -1000, 19, -1000, -1000, -1000, -1000, 21, -1000, -1000,
} }
var hclPgo = []int{ var hclPgo = []int{
0, 25, 41, 6, 40, 32, 0, 1, 16, 38, 0, 35, 42, 7, 1, 36, 0, 2, 28, 41,
37, 36, 40, 39,
} }
var hclR1 = []int{ var hclR1 = []int{
@ -108,7 +108,7 @@ var hclR2 = []int{
} }
var hclChk = []int{ var hclChk = []int{
-1000, -11, -3, -4, 6, -5, -9, 9, -3, 7, -1000, -11, -3, -4, 6, -5, -9, 9, -4, 7,
-8, -5, 11, 6, -1, 9, -8, 13, -7, 10, -8, -5, 11, 6, -1, 9, -8, 13, -7, 10,
4, -3, 12, -2, -6, -1, 9, -10, 15, -7, 4, -3, 12, -2, -6, -1, 9, -10, 15, -7,
12, 14, 5, 4, -6, 12, 14, 5, 4, -6,
@ -374,7 +374,7 @@ hcldefault:
case 3: case 3:
//line parse.y:56 //line parse.y:56
{ {
hclVAL.alist = append(hclS[hclpt-0].alist, hclS[hclpt-1].aitem) hclVAL.alist = append(hclS[hclpt-1].alist, hclS[hclpt-0].aitem)
} }
case 4: case 4:
//line parse.y:62 //line parse.y:62

8
json/parse.y
View File

@ -61,9 +61,9 @@ members:
{ {
$$ = []ast.AssignmentNode{$1} $$ = []ast.AssignmentNode{$1}
} }
| pair COMMA members | members COMMA pair
{ {
$$ = append($3, $1) $$ = append($1, $3)
} }
pair: pair:
@ -132,9 +132,9 @@ elements:
{ {
$$ = []ast.Node{$1} $$ = []ast.Node{$1}
} }
| value COMMA elements | elements COMMA value
{ {
$$ = append($3, $1) $$ = append($1, $3)
} }
number: number:

30
json/y.go
View File

@ -84,23 +84,23 @@ const jsonLast = 45
var jsonAct = []int{ var jsonAct = []int{
27, 23, 25, 20, 23, 31, 8, 13, 3, 3, 12, 23, 20, 25, 23, 3, 7, 13, 3, 10,
21, 26, 17, 18, 19, 22, 23, 7, 22, 5, 21, 26, 17, 18, 19, 22, 30, 23, 22, 7,
28, 7, 13, 3, 4, 21, 29, 17, 18, 19, 1, 5, 28, 13, 3, 29, 21, 32, 17, 18,
22, 12, 32, 33, 11, 9, 10, 30, 15, 2, 19, 22, 9, 33, 6, 31, 15, 2, 8, 24,
1, 24, 14, 6, 16, 27, 4, 14, 16, 11,
} }
var jsonPact = []int{ var jsonPact = []int{
-2, -1000, -1000, 7, -6, -1000, 29, 31, -1000, 11, -6, -1000, -1000, 9, 26, -1000, -1000, 4, -1000, -4,
12, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 13, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-17, -3, 0, -1000, -1000, 33, -1000, -9, 26, -1000, -16, -3, 0, -1000, -1000, 12, -1000, 21, -1000, -1000,
-1000, -1000, 12, -1000, -1000, -1000, 13, -1000,
} }
var jsonPgo = []int{ var jsonPgo = []int{
0, 44, 43, 20, 42, 24, 0, 3, 38, 41, 0, 43, 34, 0, 42, 41, 40, 2, 36, 39,
40, 20,
} }
var jsonR1 = []int{ var jsonR1 = []int{
@ -117,9 +117,9 @@ var jsonR2 = []int{
var jsonChk = []int{ var jsonChk = []int{
-1000, -10, -8, 11, -5, 12, -2, 10, 12, 6, -1000, -10, -8, 11, -5, 12, -2, 10, 12, 6,
5, -5, -3, 10, -4, -8, -1, 15, 16, 17, 5, -2, -3, 10, -4, -8, -1, 15, 16, 17,
-7, 13, 18, 4, -9, 19, 14, -6, -3, -7, -7, 13, 18, 4, -9, 19, 14, -6, -3, -7,
4, 14, 6, -6, 4, 14, 6, -3,
} }
var jsonDef = []int{ var jsonDef = []int{
@ -390,7 +390,7 @@ jsondefault:
case 5: case 5:
//line parse.y:65 //line parse.y:65
{ {
jsonVAL.klist = append(jsonS[jsonpt-0].klist, jsonS[jsonpt-2].assign) jsonVAL.klist = append(jsonS[jsonpt-2].klist, jsonS[jsonpt-0].assign)
} }
case 6: case 6:
//line parse.y:71 //line parse.y:71
@ -465,7 +465,7 @@ jsondefault:
case 17: case 17:
//line parse.y:136 //line parse.y:136
{ {
jsonVAL.list = append(jsonS[jsonpt-0].list, jsonS[jsonpt-2].item) jsonVAL.list = append(jsonS[jsonpt-2].list, jsonS[jsonpt-0].item)
} }
case 18: case 18:
//line parse.y:142 //line parse.y:142