chenlin/Mujoco_WASM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move schema definition validation from runtime to a test.

Browse Source 
PiperOrigin-RevId: 606280564
Change-Id: I9fec9eb3538f63f84e1982f21e1a93f16342d540
This commit is contained in:
Kyle Bayes
2024-02-12 09:48:44 -08:00
committed by Copybara-Service
parent b6873ec8a2
commit eabd4c06f9
5 changed files with 157 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/xml/xml_util.cc
+8 -67
View File
@@ -157,56 +157,7 @@ XMLElement* NextSiblingElement(XMLElement* e, const char* name) {
}
// constructor
mjXSchema::mjXSchema(const char* schema[][mjXATTRNUM], unsigned nrow, bool checkptr) {
if (schema[0][0][0] == '<' || schema[0][0][0] == '>') {
throw "expected element, found bracket";
}
// check entire schema for null pointers
if (checkptr) {
char msg[100];
for (int i=0; i<nrow; i++) {
// base pointers
if (!schema[i][0]) {
mju::sprintf_arr(msg, "null pointer found in row %d", i);
throw msg;
}
// detect element
if (schema[i][0][0]!='<' && schema[i][0][0]!='>') {
// first 3 pointers required
if (!schema[i][1] || !schema[i][2]) {
mju::sprintf_arr(msg, "null pointer in row %d, element %s", i, schema[i][0]);
throw msg;
}
// check type
if (schema[i][1][0]!='!' && schema[i][1][0]!='?' &&
schema[i][1][0]!='*' && schema[i][1][0]!='R') {
mju::sprintf_arr(msg, "invalid type in row %d, element %s", i, schema[i][0]);
throw msg;
}
// number of attributes
int nattr = atoi(schema[i][2]);
if (nattr < 0 || nattr > mjXATTRNUM-3) {
mju::sprintf_arr(msg,
"invalid number of attributes in row %d, element %s", i, schema[i][0]);
throw msg;
}
// attribute pointers
for (int j=0; j<nattr; j++) {
if (!schema[i][3+j]) {
mju::sprintf_arr(msg, "null attribute %d in row %d, element %s", j, i, schema[i][0]);
throw msg;
}
}
}
}
}
mjXSchema::mjXSchema(const char* schema[][mjXATTRNUM], unsigned nrow) {
// set name and type
name_ = schema[0][0];
type_ = schema[0][1][0];
@@ -218,42 +169,32 @@ mjXSchema::mjXSchema(const char* schema[][mjXATTRNUM], unsigned nrow, bool check
}
// process sub-elements of complex element
if (nrow>1) {
// check for bracketed block
if (schema[1][0][0]!='<' || schema[nrow-1][0][0]!='>') {
throw "expected brackets after complex element";
}
if (nrow > 1) {
// parse block into simple and complex elements, create children
int start = 2;
while (start < nrow-1) {
int end = start;
// look for bracketed block at start+1
if (schema[start+1][0][0]=='<') {
if (schema[start+1][0][0] == '<') {
// look for corresponding closing bracket
int cnt = 0;
while (end <= nrow-1) {
if (schema[end][0][0]=='<') {
if (schema[end][0][0] == '<') {
cnt++;
} else if (schema[end][0][0]=='>') {
} else if (schema[end][0][0] == '>') {
cnt--;
if (cnt==0) {
if (cnt == 0) {
break;
}
}
end++;
}
// closing bracket not found
if (end > nrow-1) {
throw "matching closing bracket not found";
}
}
// add element, check for error
subschema_.emplace_back(schema+start, end-start+1, false);
// add child element
subschema_.emplace_back(schema+start, end-start+1);
// proceed with next subelement
start = end+1;