@darabonba/python-generator 1.2.14 → 1.2.15

package/ChangeLog.md

@@ -1,5 +1,8 @@
 # ChangeLog
 
+## 1.2.15 - 2022-12-26
+* Fix: array assign and access with variables name
+
 ## 1.2.14 - 2022-12-12
 
 * Fix: avoid keywords in model and variables.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darabonba/python-generator",
-  "version": "1.2.14",
+  "version": "1.2.15",
   "description": "The darabonba generator for Python",
   "main": "src/generator.js",
   "directories": {

package/src/langs/python/combinator.js

@@ -1381,7 +1381,7 @@ class Combinator extends CombinatorBase {
           const quote = this._adaptedQuotes(pathName, emitter);
           pre += `[${quote}${pathName}${quote}]`;
         } else if (path.type === 'list') {
-          pre += `[${pathName}]`;
+          pre += path.isVar ? `[${_name(pathName)}]` : `[${pathName}]`;
         } else {
           debug.stack(gram);
         }

package/src/langs/python2/combinator.js

@@ -1233,7 +1233,7 @@ class Combinator extends CombinatorBase {
           const quote = this._adaptedQuotes(pathName, emitter);
           pre += `[${quote}${pathName}${quote}]`;
         } else if (path.type === 'list') {
-          pre += `[${pathName}]`;
+          pre += path.isVar ? `[${_name(pathName)}]` : `[${pathName}]`;
         } else {
           debug.stack(gram);
         }

package/tests/expected/python2/complex/tea_python_tests/client.py

@@ -220,6 +220,8 @@ class Client(SourceClient):
     def array_access_3(request, index):
         config_val = request.configs.value[0]
         val = request.configs.value[index]
+        i_0 = 0
+        val = request.configs.value[i_0]
         return config_val
 
     @staticmethod
@@ -247,6 +249,8 @@ class Client(SourceClient):
     @staticmethod
     def array_assign_3(request, config):
         request.configs.value[0] = config
+        i_0 = 0
+        request.configs.value[i_0] = config
 
     @staticmethod
     def map_access(request):
@@ -257,6 +261,8 @@ class Client(SourceClient):
     def map_access_2(request, key):
         config_info = request.configs.extra.get('name')
         config_value = request.configs.extra.get(key)
+        i_0 = key
+        config_value = request.configs.extra.get(i_0)
         return config_info
 
     @staticmethod
@@ -271,6 +277,8 @@ class Client(SourceClient):
     @staticmethod
     def map_assign(request, name):
         request.configs.extra['name'] = name
+        i_0 = 'name'
+        request.configs.extra[i_0] = name
 
     @staticmethod
     def str_fmt():

package/tests/expected/python2/import/setup.py

@@ -25,7 +25,7 @@ from setuptools import setup, find_packages
 """
 setup module for tea_python_tests.
 
-Created on 12/12/2022
+Created on 24/12/2022
 
 @author: Alibaba
 """

package/tests/expected/python3/complex/tea_python_tests/client.py

@@ -416,6 +416,8 @@ class Client(SourceClient):
     ) -> str:
         config_val = request.configs.value[0]
         val = request.configs.value[index]
+        i_0 = 0
+        val = request.configs.value[i_0]
         return config_val
 
     @staticmethod
@@ -450,6 +452,8 @@ class Client(SourceClient):
         config: str,
     ) -> None:
         request.configs.value[0] = config
+        i_0 = 0
+        request.configs.value[i_0] = config
 
     @staticmethod
     def map_access(
@@ -465,6 +469,8 @@ class Client(SourceClient):
     ) -> str:
         config_info = request.configs.extra.get('name')
         config_value = request.configs.extra.get(key)
+        i_0 = key
+        config_value = request.configs.extra.get(i_0)
         return config_info
 
     @staticmethod
@@ -482,6 +488,8 @@ class Client(SourceClient):
         name: str,
     ) -> None:
         request.configs.extra['name'] = name
+        i_0 = 'name'
+        request.configs.extra[i_0] = name
 
     @staticmethod
     def str_fmt() -> None:

package/tests/expected/python3/import/setup.py

@@ -24,7 +24,7 @@ from setuptools import setup, find_packages
 """
 setup module for tea_python_tests.
 
-Created on 12/12/2022
+Created on 24/12/2022
 
 @author: Alibaba
 """

package/tests/fixtures/complex/main.dara

@@ -191,6 +191,8 @@ static function arrayAccess2(): string {
 static function arrayAccess3(request: ComplexRequest, index: number): string {
   var configVal = request.configs.value[0];
   var val = request.configs.value[index];
+  var i0 = 0;
+  val = request.configs.value[i0];
   return configVal;
 }
 
@@ -210,6 +212,8 @@ static function arrayAssign2(config: string): [ string ] {
 
 static function arrayAssign3(request: ComplexRequest, config: string): void {
   request.configs.value[0] = config;
+  var i0 = 0;
+  request.configs.value[i0] = config;
 }
 
 static function mapAccess(request: ComplexRequest): string {
@@ -220,6 +224,8 @@ static function mapAccess(request: ComplexRequest): string {
 static function mapAccess2(request: Source.Request, key: string): string {
   var configInfo = request.configs.extra['name'];
   var configValue = request.configs.extra[key];
+  var i0 = key;
+  configValue = request.configs.extra[i0];
   return configInfo;
 }
 
@@ -234,6 +240,8 @@ static function mapAccess3(): string {
 
 static function mapAssign(request: ComplexRequest, name: string): void {
   request.configs.extra['name'] = name;
+  var i0 = 'name';
+  request.configs.extra[i0] = name;
 }
 
 static function strFmt(): void {