Fixing etree path issues in Go

Now it seems to work, but sadly we still cannot distinguish between SL and OS and AA...

Author: GwynethLlewelyn

Tools/highlight.css

@@ -0,0 +1,24 @@
+/* Style definition file generated by highlight 4.1, http://www.andre-simon.de/ */
+/* highlight theme: Kwrite Editor */
+body.hl	{ background-color:#e0eaee; }
+pre.hl	{ color:#000000; background-color:#e0eaee; font-size:10pt; font-family:'Courier New',monospace; white-space: pre-wrap; }
+.hl.num { color:#b07e00; }
+.hl.esc { color:#ff00ff; }
+.hl.sng { color:#bf0303; }
+.hl.pps { color:#818100; }
+.hl.slc { color:#838183; font-style:italic; }
+.hl.com { color:#838183; font-style:italic; }
+.hl.ppc { color:#008200; }
+.hl.opt { color:#000000; }
+.hl.ipl { color:#0057ae; }
+.hl.lin { color:#555555; user-select: none; }
+.hl.hvr { cursor:help; }
+.hl.erm { color:#ff0000; font-weight:bold; border:solid 1px red; margin-left: 3em; }
+.hl.err { color:#ff0000; font-weight:bold; }
+.hl.kwa { color:#000000; font-weight:bold; }
+.hl.kwb { color:#0057ae; }
+.hl.kwc { color:#000000; }
+.hl.kwd { color:#010181; }
+.hl.kwe { color:#0d5bc3; }
+.hl.kwf { color:#750dc3; }
+

Tools/kwdbxmlconvert.go

@@ -112,9 +112,10 @@ func parseSyntaxSet(readDoc, writeDoc *etree.Element, comment, name, symbol, sub
 	var aString *etree.Element
 
 	if subtype != "" {
-		subtypePath, err := etree.CompilePath("/[type='" + subtype + "']");
+		subtypePath, err := etree.CompilePath("./" + symbol +"[@type='" + subtype + "']");
 		if (err != nil) {
-			return errors.New("parseSyntaxSet() could not process query involving subtype " + subtype);
+			return errors.New("parseSyntaxSet() could not process path query compilation involving symbol '" + symbol +
+			"' and subtype '" + subtype + "'");
 		}
 		for _, kwdbKeyword := range readDoc.FindElementsPath(subtypePath) {
 			aString = scopeStrings.CreateElement("string")
@@ -304,10 +305,27 @@ func main() {
 		if err := parseSyntaxSet(kwdbRoot, theSyntaxDoc, "Integer constants", "lsl.identifier.constant.integer", "constant", "integer"); err != nil {
 			log.Println(err)
 		}
-
-		if err := parseSyntaxSet(kwdbRoot, theSyntaxDoc, "Constants", "lsl.identifier.constant", "constant", ""); err != nil {
+		// if err := parseSyntaxSet(kwdbRoot, theSyntaxDoc, "Float Constants", "lsl.identifier.constant.float", "float", "float"); err != nil {
+		// 	log.Println(err)
+		// }
+		if err := parseSyntaxSet(kwdbRoot, theSyntaxDoc, "String Constants", "lsl.identifier.constant.string", "constant", "string"); err != nil {
+			log.Println(err)
+		}
+		// if err := parseSyntaxSet(kwdbRoot, theSyntaxDoc, "Key Constants", "lsl.identifier.constant.key", "constant", "key"); err != nil {
+		// 	log.Println(err)
+		// }
+		if err := parseSyntaxSet(kwdbRoot, theSyntaxDoc, "Vector Constants", "lsl.identifier.constant.vector", "constant", "vector"); err != nil {
+			log.Println(err)
+		}
+		if err := parseSyntaxSet(kwdbRoot, theSyntaxDoc, "Rotation Constants", "lsl.identifier.constant.rotation", "constant", "rotation"); err != nil {
 			log.Println(err)
 		}
+		// if err := parseSyntaxSet(kwdbRoot, theSyntaxDoc, "List Constants", "lsl.identifier.constant.list", "constant", "list"); err != nil {
+		// 	log.Println(err)
+		// }
+		// if err := parseSyntaxSet(kwdbRoot, theSyntaxDoc, "Boolean Constants", "lsl.identifier.constant.boolean", "bool", "rotation"); err != nil {
+		// 	log.Println(err)
+		// }
 
 		if err := parseSyntaxSet(kwdbRoot, theSyntaxDoc, "Types", "lsl.identifier.type", "type", ""); err != nil {
 			log.Println(err)