Support for super ctor calls (thanks Laurie\!). Closes natural#2.

Troy Melhase · Troy Melhase · commit 876e40c90e66 · 2007-04-13T07:36:49.000Z
diff --git a/java2python/lib/sourcetypes.py b/java2python/lib/sourcetypes.py
@@ -496,6 +496,7 @@ def addBaseClass(self, name):
         @return None
         """
         if name and (name not in self.bases):
+            name = self.formatExpression(name)
             self.bases.append(name)
 
     def formatDecl(self):
diff --git a/java2python/lib/walker.g b/java2python/lib/walker.g
@@ -747,10 +747,16 @@ ctor_call [block]
         }
 
     |   #(SUPER_CTOR_CALL
-            (el0=expr_list[block]
+            (seq=expr_list[block]
                 | p=primary_expr[block] el2=expr_list[block]
             )
-            {raise NotImplementedError("SUPER_CTOR_CALL")}
+            {
+            if seq is None:
+                seq = ""
+            name = block.parent.name
+            call = ("super(%s, self).__init__(%s)", (("%s", name), ("%s", seq)))
+            block.addSource(call)
+            }
         )
     ;
 
diff --git a/java2python/tests/SuperCtorTest1.java b/java2python/tests/SuperCtorTest1.java
@@ -0,0 +1,3 @@
+class SuperCtorTest1 {
+	public SuperCtorTest1() {}
+}
diff --git a/java2python/tests/SuperCtorTest2.java b/java2python/tests/SuperCtorTest2.java
@@ -0,0 +1,5 @@
+class SuperCtorTest2 {
+	public SuperCtorTest2() {
+		super();
+	}
+}
diff --git a/java2python/tests/SuperCtorTest3.java b/java2python/tests/SuperCtorTest3.java
@@ -0,0 +1,5 @@
+class SuperCtorTest3 {
+	public SuperCtorTest2() {
+		super("arg");
+	}
+}
diff --git a/java2python/tests/SuperCtorTest4.java b/java2python/tests/SuperCtorTest4.java
@@ -0,0 +1,6 @@
+class SuperCtorTest4 {
+	public SuperCtorTest4(int arg) {
+		super(arg);
+	}
+}
+

Original file line number	Diff line number	Diff line change
`@@ -747,10 +747,16 @@ ctor_call [block]`
`747`	`747`	`}`
`748`	`748`
`749`	`749`	`\| #(SUPER_CTOR_CALL`
`750`		`- (el0=expr_list[block]`
	`750`	`+ (seq=expr_list[block]`
`751`	`751`	`\| p=primary_expr[block] el2=expr_list[block]`
`752`	`752`	`)`
`753`		`- {raise NotImplementedError("SUPER_CTOR_CALL")}`
	`753`	`+ {`
	`754`	`+ if seq is None:`
	`755`	`+ seq = ""`
	`756`	`+ name = block.parent.name`
	`757`	`+ call = ("super(%s, self).__init__(%s)", (("%s", name), ("%s", seq)))`
	`758`	`+ block.addSource(call)`
	`759`	`+ }`
`754`	`760`	`)`
`755`	`761`	`;`
`756`	`762`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+class SuperCtorTest1 {`
	`2`	`+ public SuperCtorTest1() {}`
	`3`	`+}`