Where component methods are called, generate self.robot.<component name> instead of self.<component name>

Don't generate self.<component name> = robot.<component name> in the __init__ methods.

Author: lizlooney

src/blocks/mrc_call_python_function.ts

@@ -421,11 +421,10 @@ export const pythonFromBlock = function(
     }
     case FunctionKind.INSTANCE_COMPONENT: {
       const componentName = callPythonFunctionBlock.getComponentName();
-      const varName = generator.componentNameToVarName(componentName);
       const functionName = callPythonFunctionBlock.mrcActualFunctionName
           ? callPythonFunctionBlock.mrcActualFunctionName
           : block.getFieldValue(pythonUtils.FIELD_FUNCTION_NAME);
-      code = 'self.' + varName + '.' + functionName;
+      code = 'self.robot.' + componentName + '.' + functionName;
       break;
     }
     default:

src/editor/extended_python_generator.ts

@@ -34,7 +34,6 @@ export class ExtendedPythonGenerator extends PythonGenerator {
   private context: GeneratorContext | null = null;
 
   private classMethods: {[key: string]: string} = Object.create(null);
-  private mapComponentNameToVarName: {[key: string]: string} = Object.create(null);
 
   constructor() {
     super('Python');
@@ -55,18 +54,6 @@ export class ExtendedPythonGenerator extends PythonGenerator {
       );
     }
     this.definitions_['variables'] = defvars.join('\n');
-
-    // Collect the components used in all mrc_call_python_function blocks.
-    workspace.getBlocksByType('mrc_call_python_function', false).forEach((block) => {
-      const callPythonFunctionBlock = block as CallPythonFunctionBlock;
-      const componentName = callPythonFunctionBlock.getComponentName();
-      if (componentName) {
-        if (!(componentName in this.mapComponentNameToVarName)) {
-          const varName = this.nameDB_!.getDistinctName(componentName, 'VARIABLE');
-          this.mapComponentNameToVarName[componentName] = varName;
-        }
-      }
-    });
   }
 
   /*
@@ -80,10 +67,6 @@ export class ExtendedPythonGenerator extends PythonGenerator {
       variableDefinitions += this.INDENT + "self.mechanisms = []\n";
     }
 
-    Object.entries(this.mapComponentNameToVarName).forEach(([componentName, varName]) => {
-      variableDefinitions += this.INDENT + 'self.' + varName + ' = robot.' + componentName + '\n';
-    });
-
     return variableDefinitions;
   }
   getVariableName(nameOrId: string): string {
@@ -120,13 +103,6 @@ export class ExtendedPythonGenerator extends PythonGenerator {
     this.classMethods[methodName] = code;
   }
 
-  /**
-   * Get the variable name to use for a component.
-   */
-  componentNameToVarName(componentName: string): string {
-    return this.mapComponentNameToVarName[componentName];
-  }
-
   finish(code: string): string {
     if (this.context && this.workspace) {
       const className = this.context.getClassName();
@@ -143,8 +119,6 @@ export class ExtendedPythonGenerator extends PythonGenerator {
       this.context.setExportedBlocks(this.produceExportedBlocks(this.workspace));
     }
 
-    this.mapComponentNameToVarName = Object.create(null);
-
     return super.finish(code);
   }