Making script autogenerated files code format more consistent

include/anki/collision/Frustum.h

@@ -193,7 +193,7 @@ public:
 		ANKI_ASSERT(fovX <= getPi<F32>());
 		ANKI_ASSERT(fovY <= getPi<F32>());
 		m_fovX = fovX;
-		m_fovY = fovY,
+		m_fovY = fovY;
 		m_near = near;
 		m_far = far;
 		m_frustumDirty = true;

src/script/Event.cpp

@@ -84,11 +84,19 @@ static inline int pwrapLightEventsetIntensityMultiplier(lua_State* l)
 	LuaBinder::checkArgsCount(l, 2);
 	
 	// Get "this" as "self"
-	if(LuaBinder::checkUserData(l, 1, classnameLightEvent, 840634010629725278, ud)) return -1;
+	if(LuaBinder::checkUserData(l, 1, classnameLightEvent, 840634010629725278, ud))
+	{
+		return -1;
+	}
+	
 	LightEvent* self = ud->getData<LightEvent>();
 	
 	// Pop arguments
-	if(LuaBinder::checkUserData(l, 2, "Vec4", 6804478823655046386, ud)) return -1;
+	if(LuaBinder::checkUserData(l, 2, "Vec4", 6804478823655046386, ud))
+	{
+		return -1;
+	}
+	
 	Vec4* iarg0 = ud->getData<Vec4>();
 	const Vec4& arg0(*iarg0);
 	
@@ -103,7 +111,11 @@ static inline int pwrapLightEventsetIntensityMultiplier(lua_State* l)
 static int wrapLightEventsetIntensityMultiplier(lua_State* l)
 {
 	int res = pwrapLightEventsetIntensityMultiplier(l);
-	if(res >= 0) return res;
+	if(res >= 0)
+	{
+		return res;
+	}
+	
 	lua_error(l);
 	return 0;
 }
@@ -122,15 +134,25 @@ static inline int pwrapLightEventsetFrequency(lua_State* l)
 	LuaBinder::checkArgsCount(l, 3);
 	
 	// Get "this" as "self"
-	if(LuaBinder::checkUserData(l, 1, classnameLightEvent, 840634010629725278, ud)) return -1;
+	if(LuaBinder::checkUserData(l, 1, classnameLightEvent, 840634010629725278, ud))
+	{
+		return -1;
+	}
+	
 	LightEvent* self = ud->getData<LightEvent>();
 	
 	// Pop arguments
 	F32 arg0;
-	if(LuaBinder::checkNumber(l, 2, arg0)) return -1;
+	if(LuaBinder::checkNumber(l, 2, arg0))
+	{
+		return -1;
+	}
 	
 	F32 arg1;
-	if(LuaBinder::checkNumber(l, 3, arg1)) return -1;
+	if(LuaBinder::checkNumber(l, 3, arg1))
+	{
+		return -1;
+	}
 	
 	// Call the method
 	self->setFrequency(arg0, arg1);
@@ -143,7 +165,11 @@ static inline int pwrapLightEventsetFrequency(lua_State* l)
 static int wrapLightEventsetFrequency(lua_State* l)
 {
 	int res = pwrapLightEventsetFrequency(l);
-	if(res >= 0) return res;
+	if(res >= 0)
+	{
+		return res;
+	}
+	
 	lua_error(l);
 	return 0;
 }
@@ -191,17 +217,31 @@ static inline int pwrapEventManagernewSceneAmbientColorEvent(lua_State* l)
 	LuaBinder::checkArgsCount(l, 4);
 	
 	// Get "this" as "self"
-	if(LuaBinder::checkUserData(l, 1, classnameEventManager, -6959305329499243407, ud)) return -1;
+	if(LuaBinder::checkUserData(l, 1, classnameEventManager, -6959305329499243407, ud))
+	{
+		return -1;
+	}
+	
 	EventManager* self = ud->getData<EventManager>();
 	
 	// Pop arguments
 	F32 arg0;
-	if(LuaBinder::checkNumber(l, 2, arg0)) return -1;
+	if(LuaBinder::checkNumber(l, 2, arg0))
+	{
+		return -1;
+	}
 	
 	F32 arg1;
-	if(LuaBinder::checkNumber(l, 3, arg1)) return -1;
+	if(LuaBinder::checkNumber(l, 3, arg1))
+	{
+		return -1;
+	}
+	
+	if(LuaBinder::checkUserData(l, 4, "Vec4", 6804478823655046386, ud))
+	{
+		return -1;
+	}
 	
-	if(LuaBinder::checkUserData(l, 4, "Vec4", 6804478823655046386, ud)) return -1;
 	Vec4* iarg2 = ud->getData<Vec4>();
 	const Vec4& arg2(*iarg2);
 	
@@ -228,7 +268,11 @@ static inline int pwrapEventManagernewSceneAmbientColorEvent(lua_State* l)
 static int wrapEventManagernewSceneAmbientColorEvent(lua_State* l)
 {
 	int res = pwrapEventManagernewSceneAmbientColorEvent(l);
-	if(res >= 0) return res;
+	if(res >= 0)
+	{
+		return res;
+	}
+	
 	lua_error(l);
 	return 0;
 }
@@ -247,17 +291,31 @@ static inline int pwrapEventManagernewLightEvent(lua_State* l)
 	LuaBinder::checkArgsCount(l, 4);
 	
 	// Get "this" as "self"
-	if(LuaBinder::checkUserData(l, 1, classnameEventManager, -6959305329499243407, ud)) return -1;
+	if(LuaBinder::checkUserData(l, 1, classnameEventManager, -6959305329499243407, ud))
+	{
+		return -1;
+	}
+	
 	EventManager* self = ud->getData<EventManager>();
 	
 	// Pop arguments
 	F32 arg0;
-	if(LuaBinder::checkNumber(l, 2, arg0)) return -1;
+	if(LuaBinder::checkNumber(l, 2, arg0))
+	{
+		return -1;
+	}
 	
 	F32 arg1;
-	if(LuaBinder::checkNumber(l, 3, arg1)) return -1;
+	if(LuaBinder::checkNumber(l, 3, arg1))
+	{
+		return -1;
+	}
+	
+	if(LuaBinder::checkUserData(l, 4, "SceneNode", -2220074417980276571, ud))
+	{
+		return -1;
+	}
 	
-	if(LuaBinder::checkUserData(l, 4, "SceneNode", -2220074417980276571, ud)) return -1;
 	SceneNode* iarg2 = ud->getData<SceneNode>();
 	SceneNode* arg2(iarg2);
 	
@@ -284,7 +342,11 @@ static inline int pwrapEventManagernewLightEvent(lua_State* l)
 static int wrapEventManagernewLightEvent(lua_State* l)
 {
 	int res = pwrapEventManagernewLightEvent(l);
-	if(res >= 0) return res;
+	if(res >= 0)
+	{
+		return res;
+	}
+	
 	lua_error(l);
 	return 0;
 }
@@ -335,7 +397,11 @@ static inline int pwrapgetEventManager(lua_State* l)
 static int wrapgetEventManager(lua_State* l)
 {
 	int res = pwrapgetEventManager(l);
-	if(res >= 0) return res;
+	if(res >= 0)
+	{
+		return res;
+	}
+	
 	lua_error(l);
 	return 0;
 }

src/script/Renderer.cpp

@@ -43,7 +43,11 @@ static inline int pwrapDbggetEnabled(lua_State* l)
 	LuaBinder::checkArgsCount(l, 1);
 	
 	// Get "this" as "self"
-	if(LuaBinder::checkUserData(l, 1, classnameDbg, -2784798555522127122, ud)) return -1;
+	if(LuaBinder::checkUserData(l, 1, classnameDbg, -2784798555522127122, ud))
+	{
+		return -1;
+	}
+	
 	Dbg* self = ud->getData<Dbg>();
 	
 	// Call the method
@@ -60,7 +64,11 @@ static inline int pwrapDbggetEnabled(lua_State* l)
 static int wrapDbggetEnabled(lua_State* l)
 {
 	int res = pwrapDbggetEnabled(l);
-	if(res >= 0) return res;
+	if(res >= 0)
+	{
+		return res;
+	}
+	
 	lua_error(l);
 	return 0;
 }
@@ -79,12 +87,19 @@ static inline int pwrapDbgsetEnabled(lua_State* l)
 	LuaBinder::checkArgsCount(l, 2);
 	
 	// Get "this" as "self"
-	if(LuaBinder::checkUserData(l, 1, classnameDbg, -2784798555522127122, ud)) return -1;
+	if(LuaBinder::checkUserData(l, 1, classnameDbg, -2784798555522127122, ud))
+	{
+		return -1;
+	}
+	
 	Dbg* self = ud->getData<Dbg>();
 	
 	// Pop arguments
 	Bool arg0;
-	if(LuaBinder::checkNumber(l, 2, arg0)) return -1;
+	if(LuaBinder::checkNumber(l, 2, arg0))
+	{
+		return -1;
+	}
 	
 	// Call the method
 	self->setEnabled(arg0);
@@ -97,7 +112,11 @@ static inline int pwrapDbgsetEnabled(lua_State* l)
 static int wrapDbgsetEnabled(lua_State* l)
 {
 	int res = pwrapDbgsetEnabled(l);
-	if(res >= 0) return res;
+	if(res >= 0)
+	{
+		return res;
+	}
+	
 	lua_error(l);
 	return 0;
 }

src/script/lua_glue_gen.py

@@ -168,15 +168,32 @@ def arg(arg_txt, stack_index, index):
 
 	if type_is_bool(type) or type_is_number(type):
 		wglue("%s arg%d;" % (type, index))
-		wglue("if(LuaBinder::checkNumber(l, %d, arg%d)) return -1;" \
+		wglue("if(LuaBinder::checkNumber(l, %d, arg%d))" \
 			% (stack_index, index))
+		wglue("{")
+		ident(1)
+		wglue("return -1;")
+		ident(-1)
+		wglue("}")
 	elif type == "char" or type == "CString":
 		wglue("const char* arg%d;" % index)
-		wglue("if(LuaBinder::checkString(l, %d, arg%d)) return -1;" \
+		wglue("if(LuaBinder::checkString(l, %d, arg%d))" \
 			% (stack_index, index))
+		wglue("{")
+		ident(1)
+		wglue("return -1;")
+		ident(-1)
+		wglue("}")
 	else:
-		wglue("if(LuaBinder::checkUserData(l, %d, \"%s\", %d, ud)) return -1;" \
+		wglue("if(LuaBinder::checkUserData(l, %d, \"%s\", %d, ud))" \
 			% (stack_index, type, type_sig(type)))
+		wglue("{")
+		ident(1)
+		wglue("return -1;")
+		ident(-1)
+		wglue("}")
+		wglue("")
+
 		wglue("%s* iarg%d = ud->getData<%s>();" \
 			% (type, index, type))
 
@@ -287,8 +304,14 @@ def method(class_name, meth_el):
 
 	# Get this pointer
 	wglue("// Get \"this\" as \"self\"")
-	wglue("if(LuaBinder::checkUserData(l, 1, classname%s, %d, ud)) return -1;" \
+	wglue("if(LuaBinder::checkUserData(l, 1, classname%s, %d, ud))" \
 		% (class_name, type_sig(class_name)))
+	wglue("{")
+	ident(1)
+	wglue("return -1;")
+	ident(-1)
+	wglue("}")
+	wglue("")
 	wglue("%s* self = ud->getData<%s>();" % (class_name, class_name))
 	wglue("")
 
@@ -328,7 +351,13 @@ def method(class_name, meth_el):
 	wglue("{")
 	ident(1)
 	wglue("int res = pwrap%s%s(l);" % (class_name, meth_alias))
-	wglue("if(res >= 0) return res;")
+	wglue("if(res >= 0)")
+	wglue("{")
+	ident(1)
+	wglue("return res;")
+	ident(-1)
+	wglue("}")
+	wglue("")
 	wglue("lua_error(l);")
 	wglue("return 0;")
 	ident(-1)
@@ -384,7 +413,13 @@ def static_method(class_name, meth_el):
 	wglue("{")
 	ident(1)
 	wglue("int res = pwrap%s%s(l);" % (class_name, meth_alias))
-	wglue("if(res >= 0) return res;")
+	wglue("if(res >= 0)")
+	wglue("{")
+	ident(1)
+	wglue("return res;")
+	ident(-1)
+	wglue("}")
+	wglue("")
 	wglue("lua_error(l);")
 	wglue("return 0;")
 	ident(-1)
@@ -433,7 +468,13 @@ def constructor(constr_el, class_name):
 	wglue("{")
 	ident(1)
 	wglue("int res = pwrap%sCtor(l);" % class_name)
-	wglue("if(res >= 0) return res;")
+	wglue("if(res >= 0)")
+	wglue("{")
+	ident(1)
+	wglue("return res;")
+	ident(-1)
+	wglue("}")
+	wglue("")
 	wglue("lua_error(l);")
 	wglue("return 0;")
 	ident(-1)
@@ -453,8 +494,14 @@ def destructor(class_name):
 	write_local_vars();
 
 	wglue("LuaBinder::checkArgsCount(l, 1);")
-	wglue("if(LuaBinder::checkUserData(l, 1, classname%s, %d, ud)) return -1;" \
+	wglue("if(LuaBinder::checkUserData(l, 1, classname%s, %d, ud))" \
 		% (class_name, type_sig(class_name)))
+	wglue("{")
+	ident(1)
+	wglue("return -1;")
+	ident(-1)
+	wglue("}")
+	wglue("");
 
 	wglue("if(ud->isGarbageCollected())")
 	wglue("{")
@@ -627,7 +674,13 @@ def function(func_el):
 	wglue("{")
 	ident(1)
 	wglue("int res = pwrap%s(l);" % func_alias)
-	wglue("if(res >= 0) return res;")
+	wglue("if(res >= 0)")
+	wglue("{")
+	ident(1)
+	wglue("return res;")
+	ident(-1)
+	wglue("}")
+	wglue("")
 	wglue("lua_error(l);")
 	wglue("return 0;")
 	ident(-1)