forked from Mirror/wren
Merge branch 'master' into libuv
# Conflicts: # project/xcode/wren.xcodeproj/project.pbxproj # script/wren.mk # src/cli/main.c # src/cli/vm.c # src/cli/vm.h # test/api/main.c
This commit is contained in:
@ -626,7 +626,7 @@ planner = None
|
||||
def delta_blue():
|
||||
global total
|
||||
start = time.clock()
|
||||
for i in range(20):
|
||||
for i in range(40):
|
||||
chain_test(100)
|
||||
projection_test(100)
|
||||
print(total)
|
||||
|
||||
@ -34,17 +34,6 @@
|
||||
// I've kept it this way to avoid deviating too much from the original
|
||||
// implementation.
|
||||
|
||||
// TODO: Support forward declarations of globals.
|
||||
var REQUIRED = null
|
||||
var STRONG_REFERRED = null
|
||||
var PREFERRED = null
|
||||
var STRONG_DEFAULT = null
|
||||
var NORMAL = null
|
||||
var WEAK_DEFAULT = null
|
||||
var WEAKEST = null
|
||||
|
||||
var ORDERED = null
|
||||
|
||||
// Strengths are used to measure the relative importance of constraints.
|
||||
// New strengths may be inserted in the strength hierarchy without
|
||||
// disrupting current constraints. Strengths cannot be created outside
|
||||
@ -67,15 +56,15 @@ class Strength {
|
||||
}
|
||||
|
||||
// Compile time computed constants.
|
||||
REQUIRED = Strength.new(0, "required")
|
||||
STRONG_REFERRED = Strength.new(1, "strongPreferred")
|
||||
PREFERRED = Strength.new(2, "preferred")
|
||||
STRONG_DEFAULT = Strength.new(3, "strongDefault")
|
||||
NORMAL = Strength.new(4, "normal")
|
||||
WEAK_DEFAULT = Strength.new(5, "weakDefault")
|
||||
WEAKEST = Strength.new(6, "weakest")
|
||||
var REQUIRED = Strength.new(0, "required")
|
||||
var STRONG_REFERRED = Strength.new(1, "strongPreferred")
|
||||
var PREFERRED = Strength.new(2, "preferred")
|
||||
var STRONG_DEFAULT = Strength.new(3, "strongDefault")
|
||||
var NORMAL = Strength.new(4, "normal")
|
||||
var WEAK_DEFAULT = Strength.new(5, "weakDefault")
|
||||
var WEAKEST = Strength.new(6, "weakest")
|
||||
|
||||
ORDERED = [
|
||||
var ORDERED = [
|
||||
WEAKEST, WEAK_DEFAULT, NORMAL, STRONG_DEFAULT, PREFERRED, STRONG_REFERRED
|
||||
]
|
||||
|
||||
@ -701,7 +690,7 @@ var projectionTest = Fn.new {|n|
|
||||
}
|
||||
|
||||
var start = IO.clock
|
||||
for (i in 0...20) {
|
||||
for (i in 0...40) {
|
||||
chainTest.call(100)
|
||||
projectionTest.call(100)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user