extern/Unexpected-Keyboard
1
0
Fork 1
mirror of https://github.com/Julow/Unexpected-Keyboard.git synced 2025-06-20 01:38:37 +02:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Improve layout parsing errors

Browse Source 
Add location information to all error and improve "expected tag" errors.
This commit is contained in:
Jules Aguillon 2023-12-17 12:12:23 +01:00
parent 7af6adcf11
commit 478d8082f4
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
srcs/juloo.keyboard2/KeyboardData.java
View File

@ -221,7 +221,7 @@ class KeyboardData
private static KeyboardData parse_keyboard(XmlPullParser parser) throws Exception private static KeyboardData parse_keyboard(XmlPullParser parser) throws Exception
{ {
if (!expect_tag(parser, "keyboard")) if (!expect_tag(parser, "keyboard"))
throw new Exception("Empty layout file"); throw error(parser, "Expected tag <keyboard>");
boolean add_bottom_row = attribute_bool(parser, "bottom_row", true); boolean add_bottom_row = attribute_bool(parser, "bottom_row", true);
float specified_kw = attribute_float(parser, "width", 0f); float specified_kw = attribute_float(parser, "width", 0f);
String script = parser.getAttributeValue(null, "script"); String script = parser.getAttributeValue(null, "script");
@ -238,7 +238,7 @@ class KeyboardData
modmap = Modmap.parse(parser); modmap = Modmap.parse(parser);
break; break;
default: default:
throw new Exception("Unknown tag: " + parser.getName()); throw error(parser, "Expecting tag <row>, got <" + parser.getName() + ">");
} }
} }
float kw = (specified_kw != 0f) ? specified_kw : compute_max_width(rows); float kw = (specified_kw != 0f) ? specified_kw : compute_max_width(rows);
@ -258,7 +258,7 @@ class KeyboardData
private static Row parse_row(XmlPullParser parser) throws Exception private static Row parse_row(XmlPullParser parser) throws Exception
{ {
if (!expect_tag(parser, "row")) if (!expect_tag(parser, "row"))
throw new Exception("Failed to parse row"); throw error(parser, "Expected tag <row>");
return Row.parse(parser); return Row.parse(parser);
} }
@ -604,7 +604,8 @@ class KeyboardData
if (!next_tag(parser)) if (!next_tag(parser))
return false; return false;
if (!parser.getName().equals(name)) if (!parser.getName().equals(name))
throw new Exception("Unknown tag: " + parser.getName()); throw error(parser, "Expecting tag <" + name + ">, got <" +
parser.getName() + ">");
return true; return true;
} }
@ -623,4 +624,10 @@ class KeyboardData
return default_val; return default_val;
return Float.parseFloat(val); return Float.parseFloat(val);
} }
/** Construct a parsing error. */
private static Exception error(XmlPullParser parser, String message)
{
return new Exception(message + " " + parser.getPositionDescription());
}
} }