@darabonba/python-generator 1.2.16 → 1.2.18

package/.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "npm" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

package/.github/workflows/ci.yml

@@ -16,8 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x, 14.x, 16.x]
-        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+        node-version: [12.x, 14.x, 16.x, 18.x, 20.x]
 
     steps:
     - uses: actions/checkout@v2
@@ -27,4 +26,5 @@ jobs:
         node-version: ${{ matrix.node-version }}
     - run: npm install
     - run: npm run ci
-    - run: npm run test
+    - name: Upload coverage to Codecov
+      uses: codecov/codecov-action@v3

package/ChangeLog.md

@@ -1,5 +1,11 @@
 # ChangeLog
 
+## 1.2.18 - 2024-02-29
+* Fix: avoid keywords in variables.
+
+## 1.2.17 - 2023-12-27
+* Fix: correct model name when first letter is capitalized && and some keywords
+
 ## 1.2.16 - 2023-09-13
 * Feat: support importing additional package
 

package/README-CN.md

@@ -2,17 +2,15 @@
 
 # Darabonba Python 生成器
 
-[![NPM version][npm-image]][npm-url]
+[![CI](https://github.com/aliyun/darabonba-python-generator/actions/workflows/ci.yml/badge.svg)](https://github.com/aliyun/darabonba-python-generator/actions/workflows/ci.yml)
 [![codecov][cov-image]][cov-url]
-[![David deps][david-image]][david-url]
+[![NPM version][npm-image]][npm-url]
 [![npm download][download-image]][download-url]
 
 [npm-image]: https://img.shields.io/npm/v/@darabonba/python-generator.svg?style=flat-square
 [npm-url]: https://npmjs.org/package/@darabonba/python-generator
 [cov-image]: https://codecov.io/gh/aliyun/darabonba-python-generator/branch/master/graph/badge.svg
 [cov-url]: https://codecov.io/gh/aliyun/darabonba-python-generator
-[david-image]: https://img.shields.io/david/aliyun/darabonba-python-generator.svg?style=flat-square
-[david-url]: https://david-dm.org/aliyun/darabonba-python-generator
 [download-image]: https://img.shields.io/npm/dm/@darabonba/python-generator.svg?style=flat-square
 [download-url]: https://npmjs.org/package/@darabonba/python-generator
 

package/README.md

@@ -2,17 +2,15 @@ English | [简体中文](/README-CN.md)
 
 # Darabonba Python Generator
 
-[![NPM version][npm-image]][npm-url]
+[![CI](https://github.com/aliyun/darabonba-python-generator/actions/workflows/ci.yml/badge.svg)](https://github.com/aliyun/darabonba-python-generator/actions/workflows/ci.yml)
 [![codecov][cov-image]][cov-url]
-[![David deps][david-image]][david-url]
+[![NPM version][npm-image]][npm-url]
 [![npm download][download-image]][download-url]
 
 [npm-image]: https://img.shields.io/npm/v/@darabonba/python-generator.svg?style=flat-square
 [npm-url]: https://npmjs.org/package/@darabonba/python-generator
 [cov-image]: https://codecov.io/gh/aliyun/darabonba-python-generator/branch/master/graph/badge.svg
 [cov-url]: https://codecov.io/gh/aliyun/darabonba-python-generator
-[david-image]: https://img.shields.io/david/aliyun/darabonba-python-generator.svg?style=flat-square
-[david-url]: https://david-dm.org/aliyun/darabonba-python-generator
 [download-image]: https://img.shields.io/npm/dm/@darabonba/python-generator.svg?style=flat-square
 [download-url]: https://npmjs.org/package/@darabonba/python-generator
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darabonba/python-generator",
-  "version": "1.2.16",
+  "version": "1.2.18",
   "description": "The darabonba generator for Python",
   "main": "src/generator.js",
   "directories": {
@@ -8,9 +8,9 @@
   },
   "scripts": {
     "lint": "eslint --fix src/",
-    "test": "mocha --reporter spec --timeout 3000 tests/*.tests.js",
-    "test-cov": "nyc -r=lcov -r=html -r=text -r=json mocha -t 3000 -R spec tests/*.tests.js",
-    "ci": "npm run lint && npm run test-cov && codecov"
+    "test": "mocha -R spec -t 3000 tests/*.tests.js",
+    "test-cov": "nyc -r=lcov -r=html -r=text -r=json npm run test",
+    "ci": "npm run lint && npm run test-cov"
   },
   "repository": {
     "type": "git",
@@ -18,12 +18,11 @@
   },
   "devDependencies": {
     "chai": "^4.2.0",
-    "codecov": "^3.8.1",
-    "eslint": "^7.14.0",
+    "eslint": "^8.55.0",
     "expect.js": "^0.3.1",
-    "has-flag": "^4.0.0",
+    "has-flag": "^5.0.1",
     "mm": "^3.2.0",
-    "mocha": "^8.2.1",
+    "mocha": "^10.2.0",
     "mocha-sinon": "^2.1.2",
     "nyc": "^15.1.0",
     "sinon": "^9.2.1"

package/src/langs/common/config.js

@@ -4,7 +4,12 @@ module.exports = {
   indent: '    ',
   ext: '.tea',
   resolvePathByPackage: false,
-  keywords: [],
+  keywords: {
+    general: [],
+    function: [],
+    class: [],
+    param_variables: []
+  },
   typeMap: {},
   symbolMap: {},
   modifyOrder: [],

package/src/langs/python/combinator.js

@@ -31,7 +31,9 @@ const {
   _toSnakeCase,
   _toCamelCase,
   _avoidKeywords,
-  _isKeywords,
+  _avoidFuncKeywords,
+  _avoidClassKeywords,
+  _avoidVarKeywords,
   _exception,
   _symbol,
   _deepClone,
@@ -46,6 +48,14 @@ function _name(name) {
   return _avoidKeywords(_toSnakeCase(name));
 }
 
+function _varName(name){
+  return _avoidVarKeywords(_toSnakeCase(name));
+}
+
+function _funcName(name){
+  return _avoidFuncKeywords(_toSnakeCase(name));
+}
+
 function _type(type) {
   const config = _config();
   let t = type instanceof Object ? type.lexeme : type;
@@ -446,10 +456,7 @@ class Combinator extends CombinatorBase {
     } else {
       className = name.split('.').map(item => _upperFirst(item)).join('');
     }
-    if (_isKeywords(className)) {
-      className = _avoidKeywords(className);
-    }
-    return _toCamelCase(className);
+    return _toCamelCase(_avoidClassKeywords(className));
   }
 
   emitClass(emitter, object) {
@@ -502,7 +509,7 @@ class Combinator extends CombinatorBase {
               } else if (p instanceof PropItem) {
                 const type = this.getTypeHints(p.type);
                 if (type) {
-                  emitter.emitln(`${_name(p.name)}: ${type} = None`, this.level);
+                  emitter.emitln(`${_varName(p.name)}: ${type} = None`, this.level);
                 }
               }
             });
@@ -531,9 +538,9 @@ class Combinator extends CombinatorBase {
           this.emitComplexValidate(emitter, `k${depth}`, fieldType.itemType, depth + 1);
           this.levelDown();
         } else {
-          emitter.emitln(`if self.${_name(name)}:`, this.level);
+          emitter.emitln(`if self.${_varName(name)}:`, this.level);
           this.levelUp();
-          emitter.emitln(`for k in self.${_name(name)}:`, this.level);
+          emitter.emitln(`for k in self.${_varName(name)}:`, this.level);
           this.levelUp();
           this.emitComplexValidate(emitter, 'k', fieldType.itemType, depth + 1);
           this.levelDown();
@@ -546,9 +553,9 @@ class Combinator extends CombinatorBase {
           this.emitComplexValidate(emitter, `v${depth}`, fieldType.valType, depth + 1);
           this.levelDown();
         } else {
-          emitter.emitln(`if self.${_name(name)}:`, this.level);
+          emitter.emitln(`if self.${_varName(name)}:`, this.level);
           this.levelUp();
-          emitter.emitln(`for v in self.${_name(name)}.values():`, this.level);
+          emitter.emitln(`for v in self.${_varName(name)}.values():`, this.level);
           this.levelUp();
           this.emitComplexValidate(emitter, 'v', fieldType.valType, depth + 1);
           this.levelDown();
@@ -580,29 +587,29 @@ class Combinator extends CombinatorBase {
 
       if (required.length > 0) {
         emitter.emitln(
-          `self.validate_required(self.${_name(prop.name)}, '${_name(prop.name)}')`,
+          `self.validate_required(self.${_varName(prop.name)}, '${_varName(prop.name)}')`,
           this.level
         );
         haveValidate = true;
       }
       if (maxLength.length > 0 || pattern.length > 0 || maximum.length > 0 || minimum.length > 0) {
-        emitter.emitln(`if self.${_name(prop.name)} is not None:`, this.level);
+        emitter.emitln(`if self.${_varName(prop.name)} is not None:`, this.level);
         this.levelUp();
 
         if (maxLength.length > 0) {
-          emitter.emitln(`self.validate_max_length(self.${_name(prop.name)}, '${_name(prop.name)}', ${maxLength[0].value})`, this.level);
+          emitter.emitln(`self.validate_max_length(self.${_varName(prop.name)}, '${_varName(prop.name)}', ${maxLength[0].value})`, this.level);
         }
 
         if (pattern.length > 0) {
-          emitter.emitln(`self.validate_pattern(self.${_name(prop.name)}, '${_name(prop.name)}', '${pattern[0].value}')`, this.level);
+          emitter.emitln(`self.validate_pattern(self.${_varName(prop.name)}, '${_varName(prop.name)}', '${pattern[0].value}')`, this.level);
         }
 
         if (maximum.length > 0) {
-          emitter.emitln(`self.validate_maximum(self.${_name(prop.name)}, '${_name(prop.name)}', ${maximum[0].value})`, this.level);
+          emitter.emitln(`self.validate_maximum(self.${_varName(prop.name)}, '${_varName(prop.name)}', ${maximum[0].value})`, this.level);
         }
 
         if (minimum.length > 0) {
-          emitter.emitln(`self.validate_minimum(self.${_name(prop.name)}, '${_name(prop.name)}', ${minimum[0].value})`, this.level);
+          emitter.emitln(`self.validate_minimum(self.${_varName(prop.name)}, '${_varName(prop.name)}', ${minimum[0].value})`, this.level);
         }
         this.levelDown();
         haveValidate = true;
@@ -617,9 +624,9 @@ class Combinator extends CombinatorBase {
           emitter.emit(emt.output);
         }
       } else if (prop.type.objectType === 'model') {
-        emitter.emitln(`if self.${_name(prop.name)}:`, this.level);
+        emitter.emitln(`if self.${_varName(prop.name)}:`, this.level);
         this.levelUp();
-        emitter.emitln(`self.${_name(prop.name)}.validate()`, this.level);
+        emitter.emitln(`self.${_varName(prop.name)}.validate()`, this.level);
         this.levelDown();
         haveValidate = true;
       }
@@ -659,9 +666,9 @@ class Combinator extends CombinatorBase {
         }
       } else {
         emitter.emitln(`result['${fieldName}'] = []`, this.level);
-        emitter.emitln(`if self.${_name(name)} is not None:`, this.level);
+        emitter.emitln(`if self.${_varName(name)} is not None:`, this.level);
         this.levelUp();
-        emitter.emitln(`for k in self.${_name(name)}:`, this.level);
+        emitter.emitln(`for k in self.${_varName(name)}:`, this.level);
         this.levelUp();
         if (type.itemType.valType || type.itemType.itemType) {
           const propInfo = {
@@ -670,7 +677,7 @@ class Combinator extends CombinatorBase {
             type: type.itemType,
             parentType: type.lexeme
           };
-          this.emitComplexToMap(emitter, propInfo, `result['${name}']`, depth + 1);
+          this.emitComplexToMap(emitter, propInfo, `result['${fieldName}']`, depth + 1);
         } else {
           if (type.itemType.objectType === 'model') {
             emitter.emitln(`result['${fieldName}'].append(k.to_map() if k else None)`, this.level);
@@ -703,9 +710,9 @@ class Combinator extends CombinatorBase {
         }
       } else {
         emitter.emitln(`result['${fieldName}'] = {}`, this.level);
-        emitter.emitln(`if self.${_name(name)} is not None:`, this.level);
+        emitter.emitln(`if self.${_varName(name)} is not None:`, this.level);
         this.levelUp();
-        emitter.emitln(`for k, v in self.${_name(name)}.items():`, this.level);
+        emitter.emitln(`for k, v in self.${_varName(name)}.items():`, this.level);
         this.levelUp();
         if (type.valType.valType || type.valType.itemType) {
           const propInfo = {
@@ -714,7 +721,7 @@ class Combinator extends CombinatorBase {
             type: type.valType,
             parentType: type.lexeme
           };
-          this.emitComplexToMap(emitter, propInfo, `result['${name}']`, depth + 1);
+          this.emitComplexToMap(emitter, propInfo, `result['${fieldName}']`, depth + 1);
         } else {
           if (type.valType.objectType === 'model') {
             emitter.emitln(`result['${fieldName}'][k] = v.to_map()`, this.level);
@@ -762,19 +769,19 @@ class Combinator extends CombinatorBase {
         if (emt.needSave === true) {
           emitter.emit(emt.output);
         } else {
-          emitter.emitln(`if self.${_name(prop.name)} is not None:`, this.level);
+          emitter.emitln(`if self.${_varName(prop.name)} is not None:`, this.level);
           this.levelUp();
-          emitter.emitln(`result['${name}'] = self.${_name(prop.name)}`, this.level);
+          emitter.emitln(`result['${name}'] = self.${_varName(prop.name)}`, this.level);
           this.levelDown();
         }
 
       } else {
-        emitter.emitln(`if self.${_name(prop.name)} is not None:`, this.level);
+        emitter.emitln(`if self.${_varName(prop.name)} is not None:`, this.level);
         this.levelUp();
         if (prop.type.objectType === 'model') {
-          emitter.emitln(`result['${name}'] = self.${_name(prop.name)}.to_map()`, this.level);
+          emitter.emitln(`result['${name}'] = self.${_varName(prop.name)}.to_map()`, this.level);
         } else {
-          emitter.emitln(`result['${name}'] = self.${_name(prop.name)}`, this.level);
+          emitter.emitln(`result['${name}'] = self.${_varName(prop.name)}`, this.level);
         }
         this.levelDown();
       }
@@ -812,7 +819,7 @@ class Combinator extends CombinatorBase {
           emitter.emitln(`${carrier}['k${num}'] = l${depth}`, this.level);
         }
       } else {
-        emitter.emitln(`self.${_name(name)} = []`, this.level);
+        emitter.emitln(`self.${_varName(name)} = []`, this.level);
         emitter.emitln(`if m.get('${fieldName}') is not None:`, this.level);
         this.levelUp();
         emitter.emitln(`for k in m.get('${fieldName}'):`, this.level);
@@ -824,11 +831,11 @@ class Combinator extends CombinatorBase {
             type: type.itemType,
             parentType: type.lexeme
           };
-          this.emitComplexFromMap(emitter, propInfo, `self.${_name(name)}`, depth + 1);
+          this.emitComplexFromMap(emitter, propInfo, `self.${_varName(name)}`, depth + 1);
         } else {
           if (type.itemType.objectType === 'model') {
             emitter.emitln(`temp_model = ${type.itemType.lexeme}()`, this.level);
-            emitter.emitln(`self.${_name(name)}.append(temp_model.from_map(k))`, this.level);
+            emitter.emitln(`self.${_varName(name)}.append(temp_model.from_map(k))`, this.level);
             emitter.needSave = true;
           } else {
             emitter.needSave = false;
@@ -858,7 +865,7 @@ class Combinator extends CombinatorBase {
           emitter.emitln(`${carrier}[k${num}] = d${depth}`, this.level);
         }
       } else {
-        emitter.emitln(`self.${_name(name)} = {}`, this.level);
+        emitter.emitln(`self.${_varName(name)} = {}`, this.level);
         emitter.emitln(`if m.get('${fieldName}') is not None:`, this.level);
         this.levelUp();
         emitter.emitln(`for k, v in m.get('${fieldName}').items():`, this.level);
@@ -870,11 +877,11 @@ class Combinator extends CombinatorBase {
             type: type.valType,
             parentType: type.lexeme
           };
-          this.emitComplexFromMap(emitter, propInfo, `self.${_name(name)}`, depth + 1);
+          this.emitComplexFromMap(emitter, propInfo, `self.${_varName(name)}`, depth + 1);
         } else {
           if (type.valType.objectType === 'model') {
             emitter.emitln(`temp_model = ${type.valType.lexeme}()`, this.level);
-            emitter.emitln(`self.${_name(name)}[k] = temp_model.from_map(v)`, this.level);
+            emitter.emitln(`self.${_varName(name)}[k] = temp_model.from_map(v)`, this.level);
             emitter.needSave = true;
           } else {
             emitter.needSave = false;
@@ -928,7 +935,7 @@ class Combinator extends CombinatorBase {
         } else {
           emitter.emitln(`if m.get('${name}') is not None:`, this.level);
           this.levelUp();
-          emitter.emitln(`self.${_name(prop.name)} = m.get('${name}')`, this.level);
+          emitter.emitln(`self.${_varName(prop.name)} = m.get('${name}')`, this.level);
           this.levelDown();
         }
       } else {
@@ -937,9 +944,9 @@ class Combinator extends CombinatorBase {
         if (prop.type.objectType === 'model') {
           let type = _type(prop.type);
           emitter.emitln(`temp_model = ${type}()`, this.level);
-          emitter.emitln(`self.${_name(prop.name)} = temp_model.from_map(m['${name}'])`, this.level);
+          emitter.emitln(`self.${_varName(prop.name)} = temp_model.from_map(m['${name}'])`, this.level);
         } else {
-          emitter.emitln(`self.${_name(prop.name)} = m.get('${name}')`, this.level);
+          emitter.emitln(`self.${_varName(prop.name)} = m.get('${name}')`, this.level);
         }
         this.levelDown();
       }
@@ -956,9 +963,9 @@ class Combinator extends CombinatorBase {
       construct.params.forEach(param => {
         const typeHints = this.getTypeHints(param.type);
         if (param.value !== null && param.value !== 'null') {
-          constructParams.push(`${_name(param.key)}: ${typeHints} = ${param.value},`);
+          constructParams.push(`${_varName(param.key)}: ${typeHints} = ${param.value},`);
         } else {
-          constructParams.push(`${_name(param.key)}: ${typeHints},`);
+          constructParams.push(`${_varName(param.key)}: ${typeHints},`);
         }
       });
       emitter.emitln('def __init__(', this.level);
@@ -978,9 +985,9 @@ class Combinator extends CombinatorBase {
           if (prop instanceof PropItem) {
             const typeHints = this.getTypeHints(prop.type);
             if (typeHints === this.className) {
-              emitter.emitln(`${_name(prop.name)}: '${typeHints}' = None,`, this.level);
+              emitter.emitln(`${_varName(prop.name)}: '${typeHints}' = None,`, this.level);
             } else {
-              emitter.emitln(`${_name(prop.name)}: ${typeHints} = None,`, this.level);
+              emitter.emitln(`${_varName(prop.name)}: ${typeHints} = None,`, this.level);
             }
 
           }
@@ -1016,7 +1023,7 @@ class Combinator extends CombinatorBase {
           emitter.emitln(`# ${d}`, this.level);
         });
       }
-      emitter.emitln(`self.${_name(prop.name)} = ${_name(prop.name)}`, this.level);
+      emitter.emitln(`self.${_varName(prop.name)} = ${_varName(prop.name)}`, this.level);
     });
     if (construct.body.length > 0) {
       construct.body.forEach(gram => {
@@ -1115,19 +1122,19 @@ class Combinator extends CombinatorBase {
     let selfVar = this.func_static ? '' : 'self';
 
     if (func.params.length > 0) {
-      emitter.emitln(`def ${_name(func.name)}_async(`);
+      emitter.emitln(`def ${_funcName(func.name)}_async(`);
       this.levelUp();
       if (selfVar) {
         emitter.emitln(`${selfVar},`, this.level);
       }
       func.params.forEach(p => {
         const type = this.getTypeHints(p.type);
-        emitter.emitln(`${_name(p.key)}: ${type},`, this.level);
+        emitter.emitln(`${_varName(p.key)}: ${type},`, this.level);
       });
       this.levelDown();
       emitter.emitln(`) -> ${rtype}:`, this.level);
     } else {
-      emitter.emit(`def ${_name(func.name)}_async(`);
+      emitter.emit(`def ${_funcName(func.name)}_async(`);
       if (selfVar) {
         emitter.emit(`${selfVar}`);
       }
@@ -1158,19 +1165,19 @@ class Combinator extends CombinatorBase {
     let selfVar = this.func_static ? '' : 'self';
 
     if (func.params.length > 0) {
-      emitter.emitln(`def ${_name(func.name)}(`);
+      emitter.emitln(`def ${_funcName(func.name)}(`);
       this.levelUp();
       if (selfVar) {
         emitter.emitln(`${selfVar},`, this.level);
       }
       func.params.forEach(p => {
         const type = this.getTypeHints(p.type);
-        emitter.emitln(`${_name(p.key)}: ${type},`, this.level);
+        emitter.emitln(`${_varName(p.key)}: ${type},`, this.level);
       });
       this.levelDown();
       emitter.emitln(`) -> ${rtype}:`, this.level);
     } else {
-      emitter.emit(`def ${_name(func.name)}(`);
+      emitter.emit(`def ${_funcName(func.name)}(`);
       if (selfVar) {
         emitter.emit(`${selfVar}`);
       }
@@ -1349,12 +1356,12 @@ class Combinator extends CombinatorBase {
             pre += `.${_name(path.name)}`;
           }
         } else if (path.type === 'object') {
-          pre += `${_name(_convertStaticParam(pathName))}`;
+          pre += `${_varName(_convertStaticParam(pathName))}`;
         } else if (path.type === 'object_async') {
           if (this.aioMode) {
-            pre += `await ${_name(_convertStaticParam(pathName))}`;
+            pre += `await ${_varName(_convertStaticParam(pathName))}`;
           } else {
-            pre += `${_name(_convertStaticParam(pathName))}`;
+            pre += `${_varName(_convertStaticParam(pathName))}`;
           }
         } else if (path.type === 'object_static') {
           pre += `${_convertStaticParam(pathName)}`;
@@ -1365,24 +1372,24 @@ class Combinator extends CombinatorBase {
             pre += `${_convertStaticParam(pathName)}`;
           }
         } else if (path.type === 'call' || path.type === 'call_static') {
-          pre += `.${_name(pathName)}(${params})`;
+          pre += `.${_funcName(pathName)}(${params})`;
         } else if (path.type === 'call_async' || path.type === 'call_static_async') {
           if (this.aioMode) {
-            pre += `.${_name(pathName)}_async(${params})`;
+            pre += `.${_funcName(pathName)}_async(${params})`;
           } else {
-            pre += `.${_name(pathName)}(${params})`;
+            pre += `.${_funcName(pathName)}(${params})`;
           }
         } else if (path.type === 'prop') {
           pre += `.${_name(pathName)}`;
         } else if (path.type === 'prop_static') {
           pre += `.${_name(pathName)}`;
         } else if (path.type === 'map') {
-          pre += path.isVar ? `.get(${_name(pathName)})` : `.get('${pathName}')`;
+          pre += path.isVar ? `.get(${_varName(pathName)})` : `.get('${pathName}')`;
         } else if (path.type === 'map_set') {
           const quote = this._adaptedQuotes(pathName, emitter);
           pre += `[${quote}${pathName}${quote}]`;
         } else if (path.type === 'list') {
-          pre += path.isVar ? `[${_name(pathName)}]` : `[${pathName}]`;
+          pre += path.isVar ? `[${_varName(pathName)}]` : `[${pathName}]`;
         } else {
           debug.stack(gram);
         }
@@ -1411,7 +1418,7 @@ class Combinator extends CombinatorBase {
       emitter.emit(`${name}()`);
     } else if (gram.varType === 'var' || gram.varType === 'const') {
       const name = gram.name ? gram.name : gram.key;
-      emitter.emit(`${_convertStaticParam(_name(name))}`);
+      emitter.emit(`${_convertStaticParam(_varName(name))}`);
     } else {
       debug.stack(gram);
     }
@@ -1423,7 +1430,7 @@ class Combinator extends CombinatorBase {
         const quote = this._adaptedQuotes(gram.key, emitter);
         emitter.emit(`${quote}${gram.key}${quote}: `);
       } else {
-        emitter.emit(`${_name(gram.key)}=`, this.level);
+        emitter.emit(`${_varName(gram.key)}=`, this.level);
       }
     }
     if (gram instanceof GrammerCall) {
@@ -1539,7 +1546,7 @@ class Combinator extends CombinatorBase {
       const quote = this._adaptedQuotes(gram.value, emitter);
       emitter.emit(`${quote}${gram.value}${quote}`);
     } else if (gram.type === 'param') {
-      emitter.emit(`${_convertStaticParam(_name(gram.value))}`);
+      emitter.emit(`${_convertStaticParam(_varName(gram.value))}`);
     } else if (gram.type === 'call') {
       this.grammerCall(emitter, gram.value);
     } else if (gram.type === 'number') {
@@ -1759,7 +1766,7 @@ class Combinator extends CombinatorBase {
         gram.params.forEach(p => {
           let emit = new Emitter();
           if (p.key) {
-            emit.emit(`${_name(p.key)}`);
+            emit.emit(`${_varName(p.key)}`);
             emit.emit('=');
           }
           if (typeof (p.value) === 'string') {
@@ -1789,7 +1796,7 @@ class Combinator extends CombinatorBase {
     this.grammerCall(emit, behavior.call);
 
     if (behavior.isVar) {
-      emitter.emit(`${emit.output}[${_name(behavior.key)}] = `, this.level);
+      emitter.emit(`${emit.output}[${_varName(behavior.key)}] = `, this.level);
     } else {
       const quote = this._adaptedQuotes(behavior.key, emitter);
       emitter.emit(`${emit.output}[${quote}${behavior.key}${quote}] = `, this.level);

package/src/langs/python/config.js

@@ -6,44 +6,50 @@ module.exports = {
   ...defaultConfig,
   indent: '    ',
   ext: '.py',
-  keywords: [
-    'self',
-    'async',
-    'await',
-    'and',
-    'as',
-    'assert',
-    'break',
-    'class',
-    'continue',
-    'def',
-    'del',
-    'elif',
-    'else',
-    'except',
-    'finally',
-    'for',
-    'from',
-    'False',
-    'global',
-    'if',
-    'import',
-    'in',
-    'is',
-    'lambda',
-    'nonlocal',
-    'not',
-    'None',
-    'or',
-    'pass',
-    'raise',
-    'return',
-    'try',
-    'True',
-    'while',
-    'with',
-    'yield'
-  ],
+  keywords: {
+    general: [
+      'async',
+      'await',
+      'and',
+      'as',
+      'assert',
+      'break',
+      'class',
+      'continue',
+      'def',
+      'del',
+      'elif',
+      'else',
+      'except',
+      'finally',
+      'for',
+      'from',
+      'False',
+      'global',
+      'if',
+      'import',
+      'in',
+      'is',
+      'lambda',
+      'nonlocal',
+      'not',
+      'None',
+      'or',
+      'pass',
+      'raise',
+      'return',
+      'try',
+      'True',
+      'while',
+      'with',
+      'yield'
+    ],
+    function: [],
+    class: [],
+    param_variables: [
+      'self'
+    ]
+  },
   symbolMap: {
     'ASSIGN': '=',
     'EQ': '==',