luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

go through all errorfs

Browse source
This commit is contained in:
Alexander Wang 2024-11-23 18:56:18 -08:00
parent c84d433275
commit 062faa41b8
No known key found for this signature in database
GPG key ID: D89FA31966BDBECE
26 changed files with 588 additions and 402 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
d2compiler/compile.go
View file

@ -120,7 +120,7 @@ func (c *compiler) compileBoardsField(g *d2graph.Graph, ir *d2ir.Map, fieldName
m = &d2ir.Map{}
}
if g.GetBoard(f.Name.ScalarString()) != nil {
c.errorf(f.References[0].AST(), "board name %v already used by another board", f.Name)
c.errorf(f.References[0].AST(), "board name %v already used by another board", f.Name.ScalarString())
continue
}
g2 := d2graph.NewGraph()
@ -301,7 +301,7 @@ func (c *compiler) compileField(obj *d2graph.Object, f *d2ir.Field) {
keyword := strings.ToLower(f.Name.ScalarString())
_, isStyleReserved := d2ast.StyleKeywords[keyword]
if isStyleReserved && f.Name.IsUnquoted() {
c.errorf(f.LastRef().AST(), "%v must be style.%v", f.Name, f.Name)
c.errorf(f.LastRef().AST(), "%v must be style.%v", f.Name.ScalarString(), f.Name.ScalarString())
return
}
_, isReserved := d2ast.SimpleReservedKeywords[keyword]
@ -317,7 +317,7 @@ func (c *compiler) compileField(obj *d2graph.Object, f *d2ir.Field) {
}
for _, cf := range classesField.Map().Fields {
if _, ok := d2ast.ReservedKeywords[cf.Name.ScalarString()]; !(ok && f.Name.IsUnquoted()) {
c.errorf(cf.LastRef().AST(), "%s is an invalid class field, must be reserved keyword", cf.Name)
c.errorf(cf.LastRef().AST(), "%s is an invalid class field, must be reserved keyword", cf.Name.ScalarString())
}
if cf.Name.ScalarString() == "class" && cf.Name.IsUnquoted() {
c.errorf(cf.LastRef().AST(), `"class" cannot appear within "classes"`)
@ -329,7 +329,7 @@ func (c *compiler) compileField(obj *d2graph.Object, f *d2ir.Field) {
} else if f.Name.ScalarString() == "vars" && f.Name.IsUnquoted() {
return
} else if (f.Name.ScalarString() == "source-arrowhead" || f.Name.ScalarString() == "target-arrowhead") && f.Name.IsUnquoted() {
c.errorf(f.LastRef().AST(), `%#v can only be used on connections`, f.Name)
c.errorf(f.LastRef().AST(), `%#v can only be used on connections`, f.Name.ScalarString())
return
} else if isReserved {
@ -468,7 +468,7 @@ func (c *compiler) compilePosition(attrs *d2graph.Attributes, f *d2ir.Field) {
}
} else {
if f.LastPrimaryKey() != nil {
c.errorf(f.LastPrimaryKey(), `unexpected field %s`, f.Name)
c.errorf(f.LastPrimaryKey(), `unexpected field %s`, f.Name.ScalarString())
}
}
}
@ -506,7 +506,7 @@ func (c *compiler) compileReserved(attrs *d2graph.Attributes, f *d2ir.Field) {
case "label", "icon":
c.compilePosition(attrs, f)
default:
c.errorf(f.LastPrimaryKey(), "reserved field %v does not accept composite", f.Name)
c.errorf(f.LastPrimaryKey(), "reserved field %v does not accept composite", f.Name.ScalarString())
}
}
return
@ -697,7 +697,7 @@ func (c *compiler) compileStyle(attrs *d2graph.Attributes, m *d2ir.Map) {
func (c *compiler) compileStyleField(attrs *d2graph.Attributes, f *d2ir.Field) {
if _, ok := d2ast.StyleKeywords[strings.ToLower(f.Name.ScalarString())]; !(ok && f.Name.IsUnquoted()) {
c.errorf(f.LastRef().AST(), `invalid style keyword: "%s"`, f.Name)
c.errorf(f.LastRef().AST(), `invalid style keyword: "%s"`, f.Name.ScalarString())
return
}
if f.Primary() == nil {
@ -839,7 +839,7 @@ func (c *compiler) compileEdgeField(edge *d2graph.Edge, f *d2ir.Field) {
_, isStyleReserved := d2ast.StyleKeywords[keyword]
isStyleReserved = isStyleReserved && f.Name.IsUnquoted()
if isStyleReserved {
c.errorf(f.LastRef().AST(), "%v must be style.%v", f.Name, f.Name)
c.errorf(f.LastRef().AST(), "%v must be style.%v", f.Name.ScalarString(), f.Name.ScalarString())
return
}
_, isReserved := d2ast.SimpleReservedKeywords[keyword]
@ -1546,11 +1546,11 @@ FOR:
case "AB5":
themeOverrides.AB5 = go2.Pointer(f.Primary().Value.ScalarString())
default:
err.Errors = append(err.Errors, d2parser.Errorf(f.LastPrimaryKey(), fmt.Sprintf(`"%s" is not a valid theme code`, f.Name)).(d2ast.Error))
err.Errors = append(err.Errors, d2parser.Errorf(f.LastPrimaryKey(), fmt.Sprintf(`"%s" is not a valid theme code`, f.Name.ScalarString())).(d2ast.Error))
continue FOR
}
if !go2.Contains(color.NamedColors, strings.ToLower(f.Primary().Value.ScalarString())) && !color.ColorHexRegex.MatchString(f.Primary().Value.ScalarString()) {
err.Errors = append(err.Errors, d2parser.Errorf(f.LastPrimaryKey(), fmt.Sprintf(`expected "%s" to be a valid named color ("orange") or a hex code ("#f0ff3a")`, f.Name)).(d2ast.Error))
err.Errors = append(err.Errors, d2parser.Errorf(f.LastPrimaryKey(), fmt.Sprintf(`expected "%s" to be a valid named color ("orange") or a hex code ("#f0ff3a")`, f.Name.ScalarString())).(d2ast.Error))
}
}

14
d2ir/compile.go
View file

@ -175,7 +175,7 @@ func (c *compiler) validateConfigs(configs *Field) {
}
if NodeBoardKind(ParentMap(ParentMap(configs))) == "" {
c.errorf(configs.LastRef().AST(), `"%s" can only appear at root vars`, configs.Name)
c.errorf(configs.LastRef().AST(), `"%s" can only appear at root vars`, configs.Name.ScalarString())
return
}
@ -183,7 +183,7 @@ func (c *compiler) validateConfigs(configs *Field) {
var val string
if f.Primary() == nil {
if f.Name.ScalarString() != "theme-overrides" && f.Name.ScalarString() != "dark-theme-overrides" && f.Name.ScalarString() != "data" {
c.errorf(f.LastRef().AST(), `"%s" needs a value`, f.Name)
c.errorf(f.LastRef().AST(), `"%s" needs a value`, f.Name.ScalarString())
continue
}
} else {
@ -194,18 +194,18 @@ func (c *compiler) validateConfigs(configs *Field) {
case "sketch", "center":
_, err := strconv.ParseBool(val)
if err != nil {
c.errorf(f.LastRef().AST(), `expected a boolean for "%s", got "%s"`, f.Name, val)
c.errorf(f.LastRef().AST(), `expected a boolean for "%s", got "%s"`, f.Name.ScalarString(), val)
continue
}
case "theme-overrides", "dark-theme-overrides", "data":
if f.Map() == nil {
c.errorf(f.LastRef().AST(), `"%s" needs a map`, f.Name)
c.errorf(f.LastRef().AST(), `"%s" needs a map`, f.Name.ScalarString())
continue
}
case "theme-id", "dark-theme-id":
valInt, err := strconv.Atoi(val)
if err != nil {
c.errorf(f.LastRef().AST(), `expected an integer for "%s", got "%s"`, f.Name, val)
c.errorf(f.LastRef().AST(), `expected an integer for "%s", got "%s"`, f.Name.ScalarString(), val)
continue
}
if d2themescatalog.Find(int64(valInt)) == (d2themes.Theme{}) {
@ -215,12 +215,12 @@ func (c *compiler) validateConfigs(configs *Field) {
case "pad":
_, err := strconv.Atoi(val)
if err != nil {
c.errorf(f.LastRef().AST(), `expected an integer for "%s", got "%s"`, f.Name, val)
c.errorf(f.LastRef().AST(), `expected an integer for "%s", got "%s"`, f.Name.ScalarString(), val)
continue
}
case "layout-engine":
default:
c.errorf(f.LastRef().AST(), `"%s" is not a valid config`, f.Name)
c.errorf(f.LastRef().AST(), `"%s" is not a valid config`, f.Name.ScalarString())
}
}
}

6
testdata/d2compiler/TestCompile/escaped_id.exp.json generated vendored
View file

@ -56,8 +56,8 @@
"edges": null,
"objects": [
{
"id": "\"b\\nb\"",
"id_val": "b\nb",
"id": "b\nb",
"id_val": "b",
"references": [
{
"key": {
@ -82,7 +82,7 @@
],
"attributes": {
"label": {
"value": "b\nb"
"value": "b"
},
"labelDimensions": {
"width": 0,

15
testdata/d2compiler/TestCompile/import-link-layer-1.exp.json generated vendored
View file

@ -246,10 +246,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/y.d2,0:0:0-0:1:1",
"value": [
{
"string": "a"
"string": "a",
"raw_string": "a"
}
]
}
@ -269,10 +270,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/y.d2,0:2:2-0:6:6",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -399,10 +401,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/import-link-layer-1.d2,4:7:33-4:9:35",
"value": [
{
"string": "hi"
"string": "hi",
"raw_string": "hi"
}
]
}

5
testdata/d2compiler/TestCompile/import-link-layer-2.exp.json generated vendored
View file

@ -208,10 +208,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/import-link-layer-2.d2,3:7:24-3:9:26",
"value": [
{
"string": "hi"
"string": "hi",
"raw_string": "hi"
}
]
}

40
testdata/d2compiler/TestCompile/import-link-layer-3.exp.json generated vendored
View file

@ -246,10 +246,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/y.d2,0:0:0-0:1:1",
"value": [
{
"string": "a"
"string": "a",
"raw_string": "a"
}
]
}
@ -268,10 +269,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/y.d2,1:0:2-1:6:8",
"value": [
{
"string": "layers"
"string": "layers",
"raw_string": "layers"
}
]
}
@ -291,10 +293,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/y.d2,2:2:14-2:5:17",
"value": [
{
"string": "lol"
"string": "lol",
"raw_string": "lol"
}
]
}
@ -314,10 +317,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/y.d2,3:4:25-3:8:29",
"value": [
{
"string": "asdf"
"string": "asdf",
"raw_string": "asdf"
}
]
}
@ -337,10 +341,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/y.d2,3:9:30-3:13:34",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -463,10 +468,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/y.d2,3:4:25-3:8:29",
"value": [
{
"string": "asdf"
"string": "asdf",
"raw_string": "asdf"
}
]
}
@ -486,10 +492,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/y.d2,3:9:30-3:13:34",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -618,10 +625,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/import-link-layer-3.d2,4:7:33-4:9:35",
"value": [
{
"string": "hi"
"string": "hi",
"raw_string": "hi"
}
]
}

55
testdata/d2compiler/TestCompile/import-link-layer-4.exp.json generated vendored
View file

@ -264,10 +264,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/y.d2,0:0:0-0:1:1",
"value": [
{
"string": "a"
"string": "a",
"raw_string": "a"
}
]
}
@ -286,10 +287,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/y.d2,1:0:2-1:6:8",
"value": [
{
"string": "layers"
"string": "layers",
"raw_string": "layers"
}
]
}
@ -309,10 +311,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/y.d2,2:2:14-2:5:17",
"value": [
{
"string": "lol"
"string": "lol",
"raw_string": "lol"
}
]
}
@ -332,10 +335,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/y.d2,3:4:25-3:8:29",
"value": [
{
"string": "asdf"
"string": "asdf",
"raw_string": "asdf"
}
]
}
@ -355,10 +359,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/y.d2,3:9:30-3:13:34",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -396,10 +401,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/y.d2,5:1:52-5:2:53",
"value": [
{
"string": "z"
"string": "z",
"raw_string": "z"
}
]
}
@ -419,10 +425,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/y.d2,5:6:57-5:9:60",
"value": [
{
"string": "fjf"
"string": "fjf",
"raw_string": "fjf"
}
]
}
@ -531,10 +538,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/y.d2,3:4:25-3:8:29",
"value": [
{
"string": "asdf"
"string": "asdf",
"raw_string": "asdf"
}
]
}
@ -554,10 +562,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/y.d2,3:9:30-3:13:34",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -684,10 +693,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/y.d2,5:6:57-5:9:60",
"value": [
{
"string": "fjf"
"string": "fjf",
"raw_string": "fjf"
}
]
}
@ -788,10 +798,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/import-link-layer-4.d2,4:7:28-4:9:30",
"value": [
{
"string": "hi"
"string": "hi",
"raw_string": "hi"
}
]
}

180
testdata/d2compiler/TestCompile/import-link-underscore-1.exp.json generated vendored
View file

@ -194,10 +194,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-0:1:1",
"value": [
{
"string": "a"
"string": "a",
"raw_string": "a"
}
]
}
@ -216,10 +217,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,1:0:2-1:6:8",
"value": [
{
"string": "layers"
"string": "layers",
"raw_string": "layers"
}
]
}
@ -239,10 +241,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,2:2:14-2:3:15",
"value": [
{
"string": "b"
"string": "b",
"raw_string": "b"
}
]
}
@ -262,10 +265,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,3:4:23-3:5:24",
"value": [
{
"string": "d"
"string": "d",
"raw_string": "d"
}
]
}
@ -285,10 +289,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,3:6:25-3:10:29",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -321,10 +326,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,4:2:35-4:3:36",
"value": [
{
"string": "s"
"string": "s",
"raw_string": "s"
}
]
}
@ -344,10 +350,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,4:4:37-4:8:41",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -380,10 +387,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,6:4:59-6:10:65",
"value": [
{
"string": "layers"
"string": "layers",
"raw_string": "layers"
}
]
}
@ -403,10 +411,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,7:6:75-7:7:76",
"value": [
{
"string": "c"
"string": "c",
"raw_string": "c"
}
]
}
@ -426,10 +435,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,8:8:88-8:9:89",
"value": [
{
"string": "c"
"string": "c",
"raw_string": "c"
}
]
}
@ -449,10 +459,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,8:10:90-8:14:94",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -485,10 +496,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,9:4:102-9:5:103",
"value": [
{
"string": "z"
"string": "z",
"raw_string": "z"
}
]
}
@ -508,10 +520,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,9:6:104-9:10:108",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -544,10 +557,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,10:4:118-10:5:119",
"value": [
{
"string": "f"
"string": "f",
"raw_string": "f"
}
]
}
@ -567,10 +581,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,10:6:120-10:10:124",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -618,10 +633,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,14:2:159-14:3:160",
"value": [
{
"string": "k"
"string": "k",
"raw_string": "k"
}
]
}
@ -641,10 +657,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,15:4:168-15:5:169",
"value": [
{
"string": "k"
"string": "k",
"raw_string": "k"
}
]
}
@ -753,10 +770,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,3:4:23-3:5:24",
"value": [
{
"string": "d"
"string": "d",
"raw_string": "d"
}
]
}
@ -776,10 +794,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,3:6:25-3:10:29",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -812,10 +831,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,4:2:35-4:3:36",
"value": [
{
"string": "s"
"string": "s",
"raw_string": "s"
}
]
}
@ -835,10 +855,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,4:4:37-4:8:41",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -871,10 +892,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,6:4:59-6:10:65",
"value": [
{
"string": "layers"
"string": "layers",
"raw_string": "layers"
}
]
}
@ -894,10 +916,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,7:6:75-7:7:76",
"value": [
{
"string": "c"
"string": "c",
"raw_string": "c"
}
]
}
@ -917,10 +940,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,8:8:88-8:9:89",
"value": [
{
"string": "c"
"string": "c",
"raw_string": "c"
}
]
}
@ -940,10 +964,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,8:10:90-8:14:94",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -976,10 +1001,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,9:4:102-9:5:103",
"value": [
{
"string": "z"
"string": "z",
"raw_string": "z"
}
]
}
@ -999,10 +1025,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,9:6:104-9:10:108",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -1035,10 +1062,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,10:4:118-10:5:119",
"value": [
{
"string": "f"
"string": "f",
"raw_string": "f"
}
]
}
@ -1058,10 +1086,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,10:6:120-10:10:124",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -1257,10 +1286,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,8:8:88-8:9:89",
"value": [
{
"string": "c"
"string": "c",
"raw_string": "c"
}
]
}
@ -1280,10 +1310,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,8:10:90-8:14:94",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -1316,10 +1347,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,9:4:102-9:5:103",
"value": [
{
"string": "z"
"string": "z",
"raw_string": "z"
}
]
}
@ -1339,10 +1371,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,9:6:104-9:10:108",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -1375,10 +1408,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,10:4:118-10:5:119",
"value": [
{
"string": "f"
"string": "f",
"raw_string": "f"
}
]
}
@ -1398,10 +1432,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,10:6:120-10:10:124",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -1648,10 +1683,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,15:4:168-15:5:169",
"value": [
{
"string": "k"
"string": "k",
"raw_string": "k"
}
]
}

180
testdata/d2compiler/TestCompile/import-link-underscore-2.exp.json generated vendored
View file

@ -212,10 +212,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-0:1:1",
"value": [
{
"string": "a"
"string": "a",
"raw_string": "a"
}
]
}
@ -234,10 +235,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,1:0:2-1:6:8",
"value": [
{
"string": "layers"
"string": "layers",
"raw_string": "layers"
}
]
}
@ -257,10 +259,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,2:2:14-2:3:15",
"value": [
{
"string": "b"
"string": "b",
"raw_string": "b"
}
]
}
@ -280,10 +283,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,3:4:23-3:5:24",
"value": [
{
"string": "d"
"string": "d",
"raw_string": "d"
}
]
}
@ -303,10 +307,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,3:6:25-3:10:29",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -339,10 +344,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,4:2:35-4:3:36",
"value": [
{
"string": "s"
"string": "s",
"raw_string": "s"
}
]
}
@ -362,10 +368,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,4:4:37-4:8:41",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -398,10 +405,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,6:4:59-6:10:65",
"value": [
{
"string": "layers"
"string": "layers",
"raw_string": "layers"
}
]
}
@ -421,10 +429,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,7:6:75-7:7:76",
"value": [
{
"string": "c"
"string": "c",
"raw_string": "c"
}
]
}
@ -444,10 +453,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,8:8:88-8:9:89",
"value": [
{
"string": "c"
"string": "c",
"raw_string": "c"
}
]
}
@ -467,10 +477,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,8:10:90-8:14:94",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -503,10 +514,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,9:4:102-9:5:103",
"value": [
{
"string": "z"
"string": "z",
"raw_string": "z"
}
]
}
@ -526,10 +538,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,9:6:104-9:10:108",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -562,10 +575,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,10:4:118-10:5:119",
"value": [
{
"string": "f"
"string": "f",
"raw_string": "f"
}
]
}
@ -585,10 +599,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,10:6:120-10:10:124",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -636,10 +651,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,14:2:159-14:3:160",
"value": [
{
"string": "k"
"string": "k",
"raw_string": "k"
}
]
}
@ -659,10 +675,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,15:4:168-15:5:169",
"value": [
{
"string": "k"
"string": "k",
"raw_string": "k"
}
]
}
@ -771,10 +788,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,3:4:23-3:5:24",
"value": [
{
"string": "d"
"string": "d",
"raw_string": "d"
}
]
}
@ -794,10 +812,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,3:6:25-3:10:29",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -830,10 +849,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,4:2:35-4:3:36",
"value": [
{
"string": "s"
"string": "s",
"raw_string": "s"
}
]
}
@ -853,10 +873,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,4:4:37-4:8:41",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -889,10 +910,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,6:4:59-6:10:65",
"value": [
{
"string": "layers"
"string": "layers",
"raw_string": "layers"
}
]
}
@ -912,10 +934,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,7:6:75-7:7:76",
"value": [
{
"string": "c"
"string": "c",
"raw_string": "c"
}
]
}
@ -935,10 +958,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,8:8:88-8:9:89",
"value": [
{
"string": "c"
"string": "c",
"raw_string": "c"
}
]
}
@ -958,10 +982,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,8:10:90-8:14:94",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -994,10 +1019,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,9:4:102-9:5:103",
"value": [
{
"string": "z"
"string": "z",
"raw_string": "z"
}
]
}
@ -1017,10 +1043,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,9:6:104-9:10:108",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -1053,10 +1080,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,10:4:118-10:5:119",
"value": [
{
"string": "f"
"string": "f",
"raw_string": "f"
}
]
}
@ -1076,10 +1104,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,10:6:120-10:10:124",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -1275,10 +1304,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,8:8:88-8:9:89",
"value": [
{
"string": "c"
"string": "c",
"raw_string": "c"
}
]
}
@ -1298,10 +1328,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,8:10:90-8:14:94",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -1334,10 +1365,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,9:4:102-9:5:103",
"value": [
{
"string": "z"
"string": "z",
"raw_string": "z"
}
]
}
@ -1357,10 +1389,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,9:6:104-9:10:108",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -1393,10 +1426,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,10:4:118-10:5:119",
"value": [
{
"string": "f"
"string": "f",
"raw_string": "f"
}
]
}
@ -1416,10 +1450,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,10:6:120-10:10:124",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -1666,10 +1701,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,15:4:168-15:5:169",
"value": [
{
"string": "k"
"string": "k",
"raw_string": "k"
}
]
}

40
testdata/d2compiler/TestCompile/import-link-underscore-3.exp.json generated vendored
View file

@ -264,10 +264,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-0:1:1",
"value": [
{
"string": "a"
"string": "a",
"raw_string": "a"
}
]
}
@ -286,10 +287,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,1:0:2-1:6:8",
"value": [
{
"string": "layers"
"string": "layers",
"raw_string": "layers"
}
]
}
@ -309,10 +311,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,2:2:14-2:3:15",
"value": [
{
"string": "y"
"string": "y",
"raw_string": "y"
}
]
}
@ -332,10 +335,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/y.d2,0:0:0-0:1:1",
"value": [
{
"string": "o"
"string": "o",
"raw_string": "o"
}
]
}
@ -355,10 +359,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/y.d2,0:2:2-0:6:6",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -481,10 +486,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/y.d2,0:0:0-0:1:1",
"value": [
{
"string": "o"
"string": "o",
"raw_string": "o"
}
]
}
@ -504,10 +510,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/y.d2,0:2:2-0:6:6",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -636,10 +643,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/import-link-underscore-3.d2,5:4:31-5:5:32",
"value": [
{
"string": "b"
"string": "b",
"raw_string": "b"
}
]
}

60
testdata/d2compiler/TestCompile/import-nested-layers.exp.json generated vendored
View file

@ -194,10 +194,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-0:1:1",
"value": [
{
"string": "a"
"string": "a",
"raw_string": "a"
}
]
}
@ -216,10 +217,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,1:0:2-1:6:8",
"value": [
{
"string": "layers"
"string": "layers",
"raw_string": "layers"
}
]
}
@ -239,10 +241,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,2:2:14-2:3:15",
"value": [
{
"string": "b"
"string": "b",
"raw_string": "b"
}
]
}
@ -262,10 +265,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,3:2:21-3:3:22",
"value": [
{
"string": "d"
"string": "d",
"raw_string": "d"
}
]
}
@ -284,10 +288,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,5:2:26-5:8:32",
"value": [
{
"string": "layers"
"string": "layers",
"raw_string": "layers"
}
]
}
@ -307,10 +312,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,6:4:40-6:5:41",
"value": [
{
"string": "c"
"string": "c",
"raw_string": "c"
}
]
}
@ -330,10 +336,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,7:5:50-7:6:51",
"value": [
{
"string": "c"
"string": "c",
"raw_string": "c"
}
]
}
@ -452,10 +459,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,3:2:21-3:3:22",
"value": [
{
"string": "d"
"string": "d",
"raw_string": "d"
}
]
}
@ -474,10 +482,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,5:2:26-5:8:32",
"value": [
{
"string": "layers"
"string": "layers",
"raw_string": "layers"
}
]
}
@ -497,10 +506,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,6:4:40-6:5:41",
"value": [
{
"string": "c"
"string": "c",
"raw_string": "c"
}
]
}
@ -520,10 +530,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,7:5:50-7:6:51",
"value": [
{
"string": "c"
"string": "c",
"raw_string": "c"
}
]
}
@ -632,10 +643,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,7:5:50-7:6:51",
"value": [
{
"string": "c"
"string": "c",
"raw_string": "c"
}
]
}

5
testdata/d2compiler/TestCompile/link-board-key-nested.exp.json generated vendored
View file

@ -306,10 +306,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,5:4:47-5:6:49",
"value": [
{
"string": "yo"
"string": "yo",
"raw_string": "yo"
}
]
}

30
testdata/d2compiler/TestCompile/link-board-mixed.exp.json generated vendored
View file

@ -431,10 +431,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:11:88",
"value": [
{
"string": "the cat"
"string": "the cat",
"raw_string": "the cat"
}
]
}
@ -453,10 +454,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:15:92-5:24:101",
"value": [
{
"string": "meeeowwww"
"string": "meeeowwww",
"raw_string": "meeeowwww"
}
]
}
@ -687,10 +689,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-0:8:8",
"value": [
{
"string": "question"
"string": "question",
"raw_string": "question"
}
]
}
@ -720,10 +723,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:9:40-1:13:44",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -751,10 +755,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:13:152-11:18:157",
"value": [
{
"string": "style"
"string": "style",
"raw_string": "style"
}
]
}
@ -774,10 +779,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:19:158-11:23:162",
"value": [
{
"string": "fill"
"string": "fill",
"raw_string": "fill"
}
]
}

20
testdata/d2compiler/TestCompile/link-board-nested.exp.json generated vendored
View file

@ -290,10 +290,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:47-3:10:53",
"value": [
{
"string": "layers"
"string": "layers",
"raw_string": "layers"
}
]
}
@ -313,10 +314,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:6:63-4:7:64",
"value": [
{
"string": "x"
"string": "x",
"raw_string": "x"
}
]
}
@ -336,10 +338,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:76-5:13:81",
"value": [
{
"string": "hello"
"string": "hello",
"raw_string": "hello"
}
]
}
@ -402,10 +405,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:76-5:13:81",
"value": [
{
"string": "hello"
"string": "hello",
"raw_string": "hello"
}
]
}

5
testdata/d2compiler/TestCompile/link-board-not-board.exp.json generated vendored
View file

@ -297,10 +297,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/link-board-not-board.d2,4:4:44-4:5:45",
"value": [
{
"string": "y"
"string": "y",
"raw_string": "y"
}
]
}

20
testdata/d2compiler/TestCompile/link-board-not-found-2.exp.json generated vendored
View file

@ -258,10 +258,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/link-board-not-found-2.d2,2:8:29-2:12:33",
"value": [
{
"string": "ping"
"string": "ping",
"raw_string": "ping"
}
]
}
@ -281,10 +282,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/link-board-not-found-2.d2,3:12:49-3:16:53",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -398,10 +400,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/link-board-not-found-2.d2,7:8:94-7:12:98",
"value": [
{
"string": "pong"
"string": "pong",
"raw_string": "pong"
}
]
}
@ -421,10 +424,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/link-board-not-found-2.d2,8:12:114-8:16:118",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}

5
testdata/d2compiler/TestCompile/link-board-ok.exp.json generated vendored
View file

@ -232,10 +232,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,3:3:36-3:4:37",
"value": [
{
"string": "y"
"string": "y",
"raw_string": "y"
}
]
}

35
testdata/d2compiler/TestCompile/link-board-underscore-not-found.exp.json generated vendored
View file

@ -299,10 +299,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2,3:4:23-3:6:25",
"value": [
{
"string": "yo"
"string": "yo",
"raw_string": "yo"
}
]
}
@ -321,10 +322,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2,4:4:30-4:10:36",
"value": [
{
"string": "layers"
"string": "layers",
"raw_string": "layers"
}
]
}
@ -344,10 +346,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2,5:6:46-5:7:47",
"value": [
{
"string": "x"
"string": "x",
"raw_string": "x"
}
]
}
@ -367,10 +370,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2,6:8:59-6:13:64",
"value": [
{
"string": "hello"
"string": "hello",
"raw_string": "hello"
}
]
}
@ -390,10 +394,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2,6:14:65-6:18:69",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -516,10 +521,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2,6:8:59-6:13:64",
"value": [
{
"string": "hello"
"string": "hello",
"raw_string": "hello"
}
]
}
@ -539,10 +545,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2,6:14:65-6:18:69",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}

55
testdata/d2compiler/TestCompile/link-board-underscore.exp.json generated vendored
View file

@ -343,10 +343,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,3:3:21-3:5:23",
"value": [
{
"string": "yo"
"string": "yo",
"raw_string": "yo"
}
]
}
@ -365,10 +366,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:4:28-4:10:34",
"value": [
{
"string": "layers"
"string": "layers",
"raw_string": "layers"
}
]
}
@ -388,10 +390,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:6:44-5:7:45",
"value": [
{
"string": "x"
"string": "x",
"raw_string": "x"
}
]
}
@ -411,10 +414,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:8:57-6:13:62",
"value": [
{
"string": "hello"
"string": "hello",
"raw_string": "hello"
}
]
}
@ -434,10 +438,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:14:63-6:18:67",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -470,10 +475,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:8:90-7:11:93",
"value": [
{
"string": "hey"
"string": "hey",
"raw_string": "hey"
}
]
}
@ -493,10 +499,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:12:94-7:16:98",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -619,10 +626,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:8:57-6:13:62",
"value": [
{
"string": "hello"
"string": "hello",
"raw_string": "hello"
}
]
}
@ -642,10 +650,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:14:63-6:18:67",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -678,10 +687,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:8:90-7:11:93",
"value": [
{
"string": "hey"
"string": "hey",
"raw_string": "hey"
}
]
}
@ -701,10 +711,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:12:94-7:16:98",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}

90
testdata/d2compiler/TestCompile/link-file-underscore.exp.json generated vendored
View file

@ -113,10 +113,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,3:7:20-3:8:21",
"value": [
{
"string": "c"
"string": "c",
"raw_string": "c"
}
]
}
@ -215,10 +216,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,4:7:31-4:8:32",
"value": [
{
"string": "d"
"string": "d",
"raw_string": "d"
}
]
}
@ -238,10 +240,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,4:9:33-4:13:37",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -368,10 +371,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,6:4:62-6:5:63",
"value": [
{
"string": "l"
"string": "l",
"raw_string": "l"
}
]
}
@ -390,10 +394,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,8:2:67-8:8:73",
"value": [
{
"string": "layers"
"string": "layers",
"raw_string": "layers"
}
]
}
@ -413,10 +418,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,9:3:80-9:4:81",
"value": [
{
"string": "j"
"string": "j",
"raw_string": "j"
}
]
}
@ -436,10 +442,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,10:5:90-10:6:91",
"value": [
{
"string": "k"
"string": "k",
"raw_string": "k"
}
]
}
@ -459,10 +466,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,10:7:92-10:11:96",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -495,10 +503,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,11:5:105-11:6:106",
"value": [
{
"string": "n"
"string": "n",
"raw_string": "n"
}
]
}
@ -518,10 +527,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,11:7:107-11:11:111",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -554,10 +564,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,12:5:122-12:6:123",
"value": [
{
"string": "m"
"string": "m",
"raw_string": "m"
}
]
}
@ -577,10 +588,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,12:7:124-12:11:128",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -703,10 +715,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,10:5:90-10:6:91",
"value": [
{
"string": "k"
"string": "k",
"raw_string": "k"
}
]
}
@ -726,10 +739,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,10:7:92-10:11:96",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -762,10 +776,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,11:5:105-11:6:106",
"value": [
{
"string": "n"
"string": "n",
"raw_string": "n"
}
]
}
@ -785,10 +800,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,11:7:107-11:11:111",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -821,10 +837,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,12:5:122-12:6:123",
"value": [
{
"string": "m"
"string": "m",
"raw_string": "m"
}
]
}
@ -844,10 +861,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,12:7:124-12:11:128",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}

35
testdata/d2compiler/TestCompile/multiple-import-nested-layers.exp.json generated vendored
View file

@ -194,10 +194,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/y/x.d2,0:0:0-0:1:1",
"value": [
{
"string": "a"
"string": "a",
"raw_string": "a"
}
]
}
@ -217,10 +218,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/y/x.d2,0:2:2-0:3:3",
"value": [
{
"string": "c"
"string": "c",
"raw_string": "c"
}
]
}
@ -240,10 +242,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/y/x.d2,0:4:4-0:8:8",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -281,10 +284,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/y/x.d2,2:0:20-2:6:26",
"value": [
{
"string": "layers"
"string": "layers",
"raw_string": "layers"
}
]
}
@ -304,10 +308,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/y/x.d2,3:2:32-3:3:33",
"value": [
{
"string": "b"
"string": "b",
"raw_string": "b"
}
]
}
@ -327,10 +332,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/y/n.d2,0:0:0-0:1:1",
"value": [
{
"string": "p"
"string": "p",
"raw_string": "p"
}
]
}
@ -531,10 +537,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/y/n.d2,0:0:0-0:1:1",
"value": [
{
"string": "p"
"string": "p",
"raw_string": "p"
}
]
}

6
testdata/d2compiler/TestCompile/name-with-dot-underscore.exp.json generated vendored
View file

@ -291,8 +291,8 @@
"zIndex": 0
},
{
"id": "\"D.E\"",
"id_val": "D.E",
"id": "D.E",
"id_val": "D",
"references": [
{
"key": {
@ -317,7 +317,7 @@
],
"attributes": {
"label": {
"value": "D.E"
"value": "D"
},
"labelDimensions": {
"width": 0,

25
testdata/d2compiler/TestCompile/no-self-link.exp.json generated vendored
View file

@ -334,10 +334,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,5:4:43-5:5:44",
"value": [
{
"string": "s"
"string": "s",
"raw_string": "s"
}
]
}
@ -357,10 +358,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,5:6:45-5:10:49",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -486,10 +488,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,1:0:1-1:1:2",
"value": [
{
"string": "x"
"string": "x",
"raw_string": "x"
}
]
}
@ -509,10 +512,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,1:2:3-1:6:7",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -545,10 +549,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,11:4:93-11:5:94",
"value": [
{
"string": "b"
"string": "b",
"raw_string": "b"
}
]
}

2
testdata/d2compiler/TestCompile/null.exp.json generated vendored
View file

@ -56,7 +56,7 @@
"edges": null,
"objects": [
{
"id": "'null'",
"id": "null",
"id_val": "null",
"references": [
{

12
testdata/d2compiler/TestCompile/sequence-timestamp.exp.json generated vendored
View file

@ -442,8 +442,8 @@
"zIndex": 0
},
{
"id": "\"04:20,11:20\"",
"id_val": "04:20,11:20",
"id": "04:20,11:20",
"id_val": "04",
"references": [
{
"key": {
@ -468,7 +468,7 @@
],
"attributes": {
"label": {
"value": "04:20,11:20"
"value": "04"
},
"labelDimensions": {
"width": 0,
@ -532,8 +532,8 @@
"zIndex": 0
},
{
"id": "\"start_time = datetime.datetime.now\"",
"id_val": "start_time = datetime.datetime.now",
"id": "start_time = datetime.datetime.now",
"id_val": "start_time = datetime",
"references": [
{
"key": {
@ -569,7 +569,7 @@
],
"attributes": {
"label": {
"value": "start_time = datetime.datetime.now"
"value": "start_time = datetime"
},
"labelDimensions": {
"width": 0,

30
testdata/d2compiler/TestCompile/spread-import-link.exp.json generated vendored
View file

@ -194,10 +194,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-0:1:1",
"value": [
{
"string": "a"
"string": "a",
"raw_string": "a"
}
]
}
@ -217,10 +218,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,0:2:2-0:6:6",
"value": [
{
"string": "link"
"string": "link",
"raw_string": "link"
}
]
}
@ -253,10 +255,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,1:0:17-1:6:23",
"value": [
{
"string": "layers"
"string": "layers",
"raw_string": "layers"
}
]
}
@ -276,10 +279,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,2:2:29-2:3:30",
"value": [
{
"string": "b"
"string": "b",
"raw_string": "b"
}
]
}
@ -299,10 +303,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,3:4:38-3:5:39",
"value": [
{
"string": "d"
"string": "d",
"raw_string": "d"
}
]
}
@ -425,10 +430,11 @@
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"range": "d2/testdata/d2compiler/TestCompile/x.d2,3:4:38-3:5:39",
"value": [
{
"string": "d"
"string": "d",
"raw_string": "d"
}
]
}