git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
Merge pull request #488 from purescript/mkfn
6a7ebd2Phil Freeman
examples/passing/MultiArgFunctions.purs+6−1
compare with golang
unifiedsplit
@@ -11,4 +11,9 @@ main = do
11 runFn3 (mkFn3 $ \a b c -> trace $ show [a, b, c]) 1 2 3
11 runFn3 (mkFn3 $ \a b c -> trace $ show [a, b, c]) 1 2 3
12 runFn4 (mkFn4 $ \a b c d -> trace $ show [a, b, c, d]) 1 2 3 4
12 runFn4 (mkFn4 $ \a b c d -> trace $ show [a, b, c, d]) 1 2 3 4
13 runFn5 (mkFn5 $ \a b c d e -> trace $ show [a, b, c, d, e]) 1 2 3 4 5
13 runFn5 (mkFn5 $ \a b c d e -> trace $ show [a, b, c, d, e]) 1 2 3 4 5
14+ runFn6 (mkFn6 $ \a b c d e f -> trace $ show [a, b, c, d, e, f]) 1 2 3 4 5 6
15+ runFn7 (mkFn7 $ \a b c d e f g -> trace $ show [a, b, c, d, e, f, g]) 1 2 3 4 5 6 7
16+ runFn8 (mkFn8 $ \a b c d e f g h -> trace $ show [a, b, c, d, e, f, g, h]) 1 2 3 4 5 6 7 8
17+ runFn9 (mkFn9 $ \a b c d e f g h i -> trace $ show [a, b, c, d, e, f, g, h, i]) 1 2 3 4 5 6 7 8 9
18+ runFn10 (mkFn10 $ \a b c d e f g h i j-> trace $ show [a, b, c, d, e, f, g, h, i, j]) 1 2 3 4 5 6 7 8 9 10
14− trace "Done!"
19+ trace "Done!"
prelude/prelude.purs+169−24
@@ -490,88 +490,128 @@ module Data.Function where
490 foreign import data Fn3 :: * -> * -> * -> * -> *
490 foreign import data Fn3 :: * -> * -> * -> * -> *
491 foreign import data Fn4 :: * -> * -> * -> * -> * -> *
491 foreign import data Fn4 :: * -> * -> * -> * -> * -> *
492 foreign import data Fn5 :: * -> * -> * -> * -> * -> * -> *
492 foreign import data Fn5 :: * -> * -> * -> * -> * -> * -> *
493+ foreign import data Fn6 :: * -> * -> * -> * -> * -> * -> * -> *
494+ foreign import data Fn7 :: * -> * -> * -> * -> * -> * -> * -> * -> *
495+ foreign import data Fn8 :: * -> * -> * -> * -> * -> * -> * -> * -> * -> *
496+ foreign import data Fn9 :: * -> * -> * -> * -> * -> * -> * -> * -> * -> * -> *
497+ foreign import data Fn10 :: * -> * -> * -> * -> * -> * -> * -> * -> * -> * -> * -> *
493
498
494 foreign import mkFn0
499 foreign import mkFn0
495− "function mkFn0(f) {\
500+ "function mkFn0(fn) {\
496 \ return function() {\
501 \ return function() {\
497− \ return f({});\
502+ \ return fn({});\
498 \ };\
503 \ };\
499 \}" :: forall a. (Unit -> a) -> Fn0 a
504 \}" :: forall a. (Unit -> a) -> Fn0 a
500
505
501 foreign import mkFn1
506 foreign import mkFn1
502− "function mkFn1(f) {\
507+ "function mkFn1(fn) {\
503 \ return function(a) {\
508 \ return function(a) {\
504− \ return f(a);\
509+ \ return fn(a);\
505 \ };\
510 \ };\
506 \}" :: forall a b. (a -> b) -> Fn1 a b
511 \}" :: forall a b. (a -> b) -> Fn1 a b
507
512
508 foreign import mkFn2
513 foreign import mkFn2
509− "function mkFn2(f) {\
514+ "function mkFn2(fn) {\
510 \ return function(a, b) {\
515 \ return function(a, b) {\
511− \ return f(a)(b);\
516+ \ return fn(a)(b);\
512 \ };\
517 \ };\
513 \}" :: forall a b c. (a -> b -> c) -> Fn2 a b c
518 \}" :: forall a b c. (a -> b -> c) -> Fn2 a b c
514
519
515 foreign import mkFn3
520 foreign import mkFn3
516− "function mkFn3(f) {\
521+ "function mkFn3(fn) {\
517 \ return function(a, b, c) {\
522 \ return function(a, b, c) {\
518− \ return f(a)(b)(c);\
523+ \ return fn(a)(b)(c);\
519 \ };\
524 \ };\
520 \}" :: forall a b c d. (a -> b -> c -> d) -> Fn3 a b c d
525 \}" :: forall a b c d. (a -> b -> c -> d) -> Fn3 a b c d
521
526
522 foreign import mkFn4
527 foreign import mkFn4
523− "function mkFn4(f) {\
528+ "function mkFn4(fn) {\
524 \ return function(a, b, c, d) {\
529 \ return function(a, b, c, d) {\
525− \ return f(a)(b)(c)(d);\
530+ \ return fn(a)(b)(c)(d);\
526 \ };\
531 \ };\
527 \}" :: forall a b c d e. (a -> b -> c -> d -> e) -> Fn4 a b c d e
532 \}" :: forall a b c d e. (a -> b -> c -> d -> e) -> Fn4 a b c d e
528
533
529 foreign import mkFn5
534 foreign import mkFn5
530− "function mkFn5(f) {\
535+ "function mkFn5(fn) {\
531 \ return function(a, b, c, d, e) {\
536 \ return function(a, b, c, d, e) {\
532− \ return f(a)(b)(c)(d)(e);\
537+ \ return fn(a)(b)(c)(d)(e);\
533 \ };\
538 \ };\
534 \}" :: forall a b c d e f. (a -> b -> c -> d -> e -> f) -> Fn5 a b c d e f
539 \}" :: forall a b c d e f. (a -> b -> c -> d -> e -> f) -> Fn5 a b c d e f
535
540
541+ foreign import mkFn6
542+ "function mkFn6(fn) {\
543+ \ return function(a, b, c, d, e, f) {\
544+ \ return fn(a)(b)(c)(d)(e)(f);\
545+ \ };\
546+ \}" :: forall a b c d e f g. (a -> b -> c -> d -> e -> f -> g) -> Fn6 a b c d e f g
547+
548+ foreign import mkFn7
549+ "function mkFn7(fn) {\
550+ \ return function(a, b, c, d, e, f, g) {\
551+ \ return fn(a)(b)(c)(d)(e)(f)(g);\
552+ \ };\
553+ \}" :: forall a b c d e f g h. (a -> b -> c -> d -> e -> f -> g -> h) -> Fn7 a b c d e f g h
554+
555+ foreign import mkFn8
556+ "function mkFn8(fn) {\
557+ \ return function(a, b, c, d, e, f, g, h) {\
558+ \ return fn(a)(b)(c)(d)(e)(f)(g)(h);\
559+ \ };\
560+ \}" :: forall a b c d e f g h i. (a -> b -> c -> d -> e -> f -> g -> h -> i) -> Fn8 a b c d e f g h i
561+
562+ foreign import mkFn9
563+ "function mkFn9(fn) {\
564+ \ return function(a, b, c, d, e, f, g, h, i) {\
565+ \ return fn(a)(b)(c)(d)(e)(f)(g)(h)(i);\
566+ \ };\
567+ \}" :: forall a b c d e f g h i j. (a -> b -> c -> d -> e -> f -> g -> h -> i -> j) -> Fn9 a b c d e f g h i j
568+
569+ foreign import mkFn10
570+ "function mkFn10(fn) {\
571+ \ return function(a, b, c, d, e, f, g, h, i, j) {\
572+ \ return fn(a)(b)(c)(d)(e)(f)(g)(h)(i)(j);\
573+ \ };\
574+ \}" :: forall a b c d e f g h i j k. (a -> b -> c -> d -> e -> f -> g -> h -> i -> j -> k) -> Fn10 a b c d e f g h i j k
575+
536 foreign import runFn0
576 foreign import runFn0
537− "function runFn0(f) {\
577+ "function runFn0(fn) {\
538− \ return f();\
578+ \ return fn();\
539 \}" :: forall a. Fn0 a -> a
579 \}" :: forall a. Fn0 a -> a
540
580
541 foreign import runFn1
581 foreign import runFn1
542− "function runFn1(f) {\
582+ "function runFn1(fn) {\
543 \ return function(a) {\
583 \ return function(a) {\
544− \ return f(a);\
584+ \ return fn(a);\
545 \ };\
585 \ };\
546 \}" :: forall a b. Fn1 a b -> a -> b
586 \}" :: forall a b. Fn1 a b -> a -> b
547
587
548 foreign import runFn2
588 foreign import runFn2
549− "function runFn2(f) {\
589+ "function runFn2(fn) {\
550 \ return function(a) {\
590 \ return function(a) {\
551 \ return function(b) {\
591 \ return function(b) {\
552− \ return f(a, b);\
592+ \ return fn(a, b);\
553 \ };\
593 \ };\
554 \ };\
594 \ };\
555 \}" :: forall a b c. Fn2 a b c -> a -> b -> c
595 \}" :: forall a b c. Fn2 a b c -> a -> b -> c
556
596
557 foreign import runFn3
597 foreign import runFn3
558− "function runFn3(f) {\
598+ "function runFn3(fn) {\
559 \ return function(a) {\
599 \ return function(a) {\
560 \ return function(b) {\
600 \ return function(b) {\
561 \ return function(c) {\
601 \ return function(c) {\
562− \ return f(a, b, c);\
602+ \ return fn(a, b, c);\
563 \ };\
603 \ };\
564 \ };\
604 \ };\
565 \ };\
605 \ };\
566 \}" :: forall a b c d. Fn3 a b c d -> a -> b -> c -> d
606 \}" :: forall a b c d. Fn3 a b c d -> a -> b -> c -> d
567
607
568 foreign import runFn4
608 foreign import runFn4
569− "function runFn4(f) {\
609+ "function runFn4(fn) {\
570 \ return function(a) {\
610 \ return function(a) {\
571 \ return function(b) {\
611 \ return function(b) {\
572 \ return function(c) {\
612 \ return function(c) {\
573 \ return function(d) {\
613 \ return function(d) {\
574− \ return f(a, b, c, d);\
614+ \ return fn(a, b, c, d);\
575 \ };\
615 \ };\
576 \ };\
616 \ };\
577 \ };\
617 \ };\
@@ -579,13 +619,13 @@ module Data.Function where
579 \}" :: forall a b c d e. Fn4 a b c d e -> a -> b -> c -> d -> e
619 \}" :: forall a b c d e. Fn4 a b c d e -> a -> b -> c -> d -> e
580
620
581 foreign import runFn5
621 foreign import runFn5
582− "function runFn5(f) {\
622+ "function runFn5(fn) {\
583 \ return function(a) {\
623 \ return function(a) {\
584 \ return function(b) {\
624 \ return function(b) {\
585 \ return function(c) {\
625 \ return function(c) {\
586 \ return function(d) {\
626 \ return function(d) {\
587 \ return function(e) {\
627 \ return function(e) {\
588− \ return f(a, b, c, d, e);\
628+ \ return fn(a, b, c, d, e);\
589 \ };\
629 \ };\
590 \ };\
630 \ };\
591 \ };\
631 \ };\
@@ -593,6 +633,111 @@ module Data.Function where
593 \ };\
633 \ };\
594 \}" :: forall a b c d e f. Fn5 a b c d e f -> a -> b -> c -> d -> e -> f
634 \}" :: forall a b c d e f. Fn5 a b c d e f -> a -> b -> c -> d -> e -> f
595
635
636+ foreign import runFn6
637+ "function runFn6(fn) {\
638+ \ return function(a) {\
639+ \ return function(b) {\
640+ \ return function(c) {\
641+ \ return function(d) {\
642+ \ return function(e) {\
643+ \ return function(f) {\
644+ \ return fn(a, b, c, d, e, f);\
645+ \ };\
646+ \ };\
647+ \ };\
648+ \ };\
649+ \ };\
650+ \ };\
651+ \}" :: forall a b c d e f g. Fn6 a b c d e f g -> a -> b -> c -> d -> e -> f -> g
652+
653+ foreign import runFn7
654+ "function runFn7(fn) {\
655+ \ return function(a) {\
656+ \ return function(b) {\
657+ \ return function(c) {\
658+ \ return function(d) {\
659+ \ return function(e) {\
660+ \ return function(f) {\
661+ \ return function(g) {\
662+ \ return fn(a, b, c, d, e, f, g);\
663+ \ };\
664+ \ };\
665+ \ };\
666+ \ };\
667+ \ };\
668+ \ };\
669+ \ };\
670+ \}" :: forall a b c d e f g h. Fn7 a b c d e f g h -> a -> b -> c -> d -> e -> f -> g -> h
671+
672+ foreign import runFn8
673+ "function runFn8(fn) {\
674+ \ return function(a) {\
675+ \ return function(b) {\
676+ \ return function(c) {\
677+ \ return function(d) {\
678+ \ return function(e) {\
679+ \ return function(f) {\
680+ \ return function(g) {\
681+ \ return function(h) {\
682+ \ return fn(a, b, c, d, e, f, g, h);\
683+ \ };\
684+ \ };\
685+ \ };\
686+ \ };\
687+ \ };\
688+ \ };\
689+ \ };\
690+ \ };\
691+ \}" :: forall a b c d e f g h i. Fn8 a b c d e f g h i -> a -> b -> c -> d -> e -> f -> g -> h -> i
692+
693+ foreign import runFn9
694+ "function runFn9(fn) {\
695+ \ return function(a) {\
696+ \ return function(b) {\
697+ \ return function(c) {\
698+ \ return function(d) {\
699+ \ return function(e) {\
700+ \ return function(f) {\
701+ \ return function(g) {\
702+ \ return function(h) {\
703+ \ return function(i) {\
704+ \ return fn(a, b, c, d, e, f, g, h, i);\
705+ \ };\
706+ \ };\
707+ \ };\
708+ \ };\
709+ \ };\
710+ \ };\
711+ \ };\
712+ \ };\
713+ \ };\
714+ \}" :: forall a b c d e f g h i j. Fn9 a b c d e f g h i j -> a -> b -> c -> d -> e -> f -> g -> h -> i -> j
715+
716+ foreign import runFn10
717+ "function runFn10(fn) {\
718+ \ return function(a) {\
719+ \ return function(b) {\
720+ \ return function(c) {\
721+ \ return function(d) {\
722+ \ return function(e) {\
723+ \ return function(f) {\
724+ \ return function(g) {\
725+ \ return function(h) {\
726+ \ return function(i) {\
727+ \ return function(j) {\
728+ \ return fn(a, b, c, d, e, f, g, h, i, j);\
729+ \ };\
730+ \ };\
731+ \ };\
732+ \ };\
733+ \ };\
734+ \ };\
735+ \ };\
736+ \ };\
737+ \ };\
738+ \ };\
739+ \}" :: forall a b c d e f g h i j k. Fn10 a b c d e f g h i j k -> a -> b -> c -> d -> e -> f -> g -> h -> i -> j -> k
740+
596module Data.Eq where
741module Data.Eq where
597
742
598 data Ref a = Ref a
743 data Ref a = Ref a
src/Language/PureScript/Optimizer/Inliner.hs+2−2
@@ -124,7 +124,7 @@ inlineCommonOperators = applyAll $
124 , binary C.boolLikeBoolean (C.||) Or
124 , binary C.boolLikeBoolean (C.||) Or
125 , unary C.boolLikeBoolean C.not Not
125 , unary C.boolLikeBoolean C.not Not
126 ] ++
126 ] ++
127− [ fn | i <- [0..5], fn <- [ mkFn i, runFn i ] ]
127+ [ fn | i <- [0..10], fn <- [ mkFn i, runFn i ] ]
128 where
128 where
129 binary :: String -> String -> BinaryOperator -> JS -> JS
129 binary :: String -> String -> BinaryOperator -> JS -> JS
130 binary dictName opString op = everywhereOnJS convert
130 binary dictName opString op = everywhereOnJS convert
@@ -170,7 +170,7 @@ inlineCommonOperators = applyAll $
170 Nothing -> orig
170 Nothing -> orig
171 convert other = other
171 convert other = other
172 collectArgs :: Int -> [String] -> JS -> Maybe ([String], [JS])
172 collectArgs :: Int -> [String] -> JS -> Maybe ([String], [JS])
173− collectArgs 1 acc (JSFunction Nothing [oneArg] (JSBlock js)) | length acc == n - 1 = Just (reverse (oneArg : acc), js)
173+ collectArgs 1 acc (JSFunction Nothing [oneArg] (JSBlock js)) | length acc == n - 1 = Just (reverse (oneArg : acc), js)
174 collectArgs m acc (JSFunction Nothing [oneArg] (JSBlock [JSReturn ret])) = collectArgs (m - 1) (oneArg : acc) ret
174 collectArgs m acc (JSFunction Nothing [oneArg] (JSBlock [JSReturn ret])) = collectArgs (m - 1) (oneArg : acc) ret
175 collectArgs _ _ _ = Nothing
175 collectArgs _ _ _ = Nothing
176
176