From 2fcfa400b1ef635f6af72a51df75a327f7949759 Mon Sep 17 00:00:00 2001 From: yndu13 Date: Tue, 12 Jul 2022 11:09:13 +0800 Subject: [PATCH] fix: model convert to map except blank struct --- src/langs/python/combinator.js | 4 ++-- src/langs/python2/combinator.js | 22 +++++++++---------- .../complex/tea_python_tests/models.py | 4 ++-- .../python2/model/tea_python_tests/models.py | 20 ++++++++--------- .../complex/tea_python_tests/models.py | 4 ++-- .../python3/model/tea_python_tests/models.py | 20 ++++++++--------- 6 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/langs/python/combinator.js b/src/langs/python/combinator.js index 004e752..26a5d2d 100644 --- a/src/langs/python/combinator.js +++ b/src/langs/python/combinator.js @@ -658,9 +658,9 @@ class Combinator extends CombinatorBase { emitter.emitln(`${carrier}[k${num}] = l${depth}`, this.level); } } else { - emitter.emitln(`result['${fieldName}'] = []`, this.level); emitter.emitln(`if self.${_name(name)} is not None:`, this.level); this.levelUp(); + emitter.emitln(`result['${fieldName}'] = []`, this.level); emitter.emitln(`for k in self.${_name(name)}:`, this.level); this.levelUp(); if (type.itemType.valType || type.itemType.itemType) { @@ -702,9 +702,9 @@ class Combinator extends CombinatorBase { emitter.emitln(`${carrier}[k${num}] = d${depth}`, this.level); } } else { - emitter.emitln(`result['${fieldName}'] = {}`, this.level); emitter.emitln(`if self.${_name(name)} is not None:`, this.level); this.levelUp(); + emitter.emitln(`result['${fieldName}'] = {}`, this.level); emitter.emitln(`for k, v in self.${_name(name)}.items():`, this.level); this.levelUp(); if (type.valType.valType || type.valType.itemType) { diff --git a/src/langs/python2/combinator.js b/src/langs/python2/combinator.js index f0c99fa..1d93342 100644 --- a/src/langs/python2/combinator.js +++ b/src/langs/python2/combinator.js @@ -295,7 +295,7 @@ class Combinator extends CombinatorBase { emitter = new Emitter(this.config); this.emitClass(emitter, object); - + outputParts.body = this.checkSyntax(emitter.output, emitter); /******************************** emit head *******************************/ emitter = new Emitter(this.config); @@ -599,9 +599,9 @@ class Combinator extends CombinatorBase { emitter.emitln(`${carrier}[k${num}] = l${depth}`, this.level); } } else { - emitter.emitln(`result['${fieldName}'] = []`, this.level); emitter.emitln(`if self.${_name(name)} is not None:`, this.level); this.levelUp(); + emitter.emitln(`result['${fieldName}'] = []`, this.level); emitter.emitln(`for k in self.${_name(name)}:`, this.level); this.levelUp(); if (type.itemType.valType || type.itemType.itemType) { @@ -643,9 +643,9 @@ class Combinator extends CombinatorBase { emitter.emitln(`${carrier}[k${num}] = d${depth}`, this.level); } } else { - emitter.emitln(`result['${fieldName}'] = {}`, this.level); emitter.emitln(`if self.${_name(name)} is not None:`, this.level); this.levelUp(); + emitter.emitln(`result['${fieldName}'] = {}`, this.level); emitter.emitln(`for k, v in self.${_name(name)}.items():`, this.level); this.levelUp(); if (type.valType.valType || type.valType.itemType) { @@ -889,7 +889,7 @@ class Combinator extends CombinatorBase { this.levelDown(); } - emitNotes(emitter, notes) {} + emitNotes(emitter, notes) { } emitConstruct(emitter, construct, props, isModule = false) { if (construct.params.length + props.length > 0) { @@ -915,10 +915,10 @@ class Combinator extends CombinatorBase { props.forEach((prop) => { if (prop instanceof PropItem) { let str = ` ${_name(prop.name)}=None`; - if(curr_length+str.length>=max_length){ - str = emitter.eol + emitter.indent(this.level + 3) + str; + if (curr_length + str.length >= max_length) { + str = emitter.eol + emitter.indent(this.level + 3) + str; curr_length = 0; - }else{ + } else { curr_length = curr_length + str.length; } constructProps.push(str); @@ -1257,7 +1257,7 @@ class Combinator extends CombinatorBase { from: from, import: imp }); - } + } } grammerExpr(emitter, gram) { @@ -1269,7 +1269,7 @@ class Combinator extends CombinatorBase { emitter.emit(` ${_symbol(gram.opt)} `); this.grammer(emitter, gram.right, false, false); } - + grammerVar(emitter, gram) { if (gram.varType === 'static_class') { const name = gram.name ? gram.name : gram.key; @@ -1387,7 +1387,7 @@ class Combinator extends CombinatorBase { if (item instanceof AnnotationItem) { if (item.mode === 'single') { emit.emit(`# ${item.content}`, this.level); - } + } tmp.push(emit.output); return true; } @@ -1653,7 +1653,7 @@ class Combinator extends CombinatorBase { const quote = this._adaptedQuotes(behavior.key, emitter); emitter.emit(`${emit.output}[${quote}${behavior.key}${quote}] = `, this.level); } - + this.grammerValue(emitter, behavior.value); emitter.emitln(''); } diff --git a/tests/expected/python2/complex/tea_python_tests/models.py b/tests/expected/python2/complex/tea_python_tests/models.py index 274a090..4545c72 100644 --- a/tests/expected/python2/complex/tea_python_tests/models.py +++ b/tests/expected/python2/complex/tea_python_tests/models.py @@ -177,12 +177,12 @@ def to_map(self): result['Num'] = self.num if self.configs is not None: result['configs'] = self.configs.to_map() - result['Part'] = [] if self.part is not None: + result['Part'] = [] for k in self.part: result['Part'].append(k.to_map() if k else None) - result['complexList'] = [] if self.complex_list is not None: + result['complexList'] = [] for k in self.complex_list: l1 = [] for k1 in k: diff --git a/tests/expected/python2/model/tea_python_tests/models.py b/tests/expected/python2/model/tea_python_tests/models.py index b441f0c..3ec9d28 100644 --- a/tests/expected/python2/model/tea_python_tests/models.py +++ b/tests/expected/python2/model/tea_python_tests/models.py @@ -125,8 +125,8 @@ def to_map(self): return _map result = dict() - result['subModel'] = [] if self.sub_model is not None: + result['subModel'] = [] for k in self.sub_model: result['subModel'].append(k.to_map() if k else None) return result @@ -245,8 +245,8 @@ def to_map(self): result['realName'] = self.name if self.submodel is not None: result['submodel'] = self.submodel.to_map() - result['subarray'] = [] if self.subarray is not None: + result['subarray'] = [] for k in self.subarray: result['subarray'].append(k.to_map() if k else None) if self.maparray is not None: @@ -271,26 +271,26 @@ def to_map(self): result['minimum'] = self.minimum if self.test_3 is not None: result['test3'] = self.test_3 - result['arrayArrayModel'] = [] if self.array_array_model is not None: + result['arrayArrayModel'] = [] for k in self.array_array_model: l1 = [] for k1 in k: l1.append(k1.to_map() if k1 else None) result['arrayArrayModel'].append(l1) - result['arrayMapModel'] = [] if self.array_map_model is not None: + result['arrayMapModel'] = [] for k in self.array_map_model: d1 = {} for k1 ,v1 in k.items(): d1[k1] = v1.to_map() result['arrayMapModel'].append(d1) - result['mapModel'] = {} if self.map_model is not None: + result['mapModel'] = {} for k, v in self.map_model.items(): result['mapModel'][k] = v.to_map() - result['submodelMap'] = {} if self.submodel_map is not None: + result['submodelMap'] = {} for k, v in self.submodel_map.items(): result['submodelMap'][k] = v.to_map() if self.sub_model_model is not None: @@ -410,23 +410,23 @@ def to_map(self): result = dict() if self.oneself is not None: result['oneself'] = self.oneself.to_map() - result['selfArray'] = [] if self.self_array is not None: + result['selfArray'] = [] for k in self.self_array: result['selfArray'].append(k.to_map() if k else None) - result['selfMap'] = {} if self.self_map is not None: + result['selfMap'] = {} for k, v in self.self_map.items(): result['selfMap'][k] = v.to_map() - result['selfArrayMap'] = [] if self.self_array_map is not None: + result['selfArrayMap'] = [] for k in self.self_array_map: d1 = {} for k1 ,v1 in k.items(): d1[k1] = v1.to_map() result['selfArrayMap'].append(d1) - result['selfArrayArray'] = [] if self.self_array_array is not None: + result['selfArrayArray'] = [] for k in self.self_array_array: l1 = [] for k1 in k: diff --git a/tests/expected/python3/complex/tea_python_tests/models.py b/tests/expected/python3/complex/tea_python_tests/models.py index ef0e18d..285de6c 100644 --- a/tests/expected/python3/complex/tea_python_tests/models.py +++ b/tests/expected/python3/complex/tea_python_tests/models.py @@ -203,12 +203,12 @@ def to_map(self): result['Num'] = self.num if self.configs is not None: result['configs'] = self.configs.to_map() - result['Part'] = [] if self.part is not None: + result['Part'] = [] for k in self.part: result['Part'].append(k.to_map() if k else None) - result['complexList'] = [] if self.complex_list is not None: + result['complexList'] = [] for k in self.complex_list: l1 = [] for k1 in k: diff --git a/tests/expected/python3/model/tea_python_tests/models.py b/tests/expected/python3/model/tea_python_tests/models.py index 6960000..d486b2a 100644 --- a/tests/expected/python3/model/tea_python_tests/models.py +++ b/tests/expected/python3/model/tea_python_tests/models.py @@ -49,23 +49,23 @@ def to_map(self): result = dict() if self.oneself is not None: result['oneself'] = self.oneself.to_map() - result['selfArray'] = [] if self.self_array is not None: + result['selfArray'] = [] for k in self.self_array: result['selfArray'].append(k.to_map() if k else None) - result['selfMap'] = {} if self.self_map is not None: + result['selfMap'] = {} for k, v in self.self_map.items(): result['selfMap'][k] = v.to_map() - result['selfArrayMap'] = [] if self.self_array_map is not None: + result['selfArrayMap'] = [] for k in self.self_array_map: d1 = {} for k1 ,v1 in k.items(): d1[k1] = v1.to_map() result['selfArrayMap'].append(d1) - result['selfArrayArray'] = [] if self.self_array_array is not None: + result['selfArrayArray'] = [] for k in self.self_array_array: l1 = [] for k1 in k: @@ -154,8 +154,8 @@ def to_map(self): return _map result = dict() - result['subModel'] = [] if self.sub_model is not None: + result['subModel'] = [] for k in self.sub_model: result['subModel'].append(k.to_map() if k else None) return result @@ -296,8 +296,8 @@ def to_map(self): result['realName'] = self.name if self.submodel is not None: result['submodel'] = self.submodel.to_map() - result['subarray'] = [] if self.subarray is not None: + result['subarray'] = [] for k in self.subarray: result['subarray'].append(k.to_map() if k else None) if self.maparray is not None: @@ -322,26 +322,26 @@ def to_map(self): result['minimum'] = self.minimum if self.test_3 is not None: result['test3'] = self.test_3 - result['arrayArrayModel'] = [] if self.array_array_model is not None: + result['arrayArrayModel'] = [] for k in self.array_array_model: l1 = [] for k1 in k: l1.append(k1.to_map() if k1 else None) result['arrayArrayModel'].append(l1) - result['arrayMapModel'] = [] if self.array_map_model is not None: + result['arrayMapModel'] = [] for k in self.array_map_model: d1 = {} for k1 ,v1 in k.items(): d1[k1] = v1.to_map() result['arrayMapModel'].append(d1) - result['mapModel'] = {} if self.map_model is not None: + result['mapModel'] = {} for k, v in self.map_model.items(): result['mapModel'][k] = v.to_map() - result['submodelMap'] = {} if self.submodel_map is not None: + result['submodelMap'] = {} for k, v in self.submodel_map.items(): result['submodelMap'][k] = v.to_map() if self.sub_model_model is not None: