src: use consistent names

src/core/json/json.cpp

@@ -165,7 +165,7 @@ namespace json
 		}
 	}
 
-	void parse_string(DynamicString& string, const char* json)
+	void parse_string(DynamicString& str, const char* json)
 	{
 		CE_ENSURE(NULL != json);
 
@@ -185,14 +185,14 @@ namespace json
 
 					switch (*json)
 					{
-					case '"': string += '"'; break;
-					case '\\': string += '\\'; break;
-					case '/': string += '/'; break;
-					case 'b': string += '\b'; break;
-					case 'f': string += '\f'; break;
-					case 'n': string += '\n'; break;
-					case 'r': string += '\r'; break;
-					case 't': string += '\t'; break;
+					case '"': str += '"'; break;
+					case '\\': str += '\\'; break;
+					case '/': str += '/'; break;
+					case 'b': str += '\b'; break;
+					case 'f': str += '\f'; break;
+					case 'n': str += '\n'; break;
+					case 'r': str += '\r'; break;
+					case 't': str += '\t'; break;
 					default:
 					{
 						CE_FATAL("Bad escape character");
@@ -202,7 +202,7 @@ namespace json
 				}
 				else
 				{
-					string += *json;
+					str += *json;
 				}
 			}
 		}
@@ -210,7 +210,7 @@ namespace json
 		CE_FATAL("Bad string");
 	}
 
-	void parse_array(JsonArray& array, const char* json)
+	void parse_array(JsonArray& arr, const char* json)
 	{
 		CE_ENSURE(NULL != json);
 
@@ -223,7 +223,7 @@ namespace json
 
 			while (*json)
 			{
-				array::push_back(array, json);
+				array::push_back(arr, json);
 
 				json = skip_value(json);
 				json = skip_spaces(json);
@@ -239,7 +239,7 @@ namespace json
 		CE_FATAL("Bad array");
 	}
 
-	void parse_object(JsonObject& object, const char* json)
+	void parse_object(JsonObject& obj, const char* json)
 	{
 		CE_ENSURE(NULL != json);
 
@@ -265,7 +265,7 @@ namespace json
 				json = next(json, ':');
 				json = skip_spaces(json);
 
-				hash_map::set(object._map, fs_key, json);
+				hash_map::set(obj._map, fs_key, json);
 
 				json = skip_value(json);
 				json = skip_spaces(json);
@@ -281,17 +281,17 @@ namespace json
 		CE_FATAL("Bad object");
 	}
 
-	void parse(JsonObject& object, const char* json)
+	void parse(JsonObject& obj, const char* json)
 	{
 		CE_ENSURE(NULL != json);
-		parse_object(object, json);
+		parse_object(obj, json);
 	}
 
-	void parse(JsonObject& object, Buffer& json)
+	void parse(JsonObject& obj, Buffer& json)
 	{
 		array::push_back(json, '\0');
 		array::pop_back(json);
-		parse(object, array::begin(json));
+		parse(obj, array::begin(json));
 	}
 
 } // namespace json

src/core/json/json.h

@@ -27,22 +27,22 @@ namespace json
 	/// Returns the JSON boolean @a json as bool.
 	bool parse_bool(const char* json);
 
-	/// Parses the JSON string @a json ad puts it into @a string.
-	void parse_string(DynamicString& string, const char* json);
+	/// Parses the JSON string @a json ad puts it into @a str.
+	void parse_string(DynamicString& str, const char* json);
 
-	/// Parses the JSON array @a json and puts it into @a array as pointers to
+	/// Parses the JSON array @a json and puts it into @a arr as pointers to
 	/// the corresponding items into the original @a json string.
-	void parse_array(JsonArray& array, const char* json);
+	void parse_array(JsonArray& arr, const char* json);
 
-	/// Parses the JSON object @a json and puts it into @a object as map from
+	/// Parses the JSON object @a json and puts it into @a obj as map from
 	/// key to pointer to the corresponding value into the original string @a json.
-	void parse_object(JsonObject& object, const char* json);
+	void parse_object(JsonObject& obj, const char* json);
 
 	/// Parses the JSON-encoded @a json.
-	void parse(JsonObject& object, const char* json);
+	void parse(JsonObject& obj, const char* json);
 
 	/// Parses the JSON-encoded @a json.
-	void parse(JsonObject& object, Buffer& json);
+	void parse(JsonObject& obj, Buffer& json);
 
 } // namespace json
 

src/core/json/sjson.cpp

@@ -240,7 +240,7 @@ namespace sjson
 		}
 	}
 
-	void parse_string(DynamicString& string, const char* json)
+	void parse_string(DynamicString& str, const char* json)
 	{
 		CE_ENSURE(NULL != json);
 
@@ -260,20 +260,20 @@ namespace sjson
 
 					switch (*json)
 					{
-					case '"': string += '"'; break;
-					case '\\': string += '\\'; break;
-					case '/': string += '/'; break;
-					case 'b': string += '\b'; break;
-					case 'f': string += '\f'; break;
-					case 'n': string += '\n'; break;
-					case 'r': string += '\r'; break;
-					case 't': string += '\t'; break;
+					case '"': str += '"'; break;
+					case '\\': str += '\\'; break;
+					case '/': str += '/'; break;
+					case 'b': str += '\b'; break;
+					case 'f': str += '\f'; break;
+					case 'n': str += '\n'; break;
+					case 'r': str += '\r'; break;
+					case 't': str += '\t'; break;
 					default: CE_FATAL("Bad escape character"); break;
 					}
 				}
 				else
 				{
-					string += *json;
+					str += *json;
 				}
 			}
 		}
@@ -281,7 +281,7 @@ namespace sjson
 		CE_FATAL("Bad string");
 	}
 
-	void parse_array(JsonArray& array, const char* json)
+	void parse_array(JsonArray& arr, const char* json)
 	{
 		CE_ENSURE(NULL != json);
 
@@ -294,7 +294,7 @@ namespace sjson
 
 			while (*json)
 			{
-				array::push_back(array, json);
+				array::push_back(arr, json);
 
 				json = skip_value(json);
 				json = skip_spaces(json);
@@ -309,7 +309,7 @@ namespace sjson
 		CE_FATAL("Bad array");
 	}
 
-	static void parse_root_object(JsonObject& object, const char* json)
+	static void parse_root_object(JsonObject& obj, const char* json)
 	{
 		CE_ENSURE(NULL != json);
 
@@ -327,14 +327,14 @@ namespace sjson
 			json = next(json, (*json == '=') ? '=' : ':');
 			json = skip_spaces(json);
 
-			hash_map::set(object._map, fs_key, json);
+			hash_map::set(obj._map, fs_key, json);
 
 			json = skip_value(json);
 			json = skip_spaces(json);
 		}
 	}
 
-	void parse_object(JsonObject& object, const char* json)
+	void parse_object(JsonObject& obj, const char* json)
 	{
 		CE_ENSURE(NULL != json);
 
@@ -359,7 +359,7 @@ namespace sjson
 				json = next(json, (*json == '=') ? '=' : ':');
 				json = skip_spaces(json);
 
-				hash_map::set(object._map, fs_key, json);
+				hash_map::set(obj._map, fs_key, json);
 
 				json = skip_value(json);
 				json = skip_spaces(json);
@@ -374,23 +374,23 @@ namespace sjson
 		CE_FATAL("Bad object");
 	}
 
-	void parse(JsonObject& object, const char* json)
+	void parse(JsonObject& obj, const char* json)
 	{
 		CE_ENSURE(NULL != json);
 
 		json = skip_spaces(json);
 
 		if (*json == '{')
-			parse_object(object, json);
+			parse_object(obj, json);
 		else
-			parse_root_object(object, json);
+			parse_root_object(obj, json);
 	}
 
-	void parse(JsonObject& object, Buffer& json)
+	void parse(JsonObject& obj, Buffer& json)
 	{
 		array::push_back(json, '\0');
 		array::pop_back(json);
-		parse(object, array::begin(json));
+		parse(obj, array::begin(json));
 	}
 
 } // namespace sjson
@@ -400,82 +400,82 @@ namespace sjson
 	Vector2 parse_vector2(const char* json)
 	{
 		TempAllocator64 ta;
-		JsonArray array(ta);
-		sjson::parse_array(array, json);
+		JsonArray arr(ta);
+		sjson::parse_array(arr, json);
 
 		Vector2 v;
-		v.x = sjson::parse_float(array[0]);
-		v.y = sjson::parse_float(array[1]);
+		v.x = sjson::parse_float(arr[0]);
+		v.y = sjson::parse_float(arr[1]);
 		return v;
 	}
 
 	Vector3 parse_vector3(const char* json)
 	{
 		TempAllocator64 ta;
-		JsonArray array(ta);
-		sjson::parse_array(array, json);
+		JsonArray arr(ta);
+		sjson::parse_array(arr, json);
 
 		Vector3 v;
-		v.x = sjson::parse_float(array[0]);
-		v.y = sjson::parse_float(array[1]);
-		v.z = sjson::parse_float(array[2]);
+		v.x = sjson::parse_float(arr[0]);
+		v.y = sjson::parse_float(arr[1]);
+		v.z = sjson::parse_float(arr[2]);
 		return v;
 	}
 
 	Vector4 parse_vector4(const char* json)
 	{
 		TempAllocator64 ta;
-		JsonArray array(ta);
-		sjson::parse_array(array, json);
+		JsonArray arr(ta);
+		sjson::parse_array(arr, json);
 
 		Vector4 v;
-		v.x = sjson::parse_float(array[0]);
-		v.y = sjson::parse_float(array[1]);
-		v.z = sjson::parse_float(array[2]);
-		v.w = sjson::parse_float(array[3]);
+		v.x = sjson::parse_float(arr[0]);
+		v.y = sjson::parse_float(arr[1]);
+		v.z = sjson::parse_float(arr[2]);
+		v.w = sjson::parse_float(arr[3]);
 		return v;
 	}
 
 	Quaternion parse_quaternion(const char* json)
 	{
 		TempAllocator64 ta;
-		JsonArray array(ta);
-		sjson::parse_array(array, json);
+		JsonArray arr(ta);
+		sjson::parse_array(arr, json);
 
 		Quaternion q;
-		q.x = sjson::parse_float(array[0]);
-		q.y = sjson::parse_float(array[1]);
-		q.z = sjson::parse_float(array[2]);
-		q.w = sjson::parse_float(array[3]);
+		q.x = sjson::parse_float(arr[0]);
+		q.y = sjson::parse_float(arr[1]);
+		q.z = sjson::parse_float(arr[2]);
+		q.w = sjson::parse_float(arr[3]);
 		return q;
 	}
 
 	Matrix4x4 parse_matrix4x4(const char* json)
 	{
 		TempAllocator256 ta;
-		JsonArray array(ta);
-		sjson::parse_array(array, json);
+		JsonArray arr(ta);
+		sjson::parse_array(arr, json);
 
 		Matrix4x4 m;
-		m.x.x = sjson::parse_float(array[ 0]);
-		m.x.y = sjson::parse_float(array[ 1]);
-		m.x.z = sjson::parse_float(array[ 2]);
-		m.x.w = sjson::parse_float(array[ 3]);
-
-		m.y.x = sjson::parse_float(array[ 4]);
-		m.y.y = sjson::parse_float(array[ 5]);
-		m.y.z = sjson::parse_float(array[ 6]);
-		m.y.w = sjson::parse_float(array[ 7]);
-
-		m.z.x = sjson::parse_float(array[ 8]);
-		m.z.y = sjson::parse_float(array[ 9]);
-		m.z.z = sjson::parse_float(array[10]);
-		m.z.w = sjson::parse_float(array[11]);
-
-		m.t.x = sjson::parse_float(array[12]);
-		m.t.y = sjson::parse_float(array[13]);
-		m.t.z = sjson::parse_float(array[14]);
-		m.t.w = sjson::parse_float(array[15]);
+		m.x.x = sjson::parse_float(arr[ 0]);
+		m.x.y = sjson::parse_float(arr[ 1]);
+		m.x.z = sjson::parse_float(arr[ 2]);
+		m.x.w = sjson::parse_float(arr[ 3]);
+
+		m.y.x = sjson::parse_float(arr[ 4]);
+		m.y.y = sjson::parse_float(arr[ 5]);
+		m.y.z = sjson::parse_float(arr[ 6]);
+		m.y.w = sjson::parse_float(arr[ 7]);
+
+		m.z.x = sjson::parse_float(arr[ 8]);
+		m.z.y = sjson::parse_float(arr[ 9]);
+		m.z.z = sjson::parse_float(arr[10]);
+		m.z.w = sjson::parse_float(arr[11]);
+
+		m.t.x = sjson::parse_float(arr[12]);
+		m.t.y = sjson::parse_float(arr[13]);
+		m.t.z = sjson::parse_float(arr[14]);
+		m.t.w = sjson::parse_float(arr[15]);
 		return m;
 	}
 
@@ -503,7 +503,7 @@ namespace sjson
 		return guid::parse(str.c_str());
 	}
 
-	void parse_verbatim(DynamicString& string, const char* json)
+	void parse_verbatim(DynamicString& str, const char* json)
 	{
 		CE_ENSURE(NULL != json);
 
@@ -514,7 +514,7 @@ namespace sjson
 		const char* end = strstr(json, "\"\"\"");
 		CE_ASSERT(end, "Bad verbatim string");
 
-		string.set(json, u32(end - json));
+		str.set(json, u32(end - json));
 	}
 
 } // namespace json

src/core/json/sjson.h

@@ -29,22 +29,22 @@ namespace sjson
 	/// Returns the SJSON boolean @a json as bool.
 	bool parse_bool(const char* json);
 
-	/// Parses the SJSON string @a json ad puts it into @a string.
-	void parse_string(DynamicString& string, const char* json);
+	/// Parses the SJSON string @a json ad puts it into @a str.
+	void parse_string(DynamicString& str, const char* json);
 
-	/// Parses the SJSON array @a json and puts it into @a array as pointers to
+	/// Parses the SJSON array @a json and puts it into @a arr as pointers to
 	/// the corresponding items into the original @a json string.
-	void parse_array(JsonArray& array, const char* json);
+	void parse_array(JsonArray& arr, const char* json);
 
-	/// Parses the SJSON object @a json and puts it into @a object as map from
+	/// Parses the SJSON object @a json and puts it into @a obj as map from
 	/// key to pointer to the corresponding value into the original string @a json.
-	void parse_object(JsonObject& object, const char* json);
+	void parse_object(JsonObject& obj, const char* json);
 
 	/// Parses the SJSON-encoded @a json.
-	void parse(JsonObject& object, const char* json);
+	void parse(JsonObject& obj, const char* json);
 
 	/// Parses the SJSON-encoded @a json.
-	void parse(JsonObject& object, Buffer& json);
+	void parse(JsonObject& obj, Buffer& json);
 
 } // namespace sjson
 
@@ -80,7 +80,7 @@ namespace sjson
 	Guid parse_guid(const char* json);
 
 	/// Parses the SJSON verbatim string @a json and puts it into @a string.
-	void parse_verbatim(DynamicString& string, const char* json);
+	void parse_verbatim(DynamicString& str, const char* json);
 
 } // namespace sjson
 

src/resource/data_compiler.cpp

@@ -245,14 +245,14 @@ static void read_data_versions(HashMap<DynamicString, u32>& versions, Filesystem
 	Buffer json = read(data_fs, filename);
 
 	TempAllocator512 ta;
-	JsonObject object(ta);
-	sjson::parse(object, json);
+	JsonObject obj(ta);
+	sjson::parse(obj, json);
 
-	auto cur = json_object::begin(object);
-	auto end = json_object::end(object);
+	auto cur = json_object::begin(obj);
+	auto end = json_object::end(obj);
 	for (; cur != end; ++cur)
 	{
-		JSON_OBJECT_SKIP_HOLE(object, cur);
+		JSON_OBJECT_SKIP_HOLE(obj, cur);
 
 		TempAllocator256 ta;
 		DynamicString type(ta);
@@ -267,14 +267,14 @@ static void read_data_index(HashMap<StringId64, DynamicString>& index, Filesyste
 	Buffer json = read(data_fs, filename);
 
 	TempAllocator512 ta;
-	JsonObject object(ta);
-	sjson::parse(object, json);
+	JsonObject obj(ta);
+	sjson::parse(obj, json);
 
-	auto cur = json_object::begin(object);
-	auto end = json_object::end(object);
+	auto cur = json_object::begin(obj);
+	auto end = json_object::end(obj);
 	for (; cur != end; ++cur)
 	{
-		JSON_OBJECT_SKIP_HOLE(object, cur);
+		JSON_OBJECT_SKIP_HOLE(obj, cur);
 
 		TempAllocator256 ta;
 		StringId64 dst_name;
@@ -292,14 +292,14 @@ static void read_data_mtimes(HashMap<StringId64, u64>& mtimes, FilesystemDisk& d
 	Buffer json = read(data_fs, filename);
 
 	TempAllocator128 ta;
-	JsonObject object(ta);
-	sjson::parse(object, json);
+	JsonObject obj(ta);
+	sjson::parse(obj, json);
 
-	auto cur = json_object::begin(object);
-	auto end = json_object::end(object);
+	auto cur = json_object::begin(obj);
+	auto end = json_object::end(obj);
 	for (; cur != end; ++cur)
 	{
-		JSON_OBJECT_SKIP_HOLE(object, cur);
+		JSON_OBJECT_SKIP_HOLE(obj, cur);
 
 		TempAllocator64 ta;
 		StringId64 dst_name;
@@ -319,14 +319,14 @@ static void read_data_dependencies(DataCompiler& dc, FilesystemDisk& data_fs, co
 	Buffer json = read(data_fs, filename);
 
 	TempAllocator1024 ta;
-	JsonObject object(ta);
-	sjson::parse(object, json);
+	JsonObject obj(ta);
+	sjson::parse(obj, json);
 
-	auto cur = json_object::begin(object);
-	auto end = json_object::end(object);
+	auto cur = json_object::begin(obj);
+	auto end = json_object::end(obj);
 	for (; cur != end; ++cur)
 	{
-		JSON_OBJECT_SKIP_HOLE(object, cur);
+		JSON_OBJECT_SKIP_HOLE(obj, cur);
 
 		StringId64 dst_name;
 		dst_name.parse(cur->first.data());

src/resource/font_resource.cpp

@@ -60,14 +60,14 @@ namespace font_resource_internal
 		Buffer buf = opts.read();
 
 		TempAllocator4096 ta;
-		JsonObject object(ta);
+		JsonObject obj(ta);
 		JsonArray glyphs_json(ta);
 
-		sjson::parse(object, buf);
-		sjson::parse_array(glyphs_json, object["glyphs"]);
+		sjson::parse(obj, buf);
+		sjson::parse_array(glyphs_json, obj["glyphs"]);
 
-		const u32 texture_size = sjson::parse_int(object["size"]);
-		const u32 font_size    = sjson::parse_int(object["font_size"]);
+		const u32 texture_size = sjson::parse_int(obj["size"]);
+		const u32 font_size    = sjson::parse_int(obj["font_size"]);
 		const u32 num_glyphs   = array::size(glyphs_json);
 
 		DATA_COMPILER_ASSERT(font_size > 0

src/resource/level_resource.cpp

@@ -50,13 +50,13 @@ namespace level_resource_internal
 	{
 		Buffer buf = opts.read();
 		TempAllocator4096 ta;
-		JsonObject object(ta);
-		sjson::parse(object, buf);
+		JsonObject obj(ta);
+		sjson::parse(obj, buf);
 
 		Array<LevelSound> sounds(default_allocator());
 		{
 			JsonArray sounds_json(ta);
-			sjson::parse_array(sounds_json, object["sounds"]);
+			sjson::parse_array(sounds_json, obj["sounds"]);
 
 			for (u32 i = 0; i < array::size(sounds_json); ++i)
 			{
@@ -83,7 +83,7 @@ namespace level_resource_internal
 		}
 
 		UnitCompiler uc(opts);
-		uc.compile_multiple_units(object["units"]);
+		uc.compile_multiple_units(obj["units"]);
 		Buffer unit_blob = uc.blob();
 
 		// Write

src/resource/material_resource.cpp

@@ -157,14 +157,14 @@ namespace material_resource_internal
 	static s32 parse_textures(const char* json, Array<TextureData>& textures, Array<char>& names, Array<char>& dynamic, CompileOptions& opts)
 	{
 		TempAllocator4096 ta;
-		JsonObject object(ta);
-		sjson::parse(object, json);
+		JsonObject obj(ta);
+		sjson::parse(obj, json);
 
-		auto cur = json_object::begin(object);
-		auto end = json_object::end(object);
+		auto cur = json_object::begin(obj);
+		auto end = json_object::end(obj);
 		for (; cur != end; ++cur)
 		{
-			JSON_OBJECT_SKIP_HOLE(object, cur);
+			JSON_OBJECT_SKIP_HOLE(obj, cur);
 
 			const StringView key = cur->first;
 			const char* value    = cur->second;
@@ -198,14 +198,14 @@ namespace material_resource_internal
 	static s32 parse_uniforms(const char* json, Array<UniformData>& uniforms, Array<char>& names, Array<char>& dynamic, CompileOptions& opts)
 	{
 		TempAllocator4096 ta;
-		JsonObject object(ta);
-		sjson::parse(object, json);
+		JsonObject obj(ta);
+		sjson::parse(obj, json);
 
-		auto cur = json_object::begin(object);
-		auto end = json_object::end(object);
+		auto cur = json_object::begin(obj);
+		auto end = json_object::end(obj);
 		for (; cur != end; ++cur)
 		{
-			JSON_OBJECT_SKIP_HOLE(object, cur);
+			JSON_OBJECT_SKIP_HOLE(obj, cur);
 
 			const StringView key = cur->first;
 			const char* value    = cur->second;
@@ -273,8 +273,8 @@ namespace material_resource_internal
 	{
 		Buffer buf = opts.read();
 		TempAllocator4096 ta;
-		JsonObject object(ta);
-		sjson::parse(object, buf);
+		JsonObject obj(ta);
+		sjson::parse(obj, buf);
 
 		Array<TextureData> texdata(default_allocator());
 		Array<UniformData> unidata(default_allocator());
@@ -282,16 +282,16 @@ namespace material_resource_internal
 		Array<char> dynblob(default_allocator());
 
 		DynamicString shader(ta);
-		sjson::parse_string(shader, object["shader"]);
+		sjson::parse_string(shader, obj["shader"]);
 
-		if (json_object::has(object, "textures"))
+		if (json_object::has(obj, "textures"))
 		{
-			if (parse_textures(object["textures"], texdata, names, dynblob, opts) != 0)
+			if (parse_textures(obj["textures"], texdata, names, dynblob, opts) != 0)
 				return -1;
 		}
-		if (json_object::has(object, "uniforms"))
+		if (json_object::has(obj, "uniforms"))
 		{
-			if (parse_uniforms(object["uniforms"], unidata, names, dynblob, opts) != 0)
+			if (parse_uniforms(obj["uniforms"], unidata, names, dynblob, opts) != 0)
 				return -1;
 		}
 

src/resource/mesh_resource.cpp

@@ -218,37 +218,37 @@ namespace mesh_resource_internal
 		void parse_float_array(const char* array_json, Array<f32>& output)
 		{
 			TempAllocator4096 ta;
-			JsonArray array(ta);
-			sjson::parse_array(array, array_json);
+			JsonArray arr(ta);
+			sjson::parse_array(arr, array_json);
 
-			array::resize(output, array::size(array));
-			for (u32 i = 0; i < array::size(array); ++i)
+			array::resize(output, array::size(arr));
+			for (u32 i = 0; i < array::size(arr); ++i)
 			{
-				output[i] = sjson::parse_float(array[i]);
+				output[i] = sjson::parse_float(arr[i]);
 			}
 		}
 
 		void parse_index_array(const char* array_json, Array<u16>& output)
 		{
 			TempAllocator4096 ta;
-			JsonArray array(ta);
-			sjson::parse_array(array, array_json);
+			JsonArray arr(ta);
+			sjson::parse_array(arr, array_json);
 
-			array::resize(output, array::size(array));
-			for (u32 i = 0; i < array::size(array); ++i)
+			array::resize(output, array::size(arr));
+			for (u32 i = 0; i < array::size(arr); ++i)
 			{
-				output[i] = (u16)sjson::parse_int(array[i]);
+				output[i] = (u16)sjson::parse_int(arr[i]);
 			}
 		}
 
 		void parse_indices(const char* json)
 		{
 			TempAllocator4096 ta;
-			JsonObject object(ta);
-			sjson::parse(object, json);
+			JsonObject obj(ta);
+			sjson::parse(obj, json);
 
 			JsonArray data_json(ta);
-			sjson::parse_array(data_json, object["data"]);
+			sjson::parse_array(data_json, obj["data"]);
 
 			parse_index_array(data_json[0], _position_indices);
 
@@ -265,28 +265,28 @@ namespace mesh_resource_internal
 		void parse(const char* geometry, const char* node)
 		{
 			TempAllocator4096 ta;
-			JsonObject object(ta);
-			JsonObject object_node(ta);
-			sjson::parse(object, geometry);
-			sjson::parse(object_node, node);
+			JsonObject obj(ta);
+			JsonObject obj_node(ta);
+			sjson::parse(obj, geometry);
+			sjson::parse(obj_node, node);
 
-			_has_normal = json_object::has(object, "normal");
-			_has_uv     = json_object::has(object, "texcoord");
+			_has_normal = json_object::has(obj, "normal");
+			_has_uv     = json_object::has(obj, "texcoord");
 
-			parse_float_array(object["position"], _positions);
+			parse_float_array(obj["position"], _positions);
 
 			if (_has_normal)
 			{
-				parse_float_array(object["normal"], _normals);
+				parse_float_array(obj["normal"], _normals);
 			}
 			if (_has_uv)
 			{
-				parse_float_array(object["texcoord"], _uvs);
+				parse_float_array(obj["texcoord"], _uvs);
 			}
 
-			parse_indices(object["indices"]);
+			parse_indices(obj["indices"]);
 
-			_matrix_local = sjson::parse_matrix4x4(object_node["matrix_local"]);
+			_matrix_local = sjson::parse_matrix4x4(obj_node["matrix_local"]);
 
 			_vertex_stride = 0;
 			_vertex_stride += 3 * sizeof(f32);
@@ -373,13 +373,13 @@ namespace mesh_resource_internal
 		Buffer buf = opts.read();
 
 		TempAllocator4096 ta;
-		JsonObject object(ta);
-		sjson::parse(object, buf);
+		JsonObject obj(ta);
+		sjson::parse(obj, buf);
 
 		JsonObject geometries(ta);
-		sjson::parse(geometries, object["geometries"]);
+		sjson::parse(geometries, obj["geometries"]);
 		JsonObject nodes(ta);
-		sjson::parse(nodes, object["nodes"]);
+		sjson::parse(nodes, obj["nodes"]);
 
 		opts.write(RESOURCE_HEADER(RESOURCE_VERSION_MESH));
 		opts.write(json_object::size(geometries));

src/resource/package_resource.cpp

@@ -114,7 +114,7 @@ namespace package_resource_internal
 	s32 compile(CompileOptions& opts)
 	{
 		TempAllocator4096 ta;
-		JsonObject object(ta);
+		JsonObject obj(ta);
 		JsonArray texture(ta);
 		JsonArray script(ta);
 		JsonArray sound(ta);
@@ -132,20 +132,20 @@ namespace package_resource_internal
 		HashSet<PackageResource::Resource> resources_set(default_allocator());
 
 		Buffer buf = opts.read();
-		sjson::parse(object, buf);
-
-		if (json_object::has(object, "texture"))          sjson::parse_array(texture, object["texture"]);
-		if (json_object::has(object, "lua"))              sjson::parse_array(script, object["lua"]);
-		if (json_object::has(object, "sound"))            sjson::parse_array(sound, object["sound"]);
-		if (json_object::has(object, "mesh"))             sjson::parse_array(mesh, object["mesh"]);
-		if (json_object::has(object, "unit"))             sjson::parse_array(unit, object["unit"]);
-		if (json_object::has(object, "sprite"))           sjson::parse_array(sprite, object["sprite"]);
-		if (json_object::has(object, "material"))         sjson::parse_array(material, object["material"]);
-		if (json_object::has(object, "font"))             sjson::parse_array(font, object["font"]);
-		if (json_object::has(object, "level"))            sjson::parse_array(level, object["level"]);
-		if (json_object::has(object, "physics_config"))   sjson::parse_array(phyconf, object["physics_config"]);
-		if (json_object::has(object, "shader"))           sjson::parse_array(shader, object["shader"]);
-		if (json_object::has(object, "sprite_animation")) sjson::parse_array(sprite_animation, object["sprite_animation"]);
+		sjson::parse(obj, buf);
+
+		if (json_object::has(obj, "texture"))          sjson::parse_array(texture, obj["texture"]);
+		if (json_object::has(obj, "lua"))              sjson::parse_array(script, obj["lua"]);
+		if (json_object::has(obj, "sound"))            sjson::parse_array(sound, obj["sound"]);
+		if (json_object::has(obj, "mesh"))             sjson::parse_array(mesh, obj["mesh"]);
+		if (json_object::has(obj, "unit"))             sjson::parse_array(unit, obj["unit"]);
+		if (json_object::has(obj, "sprite"))           sjson::parse_array(sprite, obj["sprite"]);
+		if (json_object::has(obj, "material"))         sjson::parse_array(material, obj["material"]);
+		if (json_object::has(obj, "font"))             sjson::parse_array(font, obj["font"]);
+		if (json_object::has(obj, "level"))            sjson::parse_array(level, obj["level"]);
+		if (json_object::has(obj, "physics_config"))   sjson::parse_array(phyconf, obj["physics_config"]);
+		if (json_object::has(obj, "shader"))           sjson::parse_array(shader, obj["shader"]);
+		if (json_object::has(obj, "sprite_animation")) sjson::parse_array(sprite_animation, obj["sprite_animation"]);
 
 		if (compile_resources(resources_set, opts, "texture", texture) != 0) return -1;
 		if (compile_resources(resources_set, opts, "lua", script) != 0) return -1;

src/resource/physics_resource.cpp

@@ -371,14 +371,14 @@ namespace physics_config_resource_internal
 	void parse_materials(const char* json, Array<PhysicsMaterial>& objects)
 	{
 		TempAllocator4096 ta;
-		JsonObject object(ta);
-		sjson::parse(object, json);
+		JsonObject obj(ta);
+		sjson::parse(obj, json);
 
-		auto cur = json_object::begin(object);
-		auto end = json_object::end(object);
+		auto cur = json_object::begin(obj);
+		auto end = json_object::end(obj);
 		for (; cur != end; ++cur)
 		{
-			JSON_OBJECT_SKIP_HOLE(object, cur);
+			JSON_OBJECT_SKIP_HOLE(obj, cur);
 
 			const StringView key = cur->first;
 			const char* value    = cur->second;
@@ -399,14 +399,14 @@ namespace physics_config_resource_internal
 	void parse_actors(const char* json, Array<PhysicsActor>& objects)
 	{
 		TempAllocator4096 ta;
-		JsonObject object(ta);
-		sjson::parse(object, json);
+		JsonObject obj(ta);
+		sjson::parse(obj, json);
 
-		auto cur = json_object::begin(object);
-		auto end = json_object::end(object);
+		auto cur = json_object::begin(obj);
+		auto end = json_object::end(obj);
 		for (; cur != end; ++cur)
 		{
-			JSON_OBJECT_SKIP_HOLE(object, cur);
+			JSON_OBJECT_SKIP_HOLE(obj, cur);
 
 			const StringView key = cur->first;
 			const char* value    = cur->second;
@@ -452,14 +452,14 @@ namespace physics_config_resource_internal
 		void parse(const char* json)
 		{
 			TempAllocator4096 ta;
-			JsonObject object(ta);
-			sjson::parse(object, json);
+			JsonObject obj(ta);
+			sjson::parse(obj, json);
 
-			auto cur = json_object::begin(object);
-			auto end = json_object::end(object);
+			auto cur = json_object::begin(obj);
+			auto end = json_object::end(obj);
 			for (; cur != end; ++cur)
 			{
-				JSON_OBJECT_SKIP_HOLE(object, cur);
+				JSON_OBJECT_SKIP_HOLE(obj, cur);
 
 				const StringView key = cur->first;
 				const StringId32 id  = StringId32(key.data(), key.length());
@@ -467,11 +467,11 @@ namespace physics_config_resource_internal
 				hash_map::set(_filter_map, id, new_filter_mask());
 			}
 
-			cur = json_object::begin(object);
-			end = json_object::end(object);
+			cur = json_object::begin(obj);
+			end = json_object::end(obj);
 			for (; cur != end; ++cur)
 			{
-				JSON_OBJECT_SKIP_HOLE(object, cur);
+				JSON_OBJECT_SKIP_HOLE(obj, cur);
 
 				const StringView key = cur->first;
 				const char* value    = cur->second;
@@ -528,20 +528,20 @@ namespace physics_config_resource_internal
 	{
 		Buffer buf = opts.read();
 		TempAllocator4096 ta;
-		JsonObject object(ta);
-		sjson::parse(object, buf);
+		JsonObject obj(ta);
+		sjson::parse(obj, buf);
 
 		Array<PhysicsMaterial> materials(default_allocator());
 		Array<PhysicsActor> actors(default_allocator());
 		CollisionFilterCompiler cfc(opts);
 
 		// Parse materials
-		if (json_object::has(object, "collision_filters"))
-			cfc.parse(object["collision_filters"]);
-		if (json_object::has(object, "materials"))
-			parse_materials(object["materials"], materials);
-		if (json_object::has(object, "actors"))
-			parse_actors(object["actors"], actors);
+		if (json_object::has(obj, "collision_filters"))
+			cfc.parse(obj["collision_filters"]);
+		if (json_object::has(obj, "materials"))
+			parse_materials(obj["materials"], materials);
+		if (json_object::has(obj, "actors"))
+			parse_actors(obj["actors"], actors);
 
 		// Setup struct for writing
 		PhysicsConfigResource pcr;

src/resource/shader_resource.cpp

@@ -689,13 +689,13 @@ namespace shader_resource_internal
 		s32 parse(Buffer buf)
 		{
 			TempAllocator4096 ta;
-			JsonObject object(ta);
-			sjson::parse(object, buf);
+			JsonObject obj(ta);
+			sjson::parse(obj, buf);
 
-			if (json_object::has(object, "include"))
+			if (json_object::has(obj, "include"))
 			{
 				JsonArray arr(ta);
-				sjson::parse_array(arr, object["include"]);
+				sjson::parse_array(arr, obj["include"]);
 
 				for (u32 i = 0; i < array::size(arr); ++i)
 				{
@@ -705,33 +705,33 @@ namespace shader_resource_internal
 				}
 			}
 
-			if (json_object::has(object, "render_states"))
+			if (json_object::has(obj, "render_states"))
 			{
-				if (parse_render_states(object["render_states"]) != 0)
+				if (parse_render_states(obj["render_states"]) != 0)
 					return -1;
 			}
 
-			if (json_object::has(object, "sampler_states"))
+			if (json_object::has(obj, "sampler_states"))
 			{
-				if (parse_sampler_states(object["sampler_states"]) != 0)
+				if (parse_sampler_states(obj["sampler_states"]) != 0)
 					return -1;
 			}
 
-			if (json_object::has(object, "bgfx_shaders"))
+			if (json_object::has(obj, "bgfx_shaders"))
 			{
-				if (parse_bgfx_shaders(object["bgfx_shaders"]) != 0)
+				if (parse_bgfx_shaders(obj["bgfx_shaders"]) != 0)
 					return -1;
 			}
 
-			if (json_object::has(object, "shaders"))
+			if (json_object::has(obj, "shaders"))
 			{
-				if (parse_shaders(object["shaders"]) != 0)
+				if (parse_shaders(obj["shaders"]) != 0)
 					return -1;
 			}
 
-			if (json_object::has(object, "static_compile"))
+			if (json_object::has(obj, "static_compile"))
 			{
-				if (parse_static_compile(object["static_compile"]) != 0)
+				if (parse_static_compile(obj["static_compile"]) != 0)
 					return -1;
 			}
 

src/resource/sound_resource.cpp

@@ -49,11 +49,11 @@ namespace sound_resource_internal
 		Buffer buf = opts.read();
 
 		TempAllocator4096 ta;
-		JsonObject object(ta);
-		sjson::parse(object, buf);
+		JsonObject obj(ta);
+		sjson::parse(obj, buf);
 
 		DynamicString name(ta);
-		sjson::parse_string(name, object["source"]);
+		sjson::parse_string(name, obj["source"]);
 
 		Buffer sound = opts.read(name.c_str());
 		const WAVHeader* wav = (const WAVHeader*)array::begin(sound);

src/resource/sprite_resource.cpp

@@ -56,15 +56,15 @@ namespace sprite_resource_internal
 		Buffer buf = opts.read();
 
 		TempAllocator4096 ta;
-		JsonObject object(ta);
-		sjson::parse(object, buf);
+		JsonObject obj(ta);
+		sjson::parse(obj, buf);
 
 		JsonArray frames(ta);
-		sjson::parse_array(frames, object["frames"]);
+		sjson::parse_array(frames, obj["frames"]);
 
 		// Read width/height
-		const f32 width      = sjson::parse_float(object["width"]);
-		const f32 height     = sjson::parse_float(object["height"]);
+		const f32 width      = sjson::parse_float(obj["width"]);
+		const f32 height     = sjson::parse_float(obj["height"]);
 		const u32 num_frames = array::size(frames);
 
 		Array<f32> vertices(default_allocator());
@@ -174,20 +174,20 @@ namespace sprite_animation_resource_internal
 		Buffer buf = opts.read();
 
 		TempAllocator4096 ta;
-		JsonObject object(ta);
+		JsonObject obj(ta);
 		JsonArray  object_frames(ta);
 
 		Array<u32> frames(default_allocator());
 		float total_time = 0.0f;
 
-		sjson::parse(object, buf);
-		sjson::parse_array(object_frames, object["frames"]);
+		sjson::parse(obj, buf);
+		sjson::parse_array(object_frames, obj["frames"]);
 
 		array::resize(frames, array::size(object_frames));
 		for (u32 i = 0; i < array::size(object_frames); ++i)
 			frames[i] = (u32)sjson::parse_float(object_frames[i]);
 
-		total_time = sjson::parse_float(object["total_time"]);
+		total_time = sjson::parse_float(obj["total_time"]);
 
 		// Write
 		SpriteAnimationResource sar;

src/resource/state_machine_resource.cpp

@@ -258,13 +258,13 @@ namespace state_machine_internal
 		s32 parse(Buffer& buf)
 		{
 			TempAllocator4096 ta;
-			JsonObject object(ta);
+			JsonObject obj(ta);
 			JsonArray states(ta);
 			JsonArray variables(ta);
 
-			sjson::parse(object, buf);
-			sjson::parse_array(states, object["states"]);
-			sjson::parse_array(variables, object["variables"]);
+			sjson::parse(obj, buf);
+			sjson::parse_array(states, obj["states"]);
+			sjson::parse_array(variables, obj["variables"]);
 
 			// Parse states
 			for (u32 i = 0; i < array::size(states); ++i)
@@ -347,7 +347,7 @@ namespace state_machine_internal
 				, "State machine must contain one state at least"
 				);
 
-			_initial_state = sjson::parse_guid(object["initial_state"]);
+			_initial_state = sjson::parse_guid(obj["initial_state"]);
 			DATA_COMPILER_ASSERT(hash_map::has(_states, _initial_state)
 				, _opts
 				, "Initial state references non-existing state"

src/resource/texture_resource.cpp

@@ -80,16 +80,16 @@ namespace texture_resource_internal
 		Buffer buf = opts.read();
 
 		TempAllocator4096 ta;
-		JsonObject object(ta);
-		sjson::parse(object, buf);
+		JsonObject obj(ta);
+		sjson::parse(obj, buf);
 
 		DynamicString name(ta);
-		sjson::parse_string(name, object["source"]);
+		sjson::parse_string(name, obj["source"]);
 		DATA_COMPILER_ASSERT_FILE_EXISTS(name.c_str(), opts);
 		opts.fake_read(name.c_str());
 
-		const bool generate_mips = sjson::parse_bool(object["generate_mips"]);
-		const bool normal_map    = sjson::parse_bool(object["normal_map"]);
+		const bool generate_mips = sjson::parse_bool(obj["generate_mips"]);
+		const bool normal_map    = sjson::parse_bool(obj["normal_map"]);
 
 		DynamicString texsrc(ta);
 		DynamicString texout(ta);