From a00e666d308854290f0ba4f2b10ae10f743a2c91 Mon Sep 17 00:00:00 2001
From: Soroush Bateni <soroosh129@gmail.com>
Date: Mon, 13 Jun 2022 14:39:34 -0500
Subject: [PATCH 1/7] Implemented methods for the Python target

---
 .idea/codeStyles/Project.xml                  |  8 +--
 .../org/lflang/generator/c/CGenerator.java    | 21 +++++---
 .../generator/python/PythonGenerator.java     | 19 ++++---
 .../python/PythonMethodGenerator.java         | 53 +++++++++++++++++++
 .../python/PythonParameterGenerator.java      |  3 ++
 .../python/PythonReactionGenerator.java       |  1 -
 .../python/PythonReactorGenerator.java        |  4 ++
 7 files changed, 92 insertions(+), 17 deletions(-)
 create mode 100644 org.lflang/src/org/lflang/generator/python/PythonMethodGenerator.java

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 5a907b1337..f5dfa2a006 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,5 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <option name="LINE_SEPARATOR" value="&#10;" />
     <option name="INSERT_INNER_CLASS_IMPORTS" value="true" />
     <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
     <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
@@ -19,10 +20,11 @@
         <emptyLine />
       </value>
     </option>
-    <option name="RIGHT_MARGIN" value="80" />
+    <option name="RIGHT_MARGIN" value="100" />
+    <option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="true" />
     <option name="FORMATTER_TAGS_ENABLED" value="true" />
     <option name="WRAP_COMMENTS" value="true" />
-    <option name="SOFT_MARGINS" value="60" />
+    <option name="SOFT_MARGINS" value="100,120" />
     <JavaCodeStyleSettings>
       <option name="ALIGN_MULTILINE_ANNOTATION_PARAMETERS" value="true" />
       <option name="INSERT_INNER_CLASS_IMPORTS" value="true" />
@@ -70,7 +72,7 @@
       <option name="USE_SCALADOC2_FORMATTING" value="true" />
     </ScalaCodeStyleSettings>
     <codeStyleSettings language="JAVA">
-      <option name="RIGHT_MARGIN" value="120" />
+      <option name="RIGHT_MARGIN" value="100" />
       <option name="BLANK_LINES_BEFORE_PACKAGE" value="1" />
       <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
       <option name="INDENT_CASE_FROM_SWITCH" value="false" />
diff --git a/org.lflang/src/org/lflang/generator/c/CGenerator.java b/org.lflang/src/org/lflang/generator/c/CGenerator.java
index 41f983e581..91f14a5e17 100644
--- a/org.lflang/src/org/lflang/generator/c/CGenerator.java
+++ b/org.lflang/src/org/lflang/generator/c/CGenerator.java
@@ -1205,7 +1205,7 @@ private void generateReactorClass(ReactorDecl reactor) {
         var constructorCode = new CodeBuilder();
         generateAuxiliaryStructs(reactor);
         generateSelfStruct(reactor, constructorCode);
-        CMethodGenerator.generateMethods(reactor, code, types);
+        generateMethods(reactor);
         generateReactions(reactor, currentFederate);
         generateConstructor(reactor, currentFederate, constructorCode);
 
@@ -1213,11 +1213,18 @@ private void generateReactorClass(ReactorDecl reactor) {
         code.pr("");
     }
 
+    /**
+     * Generate methods for {@code reactor}.
+     */
+    protected void generateMethods(ReactorDecl reactor) {
+        CMethodGenerator.generateMethods(reactor, code, types);
+    }
+
     /**
      * Generates preambles defined by user for a given reactor
      * @param reactor The given reactor
      */
-    public void generateUserPreamblesForReactor(Reactor reactor) {
+    protected void generateUserPreamblesForReactor(Reactor reactor) {
         for (Preamble p : convertToEmptyListIfNull(reactor.getPreambles())) {
             code.pr("// *********** From the preamble, verbatim:");
             code.prSourceLineNumber(p.getCode());
@@ -1506,7 +1513,7 @@ private void generateInteractingContainedReactors(
      * @param decl The reactor declaration for the self struct
      * @param constructorCode Code that is executed when the reactor is instantiated
      */
-    public void generateSelfStructExtension(
+    protected void generateSelfStructExtension(
         CodeBuilder body,
         ReactorDecl decl,
         CodeBuilder constructorCode
@@ -1544,7 +1551,7 @@ public void generateReactions(ReactorDecl decl, FederateInstance federate) {
      *  @param decl The reactor.
      *  @param reactionIndex The position of the reaction within the reactor.
      */
-    public void generateReaction(Reaction reaction, ReactorDecl decl, int reactionIndex) {
+    protected void generateReaction(Reaction reaction, ReactorDecl decl, int reactionIndex) {
         code.pr(CReactionGenerator.generateReaction(
             reaction,
             decl,
@@ -2031,7 +2038,7 @@ private void generateInitializeActionToken(ReactorInstance reactor) {
      * is relevant to the federate.
      * @param instance The reactor instance.
      */
-    public void generateReactorInstanceExtension(ReactorInstance instance) {
+    protected void generateReactorInstanceExtension(ReactorInstance instance) {
         // Do nothing
     }
 
@@ -2041,7 +2048,7 @@ public void generateReactorInstanceExtension(ReactorInstance instance) {
      * of the same reactor.
      * @param instance The reactor class instance
      */
-    public void generateStateVariableInitializations(ReactorInstance instance) {
+    protected void generateStateVariableInitializations(ReactorInstance instance) {
         var reactorClass = instance.getDefinition().getReactorClass();
         var selfRef = CUtil.reactorRef(instance);
         for (StateVar stateVar : allStateVars(toDefinition(reactorClass))) {
@@ -2126,7 +2133,7 @@ private void generateModeStructure(ReactorInstance instance) {
      * Generate runtime initialization code for parameters of a given reactor instance
      * @param instance The reactor instance.
      */
-    public void generateParameterInitialization(ReactorInstance instance) {
+    protected void generateParameterInitialization(ReactorInstance instance) {
         var selfRef = CUtil.reactorRef(instance);
         // Declare a local bank_index variable so that initializers can use it.
         initializeTriggerObjects.pr("int bank_index = "+CUtil.bankIndex(instance)+";");
diff --git a/org.lflang/src/org/lflang/generator/python/PythonGenerator.java b/org.lflang/src/org/lflang/generator/python/PythonGenerator.java
index c6e4204a68..6015965013 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonGenerator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonGenerator.java
@@ -67,6 +67,7 @@
 import org.lflang.generator.TargetTypes;
 import org.lflang.generator.c.CDockerGenerator;
 import org.lflang.generator.c.CGenerator;
+import org.lflang.generator.c.CMethodGenerator;
 import org.lflang.generator.c.CUtil;
 import org.lflang.lf.Action;
 import org.lflang.lf.Expression;
@@ -763,7 +764,7 @@ public String generateForwardBody(Action action, VarRef port) {
      *  @param reactionIndex The position of the reaction within the reactor.
      */
     @Override
-    public void generateReaction(Reaction reaction, ReactorDecl decl, int reactionIndex) {
+    protected void generateReaction(Reaction reaction, ReactorDecl decl, int reactionIndex) {
         Reactor reactor = ASTUtils.toDefinition(decl);
 
         // Delay reactors and top-level reactions used in the top-level reactor(s) in federated execution are generated in C
@@ -784,7 +785,7 @@ public void generateReaction(Reaction reaction, ReactorDecl decl, int reactionIn
      * @return Initialization code fore state variables of instance
      */
     @Override
-    public void generateStateVariableInitializations(ReactorInstance instance) {
+    protected void generateStateVariableInitializations(ReactorInstance instance) {
         // Do nothing
     }
 
@@ -794,11 +795,17 @@ public void generateStateVariableInitializations(ReactorInstance instance) {
      * @param instance The reactor instance.
      */
     @Override
-    public void generateParameterInitialization(ReactorInstance instance) {
+    protected void generateParameterInitialization(ReactorInstance instance) {
         // Do nothing
         // Parameters are initialized in Python
     }
 
+    @Override
+    protected void generateMethods(ReactorDecl reactor) {
+        // Do nothing.
+        // Methods are generated in Python not C.
+    }
+
     /**
      * Generate C preambles defined by user for a given reactor
      * Since the Python generator expects preambles written in C,
@@ -806,7 +813,7 @@ public void generateParameterInitialization(ReactorInstance instance) {
      * @param reactor The given reactor
      */
     @Override
-    public void generateUserPreamblesForReactor(Reactor reactor) {
+    protected void generateUserPreamblesForReactor(Reactor reactor) {
         // Do nothing
     }
 
@@ -817,7 +824,7 @@ public void generateUserPreamblesForReactor(Reactor reactor) {
      * @param reactions The reactions of this instance.
      */
     @Override
-    public void generateReactorInstanceExtension(
+    protected void generateReactorInstanceExtension(
         ReactorInstance instance
     ) {
         initializeTriggerObjects.pr(PythonReactionGenerator.generateCPythonReactionLinkers(instance, mainDef));
@@ -831,7 +838,7 @@ public void generateReactorInstanceExtension(
      * @param constructorCode Code that is executed when the reactor is instantiated
      */
     @Override
-    public void generateSelfStructExtension(
+    protected void generateSelfStructExtension(
         CodeBuilder selfStructBody,
         ReactorDecl decl,
         CodeBuilder constructorCode
diff --git a/org.lflang/src/org/lflang/generator/python/PythonMethodGenerator.java b/org.lflang/src/org/lflang/generator/python/PythonMethodGenerator.java
new file mode 100644
index 0000000000..0fc830030b
--- /dev/null
+++ b/org.lflang/src/org/lflang/generator/python/PythonMethodGenerator.java
@@ -0,0 +1,53 @@
+package org.lflang.generator.python;
+
+import java.util.stream.Collectors;
+
+import org.lflang.ASTUtils;
+import org.lflang.generator.CodeBuilder;
+import org.lflang.lf.Method;
+import org.lflang.lf.MethodArgument;
+import org.lflang.lf.Reactor;
+
+/**
+ * Collection of functions to generate Python code to declare methods.
+ *
+ * @author {Soroush Bateni <soroush@berkeley.edu>}
+ */
+public class PythonMethodGenerator {
+
+    /**
+     * Generate a Python method definition for {@code method}.
+     */
+    public static String generateMethod(Method method) {
+        return String.join("\n",
+                           "# Implementation of method "+method.getName()+"().",
+                           "def "+method.getName()+"(self, "+generateMethodArgumentList(method)+"):",
+                           ASTUtils.toText(method.getCode()).indent(4)
+        );
+    }
+
+    /**
+     * Generate methods for a reactor class.
+     *
+     * @param reactor The reactor.
+     */
+    public static String generateMethods(
+        Reactor reactor
+    ) {
+        return ASTUtils.allMethods(reactor)
+                       .stream()
+                       .map(m -> generateMethod(m))
+                       .collect(Collectors.joining());
+    }
+
+    /**
+     * Generate a list of arguments for {@code method} delimited with ', '.
+     */
+    private static String generateMethodArgumentList(Method method) {
+        return String.join(", ",
+                           method.getArguments()
+                                 .stream()
+                                 .map(MethodArgument::getName)
+                                 .collect(Collectors.toList()));
+    }
+}
diff --git a/org.lflang/src/org/lflang/generator/python/PythonParameterGenerator.java b/org.lflang/src/org/lflang/generator/python/PythonParameterGenerator.java
index 68695ace44..25f7832c72 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonParameterGenerator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonParameterGenerator.java
@@ -58,6 +58,7 @@ public static String generatePythonGetters(ReactorDecl decl) {
         for (Parameter param : getAllParameters(decl)) {
             if (!param.getName().equals("bank_index")) {
                 lines.addAll(List.of(
+                    "",
                     "@property",
                     "def "+param.getName()+"(self):",
                     "    return self._"+param.getName()+" # pylint: disable=no-member",
@@ -67,11 +68,13 @@ public static String generatePythonGetters(ReactorDecl decl) {
         }
         // Create a special property for bank_index
         lines.addAll(List.of(
+            "",
             "@property",
             "def bank_index(self):",
             "    return self._bank_index # pylint: disable=no-member",
             ""
         ));
+        lines.add("\n");
         return String.join("\n", lines);
     }
 
diff --git a/org.lflang/src/org/lflang/generator/python/PythonReactionGenerator.java b/org.lflang/src/org/lflang/generator/python/PythonReactionGenerator.java
index 3e408685ae..f0dbefac35 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonReactionGenerator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonReactionGenerator.java
@@ -81,7 +81,6 @@ public static String generateCPythonSTPCaller(ReactorDecl decl,
      * @param reactorDeclName The name of the reactor for debugging purposes
      * @param pythonFunctionName The name of the function in the .py file.
      * @param cpythonFunctionName The name of the function in self struct of the .c file.
-     * @param pyObjectDescriptor CPython related descriptors for each object in "pyObjects".
      * @param pyObjects CPython related objects
      */
     private static String generateCPythonFunctionCaller(String reactorDeclName,
diff --git a/org.lflang/src/org/lflang/generator/python/PythonReactorGenerator.java b/org.lflang/src/org/lflang/generator/python/PythonReactorGenerator.java
index faa9b8aa76..a58a6893c4 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonReactorGenerator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonReactorGenerator.java
@@ -55,6 +55,9 @@ public static String generatePythonClass(ReactorInstance instance, FederateInsta
             // Handle runtime initializations
             pythonClasses.pr(generatePythonConstructor(decl, types));
             pythonClasses.pr(PythonParameterGenerator.generatePythonGetters(decl));
+            // Generate methods
+            pythonClasses.pr(PythonMethodGenerator.generateMethods(reactor));
+            // Generate reactions
             List<Reaction> reactionToGenerate = ASTUtils.allReactions(reactor);
             if (reactor.isFederated()) {
                 // Filter out reactions that are automatically generated in C in the top level federated reactor
@@ -62,6 +65,7 @@ public static String generatePythonClass(ReactorInstance instance, FederateInsta
             }
             pythonClasses.pr(PythonReactionGenerator.generatePythonReactions(reactor, reactionToGenerate));
             pythonClasses.unindent();
+            pythonClasses.pr("\n");
             instantiatedClasses.add(className);
         }
 

From 7a7c88d15efb156cfa1c2cedf6b9e81fc5f5b7df Mon Sep 17 00:00:00 2001
From: Soroush Bateni <soroosh129@gmail.com>
Date: Mon, 13 Jun 2022 14:39:45 -0500
Subject: [PATCH 2/7] Added tests

---
 test/Python/src/Methods.lf          | 29 ++++++++++++++++++++++
 test/Python/src/MethodsRecursive.lf | 23 +++++++++++++++++
 test/Python/src/MethodsSameName.lf  | 38 +++++++++++++++++++++++++++++
 3 files changed, 90 insertions(+)
 create mode 100644 test/Python/src/Methods.lf
 create mode 100644 test/Python/src/MethodsRecursive.lf
 create mode 100644 test/Python/src/MethodsSameName.lf

diff --git a/test/Python/src/Methods.lf b/test/Python/src/Methods.lf
new file mode 100644
index 0000000000..f85e11839f
--- /dev/null
+++ b/test/Python/src/Methods.lf
@@ -0,0 +1,29 @@
+# Test LF methods.
+target Python;
+
+main reactor {
+
+    state foo(2)
+
+    method getFoo() {=
+        return self.foo
+    =}
+
+    method add(x) {=
+        self.foo += x
+    =}
+
+    reaction(startup){=
+        print(f"Foo is initialized to {self.getFoo()}")
+        if self.getFoo() != 2:
+            sys.stderr.write("Expected 2!");
+            exit(1)
+
+        self.add(40)
+        a = self.getFoo()
+        print(f"2 + 40 = {a}")
+        if a != 42:
+            sys.stderr.write("Expected 42!");
+            exit(1)
+    =}
+}
diff --git a/test/Python/src/MethodsRecursive.lf b/test/Python/src/MethodsRecursive.lf
new file mode 100644
index 0000000000..ff873b75d1
--- /dev/null
+++ b/test/Python/src/MethodsRecursive.lf
@@ -0,0 +1,23 @@
+# Test ability of methods to call each other and (recursively) themselves.
+target Python;
+
+main reactor {
+
+    state foo(2)
+
+    // Return the n-th Fibonacci number.
+    method fib(n) {=
+        if n <= 1: 
+            return 1
+        return self.add(self.fib(n-1), self.fib(n-2))
+    =}
+
+    method add(x, y) {=
+        return x + y
+    =}
+
+    reaction(startup){=
+        for n in range(1, 10):
+            print(f"{n}-th Fibonacci number is {self.fib(n)}")
+    =}
+}
diff --git a/test/Python/src/MethodsSameName.lf b/test/Python/src/MethodsSameName.lf
new file mode 100644
index 0000000000..e730de0d24
--- /dev/null
+++ b/test/Python/src/MethodsSameName.lf
@@ -0,0 +1,38 @@
+# This tests that reactors can have methods with the same names.
+target Python;
+
+reactor Foo {
+
+    state foo(2)
+
+    method add(x) {=
+        self.foo += x
+    =}
+
+    reaction(startup){=
+        self.add(40)
+        print(f"Foo: 2 + 40 = {self.foo}")
+        if self.foo != 42:
+            sys.stderr.write("Expected 42!")
+            exit(1)
+    =}
+}
+
+main reactor {
+
+    state foo(2)
+
+    a = new Foo()
+
+    method add(x) {=
+        self.foo += x
+    =}
+
+    reaction(startup){=
+        self.add(40)
+        print(f"Main: 2 + 40 = {self.foo}")
+        if self.foo != 42:
+            sys.stderr.write("Expected 42!")
+            exit(1)
+    =}
+}

From dde926593ed97916acc0f080bbc33137a279d7c3 Mon Sep 17 00:00:00 2001
From: Soroush Bateni <soroosh129@gmail.com>
Date: Mon, 13 Jun 2022 14:40:47 -0500
Subject: [PATCH 3/7] Moved method tests out of the target directory

---
 test/C/src/{target => }/Methods.lf          | 0
 test/C/src/{target => }/MethodsRecursive.lf | 0
 test/C/src/{target => }/MethodsSameName.lf  | 0
 test/Cpp/src/{target => }/Methods.lf        | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename test/C/src/{target => }/Methods.lf (100%)
 rename test/C/src/{target => }/MethodsRecursive.lf (100%)
 rename test/C/src/{target => }/MethodsSameName.lf (100%)
 rename test/Cpp/src/{target => }/Methods.lf (100%)

diff --git a/test/C/src/target/Methods.lf b/test/C/src/Methods.lf
similarity index 100%
rename from test/C/src/target/Methods.lf
rename to test/C/src/Methods.lf
diff --git a/test/C/src/target/MethodsRecursive.lf b/test/C/src/MethodsRecursive.lf
similarity index 100%
rename from test/C/src/target/MethodsRecursive.lf
rename to test/C/src/MethodsRecursive.lf
diff --git a/test/C/src/target/MethodsSameName.lf b/test/C/src/MethodsSameName.lf
similarity index 100%
rename from test/C/src/target/MethodsSameName.lf
rename to test/C/src/MethodsSameName.lf
diff --git a/test/Cpp/src/target/Methods.lf b/test/Cpp/src/Methods.lf
similarity index 100%
rename from test/Cpp/src/target/Methods.lf
rename to test/Cpp/src/Methods.lf

From b0b807b7902868ea81533c04e506fdad437f1c65 Mon Sep 17 00:00:00 2001
From: Soroush Bateni <soroosh129@gmail.com>
Date: Mon, 13 Jun 2022 14:43:56 -0500
Subject: [PATCH 4/7] Reverted accidental changes to Project.xml

---
 .idea/codeStyles/Project.xml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index f5dfa2a006..5a907b1337 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,6 +1,5 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <option name="LINE_SEPARATOR" value="&#10;" />
     <option name="INSERT_INNER_CLASS_IMPORTS" value="true" />
     <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
     <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
@@ -20,11 +19,10 @@
         <emptyLine />
       </value>
     </option>
-    <option name="RIGHT_MARGIN" value="100" />
-    <option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="true" />
+    <option name="RIGHT_MARGIN" value="80" />
     <option name="FORMATTER_TAGS_ENABLED" value="true" />
     <option name="WRAP_COMMENTS" value="true" />
-    <option name="SOFT_MARGINS" value="100,120" />
+    <option name="SOFT_MARGINS" value="60" />
     <JavaCodeStyleSettings>
       <option name="ALIGN_MULTILINE_ANNOTATION_PARAMETERS" value="true" />
       <option name="INSERT_INNER_CLASS_IMPORTS" value="true" />
@@ -72,7 +70,7 @@
       <option name="USE_SCALADOC2_FORMATTING" value="true" />
     </ScalaCodeStyleSettings>
     <codeStyleSettings language="JAVA">
-      <option name="RIGHT_MARGIN" value="100" />
+      <option name="RIGHT_MARGIN" value="120" />
       <option name="BLANK_LINES_BEFORE_PACKAGE" value="1" />
       <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
       <option name="INDENT_CASE_FROM_SWITCH" value="false" />

From 82b6ab6d0a0e0506b5fe2dc41b1d290d30a4308e Mon Sep 17 00:00:00 2001
From: Soroush Bateni <soroosh129@gmail.com>
Date: Mon, 13 Jun 2022 14:45:50 -0500
Subject: [PATCH 5/7] Cleaned up imports

---
 .../src/org/lflang/generator/python/PythonGenerator.java    | 6 +++---
 .../org/lflang/generator/python/PythonMethodGenerator.java  | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/python/PythonGenerator.java b/org.lflang/src/org/lflang/generator/python/PythonGenerator.java
index 6015965013..45f977e8fe 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonGenerator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonGenerator.java
@@ -44,6 +44,7 @@
 import org.eclipse.xtext.util.CancelIndicator;
 import org.eclipse.xtext.xbase.lib.Exceptions;
 import org.eclipse.xtext.xbase.lib.IterableExtensions;
+
 import org.lflang.ASTUtils;
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
@@ -57,7 +58,6 @@
 import org.lflang.federated.serialization.SupportedSerializers;
 import org.lflang.generator.CodeBuilder;
 import org.lflang.generator.CodeMap;
-import org.lflang.generator.DockerGeneratorBase;
 import org.lflang.generator.GeneratorResult;
 import org.lflang.generator.GeneratorUtils;
 import org.lflang.generator.IntegratedBuilder;
@@ -67,7 +67,6 @@
 import org.lflang.generator.TargetTypes;
 import org.lflang.generator.c.CDockerGenerator;
 import org.lflang.generator.c.CGenerator;
-import org.lflang.generator.c.CMethodGenerator;
 import org.lflang.generator.c.CUtil;
 import org.lflang.lf.Action;
 import org.lflang.lf.Expression;
@@ -81,9 +80,10 @@
 import org.lflang.lf.VarRef;
 import org.lflang.util.FileUtil;
 import org.lflang.util.LFCommand;
-import com.google.common.base.Objects;
 import org.lflang.util.StringUtil;
 
+import com.google.common.base.Objects;
+
 
 /**
  * Generator for Python target. This class generates Python code defining each reactor
diff --git a/org.lflang/src/org/lflang/generator/python/PythonMethodGenerator.java b/org.lflang/src/org/lflang/generator/python/PythonMethodGenerator.java
index 0fc830030b..da4545f6bb 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonMethodGenerator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonMethodGenerator.java
@@ -3,7 +3,6 @@
 import java.util.stream.Collectors;
 
 import org.lflang.ASTUtils;
-import org.lflang.generator.CodeBuilder;
 import org.lflang.lf.Method;
 import org.lflang.lf.MethodArgument;
 import org.lflang.lf.Reactor;

From 210c15476da16c6c98503d37901211dd7795369e Mon Sep 17 00:00:00 2001
From: Soroush Bateni <soroosh129@gmail.com>
Date: Mon, 13 Jun 2022 18:32:25 -0500
Subject: [PATCH 6/7] Expanded on comment

---
 .../src/org/lflang/generator/python/PythonGenerator.java   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/python/PythonGenerator.java b/org.lflang/src/org/lflang/generator/python/PythonGenerator.java
index 45f977e8fe..05418ebd38 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonGenerator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonGenerator.java
@@ -802,8 +802,11 @@ protected void generateParameterInitialization(ReactorInstance instance) {
 
     @Override
     protected void generateMethods(ReactorDecl reactor) {
-        // Do nothing.
-        // Methods are generated in Python not C.
+        /**
+         * Do nothing.
+         * Methods are generated in Python not C.
+         * @see PythonMethodGenerator
+         */
     }
 
     /**

From f6c99217af774644bd6befd1218ef3dc644e51dc Mon Sep 17 00:00:00 2001
From: Soroush Bateni <soroosh129@gmail.com>
Date: Mon, 13 Jun 2022 18:41:50 -0500
Subject: [PATCH 7/7] Moved Javadoc comment to above method

---
 .../lflang/generator/python/PythonGenerator.java    | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/org.lflang/src/org/lflang/generator/python/PythonGenerator.java b/org.lflang/src/org/lflang/generator/python/PythonGenerator.java
index 05418ebd38..4ef0b3c9e3 100644
--- a/org.lflang/src/org/lflang/generator/python/PythonGenerator.java
+++ b/org.lflang/src/org/lflang/generator/python/PythonGenerator.java
@@ -800,14 +800,13 @@ protected void generateParameterInitialization(ReactorInstance instance) {
         // Parameters are initialized in Python
     }
 
+    /**
+     * Do nothing.
+     * Methods are generated in Python not C.
+     * @see PythonMethodGenerator
+     */
     @Override
-    protected void generateMethods(ReactorDecl reactor) {
-        /**
-         * Do nothing.
-         * Methods are generated in Python not C.
-         * @see PythonMethodGenerator
-         */
-    }
+    protected void generateMethods(ReactorDecl reactor) {    }
 
     /**
      * Generate C preambles defined by user for a given reactor