mirror of
https://github.com/wren-lang/wren.git
synced 2026-01-11 22:28:45 +01:00
Use "construct" instead of "this" to define constructors.
This commit is contained in:
@ -1,7 +1,7 @@
|
||||
// Ported from the Python version.
|
||||
|
||||
class Tree {
|
||||
this new(item, depth) {
|
||||
construct new(item, depth) {
|
||||
_item = item
|
||||
if (depth > 0) {
|
||||
var item2 = item + item
|
||||
|
||||
@ -50,7 +50,7 @@ var ORDERED = null
|
||||
// disrupting current constraints. Strengths cannot be created outside
|
||||
// this class, so == can be used for value comparison.
|
||||
class Strength {
|
||||
this new(value, name) {
|
||||
construct new(value, name) {
|
||||
_value = value
|
||||
_name = name
|
||||
}
|
||||
@ -82,7 +82,7 @@ ORDERED = [
|
||||
var ThePlanner
|
||||
|
||||
class Constraint {
|
||||
this new(strength) {
|
||||
construct new(strength) {
|
||||
_strength = strength
|
||||
}
|
||||
|
||||
@ -131,7 +131,7 @@ class Constraint {
|
||||
|
||||
// Abstract superclass for constraints having a single possible output variable.
|
||||
class UnaryConstraint is Constraint {
|
||||
this new(myOutput, strength) {
|
||||
construct new(myOutput, strength) {
|
||||
super(strength)
|
||||
_satisfied = false
|
||||
_myOutput = myOutput
|
||||
@ -187,7 +187,7 @@ class UnaryConstraint is Constraint {
|
||||
// change their output during plan execution. This is called "stay
|
||||
// optimization".
|
||||
class StayConstraint is UnaryConstraint {
|
||||
this new(variable, strength) {
|
||||
construct new(variable, strength) {
|
||||
super(variable, strength)
|
||||
}
|
||||
|
||||
@ -199,7 +199,7 @@ class StayConstraint is UnaryConstraint {
|
||||
// A unary input constraint used to mark a variable that the client
|
||||
// wishes to change.
|
||||
class EditConstraint is UnaryConstraint {
|
||||
this new(variable, strength) {
|
||||
construct new(variable, strength) {
|
||||
super(variable, strength)
|
||||
}
|
||||
|
||||
@ -219,7 +219,7 @@ var BACKWARD = 0
|
||||
// Abstract superclass for constraints having two possible output
|
||||
// variables.
|
||||
class BinaryConstraint is Constraint {
|
||||
this new(v1, v2, strength) {
|
||||
construct new(v1, v2, strength) {
|
||||
super(strength)
|
||||
_v1 = v1
|
||||
_v2 = v2
|
||||
@ -328,7 +328,7 @@ class BinaryConstraint is Constraint {
|
||||
// this relationship but the scale factor and offset are considered
|
||||
// read-only.
|
||||
class ScaleConstraint is BinaryConstraint {
|
||||
this new(src, scale, offset, dest, strength) {
|
||||
construct new(src, scale, offset, dest, strength) {
|
||||
_scale = scale
|
||||
_offset = offset
|
||||
super(src, dest, strength)
|
||||
@ -376,7 +376,7 @@ class ScaleConstraint is BinaryConstraint {
|
||||
|
||||
// Constrains two variables to have the same value.
|
||||
class EqualityConstraint is BinaryConstraint {
|
||||
this new(v1, v2, strength) {
|
||||
construct new(v1, v2, strength) {
|
||||
super(v1, v2, strength)
|
||||
}
|
||||
|
||||
@ -391,7 +391,7 @@ class EqualityConstraint is BinaryConstraint {
|
||||
// various parameters of interest to the DeltaBlue incremental
|
||||
// constraint solver.
|
||||
class Variable {
|
||||
this new(name, value) {
|
||||
construct new(name, value) {
|
||||
_constraints = []
|
||||
_determinedBy = null
|
||||
_mark = 0
|
||||
@ -430,7 +430,7 @@ class Variable {
|
||||
// to resatisfy all currently satisfiable constraints in the face of
|
||||
// one or more changing inputs.
|
||||
class Plan {
|
||||
this new() {
|
||||
construct new() {
|
||||
_list = []
|
||||
}
|
||||
|
||||
@ -448,7 +448,7 @@ class Plan {
|
||||
}
|
||||
|
||||
class Planner {
|
||||
this new() {
|
||||
construct new() {
|
||||
_currentMark = 0
|
||||
}
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
class Toggle {
|
||||
this new(startState) {
|
||||
construct new(startState) {
|
||||
_state = startState
|
||||
}
|
||||
|
||||
@ -11,7 +11,7 @@ class Toggle {
|
||||
}
|
||||
|
||||
class NthToggle is Toggle {
|
||||
this new(startState, maxCounter) {
|
||||
construct new(startState, maxCounter) {
|
||||
super(startState)
|
||||
_countMax = maxCounter
|
||||
_count = 0
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
// Infinite iterator demonstrating that Sequence.map is not eager
|
||||
class FibIterator {
|
||||
this new() {
|
||||
construct new() {
|
||||
_current = 0
|
||||
_next = 1
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
// Infinite iterator demonstrating that Sequence.where is not eager
|
||||
class FibIterator {
|
||||
this new() {
|
||||
construct new() {
|
||||
_current = 0
|
||||
_next = 1
|
||||
}
|
||||
|
||||
@ -1,6 +0,0 @@
|
||||
class Foo {}
|
||||
|
||||
var foo = Foo.new()
|
||||
IO.print(foo is Foo) // expect: true
|
||||
|
||||
// TODO: Test precedence and grammar of what follows "new".
|
||||
@ -1,4 +1,4 @@
|
||||
class Foo {
|
||||
static this new() {} // expect error
|
||||
this static new() {} // expect error
|
||||
static construct new() {} // expect error
|
||||
construct static new() {} // expect error
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
class Foo {
|
||||
this new() {
|
||||
construct new() {
|
||||
IO.print("ok")
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
class Foo {
|
||||
this new() {
|
||||
construct new() {
|
||||
IO.print("Foo.new()")
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
class Foo {
|
||||
+(other) { "Foo " + other }
|
||||
}
|
||||
|
||||
IO.print(Foo.new() + "value") // expect: Foo value
|
||||
|
||||
// TODO: Other expressions following a constructor, like new Foo.bar("arg").
|
||||
// TODO: Delete this test?
|
||||
// TODO: Other constructor tests, like named constructors, etc.
|
||||
@ -1,8 +1,6 @@
|
||||
// TODO: Change this.
|
||||
|
||||
class Foo {
|
||||
this named() { _field = "named" }
|
||||
this other() { _field = "other" }
|
||||
construct named() { _field = "named" }
|
||||
construct other() { _field = "other" }
|
||||
|
||||
toString { _field }
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
class Foo {
|
||||
this real() {}
|
||||
construct real() {}
|
||||
}
|
||||
|
||||
// Classes do not get an argument-less "new()" if they define a constructor.
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
class Foo {
|
||||
this base() {}
|
||||
construct base() {}
|
||||
}
|
||||
|
||||
class Bar is Foo {}
|
||||
|
||||
@ -2,12 +2,10 @@
|
||||
// super() call in a subclass, so this does that.
|
||||
|
||||
class Foo {
|
||||
this new() {
|
||||
construct new() {
|
||||
super() // Should not cause a no method error.
|
||||
IO.print("ok")
|
||||
}
|
||||
}
|
||||
|
||||
Foo.new() // expect: ok
|
||||
|
||||
// TODO: Test that can't invoke initializer on existing instance.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
class A {}
|
||||
|
||||
class B is A {
|
||||
this new() {
|
||||
construct new() {
|
||||
super // expect error
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
class A {
|
||||
this new(arg) {
|
||||
construct new(arg) {
|
||||
IO.print("new A ", arg)
|
||||
_field = arg
|
||||
}
|
||||
@ -8,7 +8,7 @@ class A {
|
||||
}
|
||||
|
||||
class B is A {
|
||||
this new(arg1, arg2) {
|
||||
construct new(arg1, arg2) {
|
||||
super(arg2)
|
||||
IO.print("new B ", arg1)
|
||||
_field = arg1
|
||||
@ -18,7 +18,7 @@ class B is A {
|
||||
}
|
||||
|
||||
class C is B {
|
||||
this new() {
|
||||
construct new() {
|
||||
super("one", "two")
|
||||
IO.print("new C")
|
||||
_field = "c"
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
class Foo {
|
||||
this new() { _field = "Foo field" }
|
||||
construct new() { _field = "Foo field" }
|
||||
|
||||
closeOverGet {
|
||||
return Fn.new { _field }
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
// This test exists mainly to make sure the GC traces instance fields.
|
||||
class Node {
|
||||
this new(left, value, right) {
|
||||
construct new(left, value, right) {
|
||||
_left = left
|
||||
_value = value
|
||||
_right = right
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
class Iter {
|
||||
this new(value) { _value = value }
|
||||
construct new(value) { _value = value }
|
||||
iterate(iterator) { _value }
|
||||
iteratorValue(iterator) { "value" }
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
class Foo {
|
||||
this new() { _field = "Foo field" }
|
||||
construct new() { _field = "Foo field" }
|
||||
|
||||
closeOverFooGet {
|
||||
return Fn.new { Fn.new { _field } }
|
||||
@ -11,7 +11,7 @@ class Foo {
|
||||
}
|
||||
|
||||
class Bar is Foo {
|
||||
this new() {
|
||||
construct new() {
|
||||
super()
|
||||
_field = "Bar field"
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
class Foo {
|
||||
this new(value) { _value = value }
|
||||
construct new(value) { _value = value }
|
||||
toString { _value }
|
||||
bar=(value) {
|
||||
_value = value
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
class Foo {
|
||||
this new() {
|
||||
construct new() {
|
||||
_field1 = 1
|
||||
_field2 = 2
|
||||
_field3 = 3
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
class Foo {
|
||||
this new() {
|
||||
construct new() {
|
||||
_field1 = 1
|
||||
_field2 = 2
|
||||
_field3 = 3
|
||||
@ -137,7 +137,7 @@ class Foo {
|
||||
}
|
||||
|
||||
class Bar is Foo {
|
||||
this new() {
|
||||
construct new() {
|
||||
super()
|
||||
_field129 = 129
|
||||
_field130 = 130
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
class Foo {
|
||||
this new() {
|
||||
construct new() {
|
||||
_field1 = 1
|
||||
_field2 = 2
|
||||
_field3 = 3
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
class Foo {
|
||||
this new() {
|
||||
construct new() {
|
||||
_field1 = 1
|
||||
_field2 = 2
|
||||
_field3 = 3
|
||||
@ -137,7 +137,7 @@ class Foo {
|
||||
}
|
||||
|
||||
class Bar is Foo { // expect runtime error: Class 'Bar' may not have more than 255 fields, including inherited ones.
|
||||
this new() {
|
||||
construct new() {
|
||||
super()
|
||||
_field129 = 129
|
||||
_field130 = 130
|
||||
|
||||
Reference in New Issue
Block a user