From: Martin Quinson Date: Fri, 30 Jun 2017 23:06:33 +0000 (+0200) Subject: generate code that does not drive clang-format crazy X-Git-Tag: v3_17~498 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/41f1c0a70615aef3bfcd39cff522e26620c9d489 generate code that does not drive clang-format crazy --- diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py index f846463b9c..4465a6420c 100755 --- a/src/simix/simcalls.py +++ b/src/simix/simcalls.py @@ -85,18 +85,19 @@ class Simcall(object): for i in range(len(self.args)): arg = self.args[i] rawtype = regex.sub(r'\1*\2', arg.rettype()) - res.append('static inline %s simcall_%s__get__%s(smx_simcall_t simcall) {' % ( + res.append('static inline %s simcall_%s__get__%s(smx_simcall_t simcall)' % ( arg.rettype(), self.name, arg.name)) - res.append( - ' return simgrid::simix::unmarshal<%s>(simcall->args[%i]);' % (arg.rettype(), i)) + res.append('{') + res.append(' return simgrid::simix::unmarshal<%s>(simcall->args[%i]);' % (arg.rettype(), i)) res.append('}') - res.append('static inline %s simcall_%s__getraw__%s(smx_simcall_t simcall) {' % ( + res.append('static inline %s simcall_%s__getraw__%s(smx_simcall_t simcall)' % ( rawtype, self.name, arg.name)) - res.append( - ' return simgrid::simix::unmarshal_raw<%s>(simcall->args[%i]);' % (rawtype, i)) + res.append('{') + res.append(' return simgrid::simix::unmarshal_raw<%s>(simcall->args[%i]);' % (rawtype, i)) res.append('}') - res.append('static inline void simcall_%s__set__%s(smx_simcall_t simcall, %s arg) {' % ( + res.append('static inline void simcall_%s__set__%s(smx_simcall_t simcall, %s arg)' % ( self.name, arg.name, arg.rettype())) + res.append('{') res.append(' simgrid::simix::marshal<%s>(simcall->args[%i], arg);' % (arg.rettype(), i)) res.append('}') @@ -104,7 +105,9 @@ class Simcall(object): if self.res.type != 'void': rawtype = regex.sub(r'\1*\2', self.res.rettype()) res.append( - 'static inline %s simcall_%s__get__result(smx_simcall_t simcall){' % (self.res.rettype(), self.name)) + 'static inline %s simcall_%s__get__result(smx_simcall_t simcall)' % (self.res.rettype(), self.name)) + res.append('{') + res.append(' return simgrid::simix::unmarshal<%s>(simcall->result);' % self.res.rettype()) res.append('}') res.append( @@ -139,7 +142,7 @@ class Simcall(object): return '\n'.join(res) def body(self): - res = [' '] + res = [''] res.append( 'inline static %s simcall_BODY_%s(%s) {' % (self.res.rettype(), self.name,