Skip to content

[WIP]fix: model convert to map except blank struct #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yndu13 wants to merge 1 commit into
base: master
Choose a base branch
from
+37 −37
Open

[WIP]fix: model convert to map except blank struct #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/langs/python/combinator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down
22 changes: 11 additions & 11 deletions src/langs/python2/combinator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand All @@ -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);
Expand Down Expand Up @@ -1257,7 +1257,7 @@ class Combinator extends CombinatorBase {
from: from,
import: imp
});
}
}
}

grammerExpr(emitter, gram) {
Expand All @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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('');
}
Expand Down
4 changes: 2 additions & 2 deletions tests/expected/python2/complex/tea_python_tests/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
20 changes: 10 additions & 10 deletions tests/expected/python2/model/tea_python_tests/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions tests/expected/python3/complex/tea_python_tests/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
20 changes: 10 additions & 10 deletions tests/expected/python3/model/tea_python_tests/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand Down