steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

combinators: make the behavior of 'case' consistent between the optimized and unoptimized forms

db4
Slava Pestov 2010-07-30 14:09:56 -04:00
parent f2646fc92c
commit fd1aad71bd
3 changed files with 101 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
basis/stack-checker/transforms/transforms.factor
View File

@ -67,11 +67,9 @@ IN: stack-checker.transforms
[ [
[ no-case ] [ no-case ]
] [ ] [
dup last callable? [ dup [ callable? ] find dup
dup last swap but-last [ [ head ] dip ] [ 2drop [ no-case ] ] if
] [ swap case>quot
[ no-case ] swap
] if case>quot
] if-empty ] if-empty
] 1 define-transform ] 1 define-transform

244
core/combinators/combinators-tests.factor
View File

@ -53,7 +53,7 @@ IN: combinators.tests
[ 10 \ . compile-execute(-test-4 ] [ wrong-values? ] must-fail-with [ 10 \ . compile-execute(-test-4 ] [ wrong-values? ] must-fail-with
! Compiled ! Cond
: cond-test-1 ( obj -- str ) : cond-test-1 ( obj -- str )
{ {
{ [ dup 2 mod 0 = ] [ drop "even" ] } { [ dup 2 mod 0 = ] [ drop "even" ] }
@ -63,7 +63,9 @@ IN: combinators.tests
\ cond-test-1 def>> must-infer \ cond-test-1 def>> must-infer
[ "even" ] [ 2 cond-test-1 ] unit-test [ "even" ] [ 2 cond-test-1 ] unit-test
[ "even" ] [ 2 \ cond-test-1 def>> call ] unit-test
[ "odd" ] [ 3 cond-test-1 ] unit-test [ "odd" ] [ 3 cond-test-1 ] unit-test
[ "odd" ] [ 3 \ cond-test-1 def>> call ] unit-test
: cond-test-2 ( obj -- str ) : cond-test-2 ( obj -- str )
{ {
@ -75,8 +77,11 @@ IN: combinators.tests
\ cond-test-2 def>> must-infer \ cond-test-2 def>> must-infer
[ "true" ] [ t cond-test-2 ] unit-test [ "true" ] [ t cond-test-2 ] unit-test
[ "true" ] [ t \ cond-test-2 def>> call ] unit-test
[ "false" ] [ f cond-test-2 ] unit-test [ "false" ] [ f cond-test-2 ] unit-test
[ "false" ] [ f \ cond-test-2 def>> call ] unit-test
[ "something else" ] [ "ohio" cond-test-2 ] unit-test [ "something else" ] [ "ohio" cond-test-2 ] unit-test
[ "something else" ] [ "ohio" \ cond-test-2 def>> call ] unit-test
: cond-test-3 ( obj -- str ) : cond-test-3 ( obj -- str )
{ {
@ -88,8 +93,11 @@ IN: combinators.tests
\ cond-test-3 def>> must-infer \ cond-test-3 def>> must-infer
[ "something else" ] [ t cond-test-3 ] unit-test [ "something else" ] [ t cond-test-3 ] unit-test
[ "something else" ] [ t \ cond-test-3 def>> call ] unit-test
[ "something else" ] [ f cond-test-3 ] unit-test [ "something else" ] [ f cond-test-3 ] unit-test
[ "something else" ] [ f \ cond-test-3 def>> call ] unit-test
[ "something else" ] [ "ohio" cond-test-3 ] unit-test [ "something else" ] [ "ohio" cond-test-3 ] unit-test
[ "something else" ] [ "ohio" \ cond-test-3 def>> call ] unit-test
: cond-test-4 ( -- ) : cond-test-4 ( -- )
{ {
@ -97,87 +105,30 @@ IN: combinators.tests
\ cond-test-4 def>> must-infer \ cond-test-4 def>> must-infer
[ cond-test-4 ] [ class \ no-cond = ] must-fail-with [ cond-test-4 ] [ no-cond? ] must-fail-with
[ \ cond-test-4 def>> call ] [ no-cond? ] must-fail-with
! Interpreted : cond-test-5 ( a -- b )
[ "even" ] [ {
2 {
{ [ dup 2 mod 0 = ] [ drop "even" ] }
{ [ dup 2 mod 1 = ] [ drop "odd" ] }
} cond
] unit-test
[ "odd" ] [
3 {
{ [ dup 2 mod 0 = ] [ drop "even" ] }
{ [ dup 2 mod 1 = ] [ drop "odd" ] }
} cond
] unit-test
[ "neither" ] [
3 {
{ [ dup string? ] [ drop "string" ] }
{ [ dup float? ] [ drop "float" ] }
{ [ dup alien? ] [ drop "alien" ] }
[ drop "neither" ]
} cond
] unit-test
[ "neither" ] [
3 {
{ [ dup string? ] [ drop "string" ] }
{ [ dup float? ] [ drop "float" ] }
{ [ dup alien? ] [ drop "alien" ] }
[ drop "neither" ]
} cond
] unit-test
[ "neither" ] [
3 {
{ [ dup string? ] [ drop "string" ] }
{ [ dup float? ] [ drop "float" ] }
{ [ dup alien? ] [ drop "alien" ] }
[ drop "neither" ]
} cond
] unit-test
[ "early" ] [
2 {
{ [ dup 2 mod 1 = ] [ drop "odd" ] } { [ dup 2 mod 1 = ] [ drop "odd" ] }
[ drop "early" ] [ drop "early" ]
{ [ dup 2 mod 0 = ] [ drop "even" ] } { [ dup 2 mod 0 = ] [ drop "even" ] }
} cond } cond ;
] unit-test
[ "really early" ] [ [ "early" ] [ 2 cond-test-5 ] unit-test
2 { [ "early" ] [ 2 \ cond-test-5 def>> call ] unit-test
: cond-test-6 ( a -- b )
{
[ drop "really early" ] [ drop "really early" ]
{ [ dup 2 mod 1 = ] [ drop "odd" ] } { [ dup 2 mod 1 = ] [ drop "odd" ] }
{ [ dup 2 mod 0 = ] [ drop "even" ] } { [ dup 2 mod 0 = ] [ drop "even" ] }
} cond } cond ;
] unit-test
[ { } cond ] [ class \ no-cond = ] must-fail-with [ "really early" ] [ 2 cond-test-6 ] unit-test
[ "really early" ] [ 2 \ cond-test-6 def>> call ] unit-test
[ "early" ] [ ! Case
2 {
{ [ dup 2 mod 1 = ] [ drop "odd" ] }
[ drop "early" ]
{ [ dup 2 mod 0 = ] [ drop "even" ] }
} cond
] unit-test
[ "really early" ] [
2 {
[ drop "really early" ]
{ [ dup 2 mod 1 = ] [ drop "odd" ] }
{ [ dup 2 mod 0 = ] [ drop "even" ] }
} cond
] unit-test
[ { } cond ] [ class \ no-cond = ] must-fail-with
! Compiled
: case-test-1 ( obj -- obj' ) : case-test-1 ( obj -- obj' )
{ {
{ 1 [ "one" ] } { 1 [ "one" ] }
@ -189,11 +140,10 @@ IN: combinators.tests
\ case-test-1 def>> must-infer \ case-test-1 def>> must-infer
[ "two" ] [ 2 case-test-1 ] unit-test [ "two" ] [ 2 case-test-1 ] unit-test
! Interpreted
[ "two" ] [ 2 \ case-test-1 def>> call ] unit-test [ "two" ] [ 2 \ case-test-1 def>> call ] unit-test
[ "x" case-test-1 ] must-fail [ "x" case-test-1 ] must-fail
[ "x" \ case-test-1 def>> call ] must-fail
: case-test-2 ( obj -- obj' ) : case-test-2 ( obj -- obj' )
{ {
@ -207,8 +157,6 @@ IN: combinators.tests
\ case-test-2 def>> must-infer \ case-test-2 def>> must-infer
[ 25 ] [ 5 case-test-2 ] unit-test [ 25 ] [ 5 case-test-2 ] unit-test
! Interpreted
[ 25 ] [ 5 \ case-test-2 def>> call ] unit-test [ 25 ] [ 5 \ case-test-2 def>> call ] unit-test
: case-test-3 ( obj -- obj' ) : case-test-3 ( obj -- obj' )
@ -225,6 +173,7 @@ IN: combinators.tests
\ case-test-3 def>> must-infer \ case-test-3 def>> must-infer
[ "an array" ] [ { 1 2 3 } case-test-3 ] unit-test [ "an array" ] [ { 1 2 3 } case-test-3 ] unit-test
[ "an array" ] [ { 1 2 3 } \ case-test-3 def>> call ] unit-test
CONSTANT: case-const-1 1 CONSTANT: case-const-1 1
CONSTANT: case-const-2 2 CONSTANT: case-const-2 2
@ -247,6 +196,11 @@ CONSTANT: case-const-2 2
[ "tres" ] [ 3 case-test-4 ] unit-test [ "tres" ] [ 3 case-test-4 ] unit-test
[ "demasiado" ] [ 100 case-test-4 ] unit-test [ "demasiado" ] [ 100 case-test-4 ] unit-test
[ "uno" ] [ 1 \ case-test-4 def>> call ] unit-test
[ "dos" ] [ 2 \ case-test-4 def>> call ] unit-test
[ "tres" ] [ 3 \ case-test-4 def>> call ] unit-test
[ "demasiado" ] [ 100 \ case-test-4 def>> call ] unit-test
: case-test-5 ( obj -- ) : case-test-5 ( obj -- )
{ {
{ case-const-1 [ "uno" print ] } { case-const-1 [ "uno" print ] }
@ -260,51 +214,7 @@ CONSTANT: case-const-2 2
\ case-test-5 def>> must-infer \ case-test-5 def>> must-infer
[ ] [ 1 case-test-5 ] unit-test [ ] [ 1 case-test-5 ] unit-test
[ ] [ 1 \ case-test-5 def>> call ] unit-test
! Interpreted
[ "uno" ] [
1 {
{ case-const-1 [ "uno" ] }
{ case-const-2 [ "dos" ] }
{ 3 [ "tres" ] }
{ 4 [ "cuatro" ] }
{ 5 [ "cinco" ] }
[ drop "demasiado" ]
} case
] unit-test
[ "dos" ] [
2 {
{ case-const-1 [ "uno" ] }
{ case-const-2 [ "dos" ] }
{ 3 [ "tres" ] }
{ 4 [ "cuatro" ] }
{ 5 [ "cinco" ] }
[ drop "demasiado" ]
} case
] unit-test
[ "tres" ] [
3 {
{ case-const-1 [ "uno" ] }
{ case-const-2 [ "dos" ] }
{ 3 [ "tres" ] }
{ 4 [ "cuatro" ] }
{ 5 [ "cinco" ] }
[ drop "demasiado" ]
} case
] unit-test
[ "demasiado" ] [
100 {
{ case-const-1 [ "uno" ] }
{ case-const-2 [ "dos" ] }
{ 3 [ "tres" ] }
{ 4 [ "cuatro" ] }
{ 5 [ "cinco" ] }
[ drop "demasiado" ]
} case
] unit-test
: do-not-call ( -- * ) "do not call" throw ; : do-not-call ( -- * ) "do not call" throw ;
@ -319,30 +229,6 @@ CONSTANT: case-const-2 2
[ "three" ] [ 3 test-case-6 ] unit-test [ "three" ] [ 3 test-case-6 ] unit-test
[ "do-not-call" ] [ \ do-not-call test-case-6 ] unit-test [ "do-not-call" ] [ \ do-not-call test-case-6 ] unit-test
[ "three" ] [
3 {
{ \ do-not-call [ "do-not-call" ] }
{ 3 [ "three" ] }
} case
] unit-test
[ "do-not-call" ] [
[ do-not-call ] first {
{ \ do-not-call [ "do-not-call" ] }
{ 3 [ "three" ] }
} case
] unit-test
[ "do-not-call" ] [
\ do-not-call {
{ \ do-not-call [ "do-not-call" ] }
{ 3 [ "three" ] }
} case
] unit-test
! Interpreted
[ "a hashtable" ] [ H{ } \ case-test-3 def>> call ] unit-test
[ t ] [ { 1 3 2 } contiguous-range? ] unit-test [ t ] [ { 1 3 2 } contiguous-range? ] unit-test
[ f ] [ { 1 2 2 4 } contiguous-range? ] unit-test [ f ] [ { 1 2 2 4 } contiguous-range? ] unit-test
[ f ] [ { + 3 2 } contiguous-range? ] unit-test [ f ] [ { + 3 2 } contiguous-range? ] unit-test
@ -358,33 +244,79 @@ CONSTANT: case-const-2 2
{ \ / [ "divide" ] } { \ / [ "divide" ] }
{ \ ^ [ "power" ] } { \ ^ [ "power" ] }
{ \ [ [ "obama" ] } { \ [ [ "obama" ] }
{ \ ] [ "KFC" ] }
} case ; } case ;
\ test-case-7 def>> must-infer \ test-case-7 def>> must-infer
[ "plus" ] [ \ + test-case-7 ] unit-test [ "plus" ] [ \ + test-case-7 ] unit-test
[ "plus" ] [ \ + \ test-case-7 def>> call ] unit-test
! Some corner cases (no pun intended)
DEFER: corner-case-1 DEFER: corner-case-1
<< \ corner-case-1 2 [ + ] curry 1array [ case ] curry (( a -- b )) define-declared >> << \ corner-case-1 2 [ + ] curry 1array [ case ] curry (( a -- b )) define-declared >>
[ t ] [ \ corner-case-1 optimized? ] unit-test [ t ] [ \ corner-case-1 optimized? ] unit-test
[ 4 ] [ 2 corner-case-1 ] unit-test
[ 4 ] [ 2 2 [ + ] curry 1array case ] unit-test [ 4 ] [ 2 corner-case-1 ] unit-test
[ 4 ] [ 2 \ corner-case-1 def>> call ] unit-test
: test-case-8 ( n -- string ) : test-case-8 ( n -- string )
{ {
{ 1 [ "foo" ] } { 1 [ "foo" ] }
} case ; } case ;
[ 3 test-case-8 ] [ 3 test-case-8 ] [ object>> 3 = ] must-fail-with
[ object>> 3 = ] must-fail-with [ 3 \ test-case-8 def>> call ] [ object>> 3 = ] must-fail-with
[ : test-case-9 ( a -- b )
3 { {
{ 1 [ "foo" ] } { \ + [ "plus" ] }
} case { \ + [ "plus 2" ] }
] [ object>> 3 = ] must-fail-with { \ - [ "minus" ] }
{ \ - [ "minus 2" ] }
} case ;
[ "plus" ] [ \ + test-case-9 ] unit-test
[ "plus" ] [ \ + \ test-case-9 def>> call ] unit-test
[ "minus" ] [ \ - test-case-9 ] unit-test
[ "minus" ] [ \ - \ test-case-9 def>> call ] unit-test
: test-case-10 ( a -- b )
{
{ 1 [ "uno" ] }
{ 2 [ "dos" ] }
{ 2 [ "DOS" ] }
{ 3 [ "tres" ] }
{ 4 [ "cuatro" ] }
{ 5 [ "cinco" ] }
} case ;
[ "dos" ] [ 2 test-case-10 ] unit-test
[ "dos" ] [ 2 \ test-case-10 def>> call ] unit-test
: test-case-11 ( a -- b )
{
{ 11 [ "uno" ] }
{ 22 [ "dos" ] }
{ 22 [ "DOS" ] }
{ 33 [ "tres" ] }
{ 44 [ "cuatro" ] }
{ 55 [ "cinco" ] }
} case ;
[ "dos" ] [ 22 test-case-11 ] unit-test
[ "dos" ] [ 22 \ test-case-11 def>> call ] unit-test
: test-case-12 ( a -- b )
{
{ 11 [ "uno" ] }
{ 22 [ "dos" ] }
[ drop "nachos" ]
{ 33 [ "tres" ] }
{ 44 [ "cuatro" ] }
{ 55 [ "cinco" ] }
} case ;
[ "nachos" ] [ 33 test-case-12 ] unit-test
[ "nachos" ] [ 33 \ test-case-12 def>> call ] unit-test

2
core/combinators/combinators.factor
View File

@ -169,7 +169,7 @@ ERROR: no-case object ;
PRIVATE> PRIVATE>
: case>quot ( default assoc -- quot ) : case>quot ( default assoc -- quot )
dup keys { <reversed> dup keys {
{ [ dup empty? ] [ 2drop ] } { [ dup empty? ] [ 2drop ] }
{ [ dup [ length 4 <= ] [ [ word? ] any? ] bi or ] [ drop linear-case-quot ] } { [ dup [ length 4 <= ] [ [ word? ] any? ] bi or ] [ drop linear-case-quot ] }
{ [ dup contiguous-range? ] [ drop dispatch-case-quot ] } { [ dup contiguous-range? ] [ drop dispatch-case-quot ] }