Merge branch 'master' into edsrzf-string-flexible-array

This commit is contained in:
Bob Nystrom
2015-01-07 07:23:03 -08:00
2 changed files with 6 additions and 4 deletions

View File

@ -43,6 +43,8 @@ while (!adjectives.isDone) IO.print(adjectives.call)
If you like the sound of this, [give it a try][try]! Even better, you can
[contribute to Wren itself][contribute].
[![Build Status](https://travis-ci.org/munificent/wren.svg)](https://travis-ci.org/munificent/wren)
[syntax]: http://munificent.github.io/wren/syntax.html
[src]: https://github.com/munificent/wren/tree/master/src
[nan]: https://github.com/munificent/wren/blob/46c1ba92492e9257aba6418403161072d640cb29/src/wren_value.h#L378-L433
@ -51,4 +53,4 @@ If you like the sound of this, [give it a try][try]! Even better, you can
[fibers]: http://munificent.github.io/wren/fibers.html
[embedding]: http://munificent.github.io/wren/embedding-api.html
[try]: http://munificent.github.io/wren/getting-started.html
[contribute]: http://munificent.github.io/wren/contributing.html
[contribute]: http://munificent.github.io/wren/contributing.html

View File

@ -142,7 +142,7 @@ class UnaryConstraint is Constraint {
// Adds this constraint to the constraint graph.
addToGraph {
_myOutput.addConstraint(this)
_satisfied = false;
_satisfied = false
}
// Decides if this constraint can be satisfied and records that decision.
@ -356,10 +356,10 @@ class ScaleConstraint is BinaryConstraint {
// Enforce this constraint. Assume that it is satisfied.
execute {
if (direction == FORWARD) {
v2.value = v1.value * _scale.value + _offset.value;
v2.value = v1.value * _scale.value + _offset.value
} else {
// TODO: Is this the same semantics as ~/?
v1.value = ((v2.value - _offset.value) / _scale.value).floor;
v1.value = ((v2.value - _offset.value) / _scale.value).floor
}
}