Added explicit location #38

syntaxes/gdb.tmLanguage.json

@@ -59,7 +59,7 @@
 							"match": "\\b(-fu(?:nction)?)\\b[ \t]+([^[ \t]]+)",
 							"captures": {
 								"1": { "name": "support.function.option.gdb" },
-								"2": { "name": "markup.underline.link.location.gdb" }
+								"2": { "patterns": [ { "include": "#location"} ] }
 							}
 						},
 						{
@@ -80,7 +80,7 @@
 							"match": "\\b(fu(?:n(?:c(?:t(?:i(?:on?)?)?)?)?)?)\\b(?:[ \t]+([^[ \t]]+))?",
 							"captures": {
 								"1": { "name": "keyword.control.command.gdb" },
-								"2": { "name": "markup.underline.link.location.gdb" }
+								"2": { "patterns": [ { "include": "#location"} ] }
 							}
 						},
 						{
@@ -165,13 +165,14 @@
 				},
 				{
 					"name": "meta.command.break.gdb",
-					"match": "(?:^|\\G)[ \t]*(t?b(?:r(?:e(?:ak?)?)?)?)\\b(?:[ \t]+([^[ \t]]+)([ \t]+-force-condition)?(?:[ \t]+(if)[ \t]+(.*))?)?[ \t]*$",
-					"captures": {
-						"1": { "name": "keyword.control.command.gdb" },
-						"2": { "name": "markup.underline.link.location.gdb" },
-						"3": { "name": "support.function.option.gdb" },
-						"4": { "name": "keyword.control.condition.gdb" },
-						"5": { "patterns": [ { "include": "#expression" } ] }
+					"begin": "(?:^|\\G)[ \t]*(t?b(?:r(?:e(?:ak?)?)?)?)\\b",
+					"beginCaptures": { "1": { "name": "keyword.control.command.gdb" } },
+					"patterns": [ { "include": "#location"} ],
+					"end": "(?:([ \t]+-force-condition)?[ \t]+(if)[ \t]+(.+))?[ \t]*$",
+					"endCaptures": {
+						"1": { "name": "support.function.option.gdb" },
+						"2": { "name": "keyword.control.condition.gdb" },
+						"3": { "patterns": [ { "include": "#expression" } ] }
 					}
 				},
 				{
@@ -292,7 +293,7 @@
 					"match": "(?:^|\\G)[ \t]*(u(?:nt(?:il?)?)?)\\b(?:[ \t]+([^ \t]+))?[ \t]*$",
 					"captures": {
 						"1": { "name": "keyword.control.command.gdb" },
-						"2": { "name": "markup.underline.link.location.gdb" }
+						"2": { "patterns": [ { "include": "#location"} ] }
 					}
 				},
 				{
@@ -1030,7 +1031,7 @@
 							"match": "\\b(sc(?:o(?:pe?)?)?)\\b[ \t]+([^ \t]+)$",
 							"captures": {
 								"1": { "name": "support.function.option.gdb" },
-								"2": { "name": "markup.underline.link.location.gdb" }
+								"2": { "patterns": [ { "include": "#location"} ] }
 							}
 						},
 						{
@@ -1158,22 +1159,22 @@
 							"match": "\\b(t(?:r(?:a(?:c(?:e(?:p(?:o(?:i(?:n(?:ts?)?)?)?)?)?)?)?)?)?)\\b[ \t]+([^ \t]+)[ \t]*$",
 							"captures": {
 								"1": { "name": "support.function.option.gdb" },
-								"2": { "name": "markup.underline.link.location.gdb" }
+								"2": { "patterns": [ { "include": "#location"} ] }
 							}
 						},
 						{
 							"match": "\\b(b(?:r(?:e(?:a(?:k(?:p(?:o(?:i(?:n(?:ts?)?)?)?)?)?)?)?)?)?)\\b[ \t]+([^ \t]+)[ \t]*$",
 							"captures": {
 								"1": { "name": "support.function.option.gdb" },
-								"2": { "name": "markup.underline.link.location.gdb" }
+								"2": { "patterns": [ { "include": "#location"} ] }
 							}
 						},
 						{
 							"match": "\\b(g(?:d(?:b(?:-(?:i(?:n(?:d(?:ex?)?)?)?)?)?)?)?)(?:[ \t]+(-dwarf-5))?[ \t]+([^ \t]+)[ \t]*$",
 							"captures": {
 								"1": { "name": "support.function.option.gdb" },
 								"2": { "name": "support.function.sub-option.gdb" },
-								"3": { "name": "markup.underline.link.location.gdb" }
+								"3": { "patterns": [ { "include": "#location"} ] }
 							}
 						}
 					],
@@ -1415,6 +1416,42 @@
 					"end":"$"
 				}
 			]
+		},
+		"location": {
+			"patterns": [
+				{
+					"name": "meta.location.explicit.gdb",
+					"comment": "https://sourceware.org/gdb/current/onlinedocs/gdb.html/Explicit-Locations.html",
+					"patterns": [
+						{
+							"match": "\\B(-s(?:o(?:u(?:r(?:ce?)?)?)?)?)\\b",
+							"captures": { "1": { "name": "support.function.option.gdb" } }
+						},
+						{
+							"match": "\\B(-f(?:u(?:n(?:c(?:t(?:i(?:on?)?)?)?)?)?)?)\\b",
+							"captures": { "1": { "name": "support.function.option.gdb" } }
+						},
+						{
+							"match": "\\B(-li(?:ne?)?)\\b",
+							"captures": { "1": { "name": "support.function.option.gdb" } }
+						},
+						{
+							"match": "\\B(-la(?:b(?:el?)?)?)\\b",
+							"captures": { "1": { "name": "support.function.option.gdb" } }
+						},
+						{
+							"match": "\\B(-q(?:u(?:a(?:l(?:i(?:f(?:i(?:ed?)?)?)?)?)?)?)?)\\b",
+							"captures": { "1": { "name": "support.function.option.gdb" } }
+						}
+					]
+				},
+				{
+					"name": "meta.location.linespec.gdb",
+					"comment": "https://sourceware.org/gdb/current/onlinedocs/gdb.html/Linespec-Locations.html",
+					"match": "\\b([^ \t]+)\\b",
+					"captures": { "1": { "name": "markup.underline.link.location.gdb" } }
+				}
+			]
 		}
 	}
 }

tests/command/break.gdb

@@ -2,4 +2,10 @@ b
 br location_to_break
 br location_to_break:1234
 br location_to_break:1234 if expression
-break 123 -force-condition if something
+break 123 -force-condition if expression
+
+break -qualified -function main
+break -source foo/bar/snamestr.c
+break -label ENDOF
+break -line 12 -qualified 0x123
+break -source foo/bar/snamestr.c -qualified -function main -line 12

tests/command/break/function.gdb

@@ -0,0 +1,8 @@
+break -f main
+break -fu main
+break -fun main
+break -func main
+break -funct main
+break -functi main
+break -functio main
+break -function main

tests/command/break/label.gdb

@@ -0,0 +1,4 @@
+break -la LABEL
+break -lab LABEL
+break -labe LABEL
+break -label LABEL

tests/command/break/line.gdb

@@ -0,0 +1,3 @@
+break -li 3
+break -lin 3
+break -line 3

tests/command/break/qualified.gdb

@@ -0,0 +1,9 @@
+break -q
+break -qu
+break -qua
+break -qual
+break -quali
+break -qualif
+break -qualifi
+break -qualifie
+break -qualified

tests/command/break/source.gdb

@@ -0,0 +1,6 @@
+break -s foo.c
+break -so foo.c
+break -sou foo.c
+break -sour foo.c
+break -sourc foo.c
+break -source foo.c