New syntax for class inheritance

Author: adamsol

docs/manual.md

@@ -787,7 +787,7 @@ class Base def
     destructor def
         print "Base destructor"
 
-class Derived(Base) def
+class Derived: Base def
     y: Int
 
     constructor def
@@ -814,7 +814,7 @@ class A def
     func f(x: Int): Void def
         print "A: {x}"
 
-class B(A) def
+class B: A def
     func f(x: Int): Void def
         print "B: {x}"
         super(x//2)
@@ -829,7 +829,7 @@ Methods can be abstract. If a class has any abstract methods, it cannot be insta
 class Abstract def
     func f() abstract
 
-class Concrete(Abstract) def
+class Concrete: Abstract def
     func f(): Void def
         print "ok"
 

src/parser.py

@@ -239,7 +239,7 @@ def parse_stmt(self):
             return {
                 **self.node('StmtClass', token),
                 'id': self.parse_id(),
-                'base': self.match('(') and (self.parse_type(), self.expect(')'))[0] or None,
+                'base': self.match(':') and self.parse_type() or None,
                 'members': self.expect('def') and self.parse_class_member_list(),
             }
         self.backtrack()  # backtrack if no keyword has been matched

test/bad/classes/abstract02.px

@@ -4,7 +4,7 @@ class A def
 
     func g() abstract
 
-class B(A) def
+class B: A def
     func f(): Void def
         skip
 

test/bad/classes/constructor06.px

@@ -3,6 +3,6 @@ class A def
     constructor def
         skip
 
-class B(A) def
+class B: A def
     constructor def
         super()

test/bad/classes/destructor02.px

@@ -3,6 +3,6 @@ class A def
     destructor def
         skip
 
-class B(A) def
+class B: A def
     destructor def
         super()

test/bad/classes/inheritance01.err

@@ -1 +1 @@
-:2:9: Type `String` is not a class.
+:2:10: Type `String` is not a class.

test/bad/classes/inheritance01.px

@@ -1,3 +1,3 @@
 
-class A(String) def
+class A: String def
     x: Int

test/bad/classes/inheritance02.err

@@ -1 +1 @@
-:2:9: Identifier `XYZ` does not represent a type.
+:2:10: Identifier `XYZ` does not represent a type.

test/bad/classes/inheritance02.px

@@ -1,3 +1,3 @@
 
-class A(XYZ) def
+class A: XYZ def
     x: Int

test/bad/classes/inheritance03.px

@@ -2,7 +2,7 @@
 class Base def
     x: Int
 
-class Sub(Base) def
+class Sub: Base def
     y: Int
 
 sub = Sub()

test/bad/classes/inheritance04.px

@@ -2,10 +2,10 @@
 class Base def
     x: Int
 
-class Sub1(Base) def
+class Sub1: Base def
     y: Int
 
-class Sub2(Base) def
+class Sub2: Base def
     y: Int
 
 

test/bad/classes/inheritance05.px

@@ -2,5 +2,5 @@
 class A def
     x: Int
 
-class B(A) def
+class B: A def
     x: Int

test/bad/classes/super02.px

@@ -3,6 +3,6 @@ class A def
     func f(): Void def
         return
 
-class B(A) def
+class B: A def
     func g(): Void def
         super()

test/bad/classes/super03.px

@@ -2,9 +2,9 @@
 class A def
     func f() abstract
 
-class B(A) def
+class B: A def
     x: Int
 
-class C(B) def
+class C: B def
     func f(): Void def
         super()

test/bad/classes/type03.px

@@ -2,7 +2,7 @@
 class A def
     x: Int
 
-class B(A) def
+class B: A def
     y: Int
 
 b: [B] = [A()]

test/bad/classes/type04.px

@@ -2,7 +2,7 @@
 class A def
     x: Int
 
-class B(A) def
+class B: A def
     y: Int
 
 

test/bad/classes/type05.px

@@ -2,7 +2,7 @@
 class A def
     x: Int
 
-class B(A) def
+class B: A def
     y: Int
 
 b = [B()]

test/bad/classes/type06.px

@@ -2,7 +2,7 @@
 class A def
     x: Int
 
-class B(A) def
+class B: A def
     y: Int
 
 b: {B}? = {B()}

test/bad/classes/type07.px

@@ -2,7 +2,7 @@
 class A def
     x: Int
 
-class B(A) def
+class B: A def
     y: Int
 
 b = [[B()]]

test/good/classes/abstract01.px

@@ -2,7 +2,7 @@
 class A def
     func f() abstract
 
-class B(A) def
+class B: A def
     func f(): Void def
         print 'B'
 

test/good/classes/constructor04.px

@@ -6,7 +6,7 @@ class A def
         print this.x
 
 
-class B(A) def
+class B: A def
     y: Rat
 
     constructor def

test/good/classes/constructor05.px

@@ -4,11 +4,11 @@ class A def
         print 'A'
 
 
-class B(A) def
+class B: A def
     x: Int
 
 
-class C(B) def
+class C: B def
     constructor def
         print 'C'
 

test/good/classes/constructor06.px

@@ -10,7 +10,7 @@ class A def
     constructor def
         print 'A'
 
-class B(A) def
+class B: A def
     y: Float = f(2)
 
     constructor def

test/good/classes/destructor04.px

@@ -6,7 +6,7 @@ class A def
         print "A {this.x}"
 
 
-class B(A) def
+class B: A def
     y: Float
 
     destructor def

test/good/classes/destructor05.px

@@ -4,11 +4,11 @@ class A def
         print 'A'
 
 
-class B(A) def
+class B: A def
     x: Int
 
 
-class C(B) def
+class C: B def
     destructor def
         print 'C'
 

test/good/classes/destructor06.px

@@ -3,7 +3,7 @@ class A def
     x: Char
 
 
-class B(A) def
+class B: A def
     destructor def
         print this.x
 

test/good/classes/inheritance01.px

@@ -2,7 +2,7 @@
 class A def
     x: Int
 
-class B(A) def
+class B: A def
     y: String
 
 b = B()

test/good/classes/inheritance02.px

@@ -2,7 +2,7 @@
 class A def
     x: Int = 2
 
-class B(A) def
+class B: A def
     y: String = "y"
 
 b: B = B()

test/good/classes/inheritance03.px

@@ -6,7 +6,7 @@ class A def
     func g(): String def
         return "A.g"
 
-class B(A) def
+class B: A def
     func f(): String def
         return "B.f"
 

test/good/classes/inheritance04.px

@@ -3,7 +3,7 @@ class Z def
     func f(x: Char = 'Z'): Void def
         print x
 
-class Y(Z) def
+class Y: Z def
     x: Int
 
 Y().f('Y')

test/good/classes/inheritance05.px

@@ -5,7 +5,7 @@ class A def
     constructor def
         print this.s
 
-class B(A) def
+class B: A def
     x: Int
 
 B("B")

test/good/classes/inheritance06.px

@@ -5,16 +5,16 @@ class A def
     func toString(): String def
         return this.c.toString()
 
-class B(A) def
+class B: A def
     b: Bool
 
     func toString(): String def
         return "{this.c} {this.b}"
 
-class C(B) def
+class C: B def
     x: Int
 
-class D(A) def
+class D: A def
     x: Int = 42
 
     func toString(): String def

test/good/classes/inheritance07.px

@@ -2,11 +2,11 @@
 class A def
     x: Char = 'A'
 
-class B(A) def
+class B: A def
     constructor def
         this.x = 'B'
 
-class C(B) def
+class C: B def
     constructor def
         this.x = 'C'
 

test/good/classes/inheritance08.px

@@ -2,7 +2,7 @@
 class A def
     x: String = "A"
 
-class B(A) def
+class B: A def
     constructor def
         this.x = "B"
 

test/good/classes/inheritance09.px

@@ -3,7 +3,7 @@ class A def
     func toString(): String def
         return "A"
 
-class B(A) def
+class B: A def
     func toString(): String def
         return "B"
 

test/good/classes/inheritance10.px

@@ -2,13 +2,13 @@
 class A def
     x: Bool
 
-class B(A) def
+class B: A def
     y: Char = '?'
 
     func f(): Void def
         print this.x
 
-class C(B) def
+class C: B def
     z: String
 
 

test/good/classes/init03.px

@@ -5,7 +5,7 @@ class A def
     func f(): Void def
         skip
 
-class B(A) def
+class B: A def
     x: Rat
     a: A
 

test/good/classes/print04.px

@@ -2,7 +2,7 @@
 class A def
     x: Int
 
-class B(A) def
+class B: A def
     y: Float
 
 print A()

test/good/classes/print05.px

@@ -2,11 +2,11 @@
 class A def
     s: String
 
-class B(A) def
+class B: A def
     func toString(): String def
         return this.s
 
-class C(B) def
+class C: B def
     y: Int