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

Use std::vector instead of array in MJCF schema.

Browse Source 
PiperOrigin-RevId: 831787681
Change-Id: I8093b8b10260daecb830e49319eda798e2dd2da5
This commit is contained in:
Kyle Bayes
2025-11-13 03:40:36 -08:00
committed by Copybara-Service
parent 26c1622ac8
commit 8b9fa2674c
5 changed files with 182 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/xml/xml_schema_test.cc
+6 -17
View File
@@ -14,12 +14,11 @@
#include <optional>
#include <string>
#include <vector>
#include <gtest/gtest.h>
#include "src/xml/xml_native_reader.h"
#include "src/xml/xml_util.h"
#include "test/fixture.h"
#include <absl/strings/numbers.h>
#include <absl/strings/str_format.h>
namespace mujoco {
@@ -29,7 +28,7 @@ namespace {
using XMLSchemaTest = MujocoTest;
static std::optional<std::string> IsValidSchemaFormat(
const char* schema[][mjXATTRNUM], unsigned nrow) {
std::vector<const char*> schema[], unsigned nrow) {
if (schema[0][0][0] == '<' || schema[0][0][0] == '>') {
return "expected element, found bracket";
}
@@ -43,8 +42,8 @@ static std::optional<std::string> IsValidSchemaFormat(
// detect element
if (schema[i][0][0] != '<' && schema[i][0][0] != '>') {
// first 3 pointers required
if (!schema[i][1] || !schema[i][2]) {
// first 2 pointers required
if (!schema[i][1]) {
return absl::StrFormat("expected element, found null pointers"
"in row %d, element %s", i, schema[i][0]);
}
@@ -56,19 +55,9 @@ static std::optional<std::string> IsValidSchemaFormat(
i, schema[i][0]);
}
// number of attributes
int nattr = 0;
if (!absl::SimpleAtoi(schema[i][2], &nattr)) {
return absl::StrFormat("unparseable number of attributes in"
" row %d, element %s", i, schema[i][0]);
} else if (nattr < 0 || nattr > mjXATTRNUM - 3) {
return absl::StrFormat("invalid number of attributes in"
" row %d, element %s", i, schema[i][0]);
}
// attribute pointers
for (int j = 0; j < nattr; j++) {
if (!schema[i][3 + j]) {
for (int j = 0; j < schema[i].size() - 2; j++) {
if (!schema[i][2 + j]) {
return absl::StrFormat("null attribute %d in"
" row %d, element %s", j, i, schema[i][0]);
}