summary refs log tree commit diff stats
path: root/compiler
diff options
context:
space:
mode:
authorAraq <rumpf_a@web.de>2013-05-27 23:18:38 +0200
committerAraq <rumpf_a@web.de>2013-05-27 23:18:38 +0200
commit0662ec4a434f4656b5afc486bc4ebaab82c52da6 (patch)
treed523f18a63b849bd24b241c73abd803d5d5e1859 /compiler
parente3f93241c3824e49b69c647bbd44726a79e8f8f8 (diff)
downloadNim-0662ec4a434f4656b5afc486bc4ebaab82c52da6.tar.gz
Revert "static and default params for generics"
This reverts commit 46813bbe4e1423181521d4792b9af7593f48fa1f.
Diffstat (limited to 'compiler')
-rw-r--r--compiler/ast.nim2
-rw-r--r--compiler/semstmts.nim3
-rw-r--r--compiler/semtypes.nim129
-rw-r--r--compiler/sigmatch.nim19
4 files changed, 61 insertions, 92 deletions
diff --git a/compiler/ast.nim b/compiler/ast.nim
index 174c3f94b..e35bf25ef 100644
--- a/compiler/ast.nim
+++ b/compiler/ast.nim
@@ -674,8 +674,6 @@ type
                               # for record types a nkRecord node
                               # for enum types a list of symbols
                               # for tyInt it can be the int literal
-                              # for procs and tyGenericBody, it's the
-                              # formal param list
                               # else: unused
     destructor*: PSym         # destructor. warning: nil here may not necessary
                               # mean that there is no destructor.
diff --git a/compiler/semstmts.nim b/compiler/semstmts.nim
index 9ae8aaca6..b63c20548 100644
--- a/compiler/semstmts.nim
+++ b/compiler/semstmts.nim
@@ -710,8 +710,7 @@ proc typeSectionRightSidePass(c: PContext, n: PNode) =
       #   TGObj[T] = object
       #   TAlias[T] = TGObj[T]
       # 
-      s.typ.n = semGenericParamList(c, a.sons[1], s.typ)
-      a.sons[1] = s.typ.n
+      a.sons[1] = semGenericParamList(c, a.sons[1], s.typ)
       s.typ.size = -1 # could not be computed properly
       # we fill it out later. For magic generics like 'seq', it won't be filled
       # so we use tyEmpty instead of nil to not crash for strange conversions
diff --git a/compiler/semtypes.nim b/compiler/semtypes.nim
index 351794435..c975abb26 100644
--- a/compiler/semtypes.nim
+++ b/compiler/semtypes.nim
@@ -794,44 +794,29 @@ proc semGenericParamInInvokation(c: PContext, n: PNode): PType =
 
 proc semGeneric(c: PContext, n: PNode, s: PSym, prev: PType): PType = 
   result = newOrPrevType(tyGenericInvokation, prev, c)
-  addSonSkipIntLit(result, s.typ)
-  
-  template addToResult(typ) =
-    if typ.isNil:
-      InternalAssert false
-      rawAddSon(result, typ)
-    else: addSonSkipIntLit(result, typ)
-
+  var isConcrete = true
   if s.typ == nil:
     LocalError(n.info, errCannotInstantiateX, s.name.s)
     return newOrPrevType(tyError, prev, c)
-  elif s.typ.kind == tyForward:
-    for i in countup(1, sonsLen(n)-1):
-      var elem = semGenericParamInInvokation(c, n.sons[i])
-      addToResult(elem)
-  else:
-    internalAssert s.typ.kind == tyGenericBody
-
-    var m = newCandidate(s, n)
-    matches(c, n, copyTree(n), m)
-    
-    if m.state != csMatch:
-      LocalError(n.info, errWrongNumberOfArguments)
-      return newOrPrevType(tyError, prev, c)
-
-    var isConcrete = true
-  
-    for i in 1 .. <m.call.len:
-      let typ = m.call[i].typ.skipTypes({tyTypeDesc})
-      if containsGenericType(typ): isConcrete = false
-      addToResult(typ)
-    
-    if isConcrete:
-      if s.ast == nil:
-        LocalError(n.info, errCannotInstantiateX, s.name.s)
-        result = newOrPrevType(tyError, prev, c)
-      else:
-        result = instGenericContainer(c, n, result)
+  elif s.typ.kind != tyGenericBody:
+    isConcrete = false
+  elif sonsLen(n) != sonsLen(s.typ): 
+    LocalError(n.info, errWrongNumberOfArguments)
+    return newOrPrevType(tyError, prev, c)
+  addSonSkipIntLit(result, s.typ)
+  # iterate over arguments:
+  for i in countup(1, sonsLen(n)-1):
+    var elem = semGenericParamInInvokation(c, n.sons[i])
+    if containsGenericType(elem): isConcrete = false
+    #if elem.kind in {tyGenericParam, tyGenericInvokation}: isConcrete = false
+    if elem.isNil: rawAddSon(result, elem)
+    else: addSonSkipIntLit(result, elem)
+  if isConcrete:
+    if s.ast == nil: 
+      LocalError(n.info, errCannotInstantiateX, s.name.s)
+      result = newOrPrevType(tyError, prev, c)
+    else:
+      result = instGenericContainer(c, n, result)
 
 proc semTypeExpr(c: PContext, n: PNode): PType =
   var n = semExprWithType(c, n, {efDetermineType})
@@ -1033,61 +1018,57 @@ proc processMagicType(c: PContext, m: PSym) =
   of mPNimrodNode: nil
   else: LocalError(m.info, errTypeExpected)
   
-proc semGenericConstraints(c: PContext, x: PType): PType =
+proc semGenericConstraints(c: PContext, n: PNode, result: PType) = 
+  var x = semTypeNode(c, n, nil)
   if x.kind in StructuralEquivTypes and (
       sonsLen(x) == 0 or x.sons[0].kind in {tyGenericParam, tyEmpty}):
-    result = newConstraint(c, x.kind)
-  else:
-    result = newTypeWithSons(c, tyGenericParam, @[x])
+    x = newConstraint(c, x.kind)
+  result.addSonSkipIntLit(x)
 
 proc semGenericParamList(c: PContext, n: PNode, father: PType = nil): PNode = 
   result = copyNode(n)
   if n.kind != nkGenericParams: 
     illFormedAst(n)
     return
-  for i in countup(0, sonsLen(n)-1):
+  var position = 0
+  for i in countup(0, sonsLen(n)-1): 
     var a = n.sons[i]
     if a.kind != nkIdentDefs: illFormedAst(n)
-    let L = a.len
-    var def = a{-1}
-    let constraint = a{-2}
+    var L = sonsLen(a)
+    var def = a.sons[L-1]
     var typ: PType
-    
-    if constraint.kind != nkEmpty:
-      typ = semTypeNode(c, constraint, nil)
-      if typ.kind != tyExpr or typ.len == 0:
-        if typ.len == 0 and typ.kind == tyTypeDesc:
-          typ = newTypeS(tyGenericParam, c)
-        else:
-          typ = semGenericConstraints(c, typ)
-    
-    if def.kind != nkEmpty:
-      def = semConstExpr(c, def)
+    if a.sons[L-2].kind != nkEmpty: 
+      typ = newTypeS(tyGenericParam, c)
+      semGenericConstraints(c, a.sons[L-2], typ)
+      if sonsLen(typ) == 1 and typ.sons[0].kind == tyTypeDesc:
+        typ = typ.sons[0]
+    elif def.kind != nkEmpty: typ = newTypeS(tyExpr, c)
+    else: typ = nil
+    for j in countup(0, L-3): 
+      var s: PSym
       if typ == nil:
-        if def.typ.kind != tyTypeDesc:
-          typ = newTypeWithSons(c, tyExpr, @[def.typ])
+        s = newSymG(skType, a.sons[j], c)
+        s.typ = newTypeS(tyGenericParam, c)
       else:
-        if not containsGenericType(def.typ):
-          def = fitNode(c, typ, def)
-    
-    if typ == nil:
-      typ = newTypeS(tyGenericParam, c)
-    
-    for j in countup(0, L-3):
-      let finalType = if j == 0: typ
-                      else: copyType(typ, typ.owner, false)
-                      # it's important the we create an unique
-                      # type for each generic param. the index
-                      # of the parameter will be stored in the
-                      # attached symbol.
-      var s = case finalType.kind
+        case typ.kind
+        of tyTypeDesc: 
+          s = newSymG(skType, a.sons[j], c)
+          s.typ = newTypeS(tyGenericParam, c)
         of tyExpr:
-          newSymG(skGenericParam, a.sons[j], c).linkTo(finalType)
+          #echo "GENERIC EXPR ", a.info.toFileLineCol
+          # not a type param, but an expression
+          # proc foo[x: expr](bar: int) what is this?
+          s = newSymG(skGenericParam, a.sons[j], c)
+          s.typ = typ
         else:
-          newSymG(skType, a.sons[j], c).linkTo(finalType)
+          # This handles cases like proc foo[t: tuple] 
+          # XXX: we want to turn that into a type class
+          s = newSymG(skType, a.sons[j], c)
+          s.typ = typ
       if def.kind != nkEmpty: s.ast = def
+      s.typ.sym = s
       if father != nil: addSonSkipIntLit(father, s.typ)
-      s.position = result.len
+      s.position = position
+      inc position
       addSon(result, newSymNode(s))
       if sfGenSym notin s.flags: addDecl(c, s)
-
diff --git a/compiler/sigmatch.nim b/compiler/sigmatch.nim
index 048067a44..4ca3e9d43 100644
--- a/compiler/sigmatch.nim
+++ b/compiler/sigmatch.nim
@@ -84,9 +84,6 @@ proc initCandidate*(c: var TCandidate, callee: PSym, binding: PNode,
       #debug(formalTypeParam)
       put(c.bindings, formalTypeParam, binding[i].typ)
 
-proc newCandidate*(callee: PSym, binding: PNode, calleeScope = -1): TCandidate =
-  initCandidate(result, callee, binding, calleeScope)
-
 proc copyCandidate(a: var TCandidate, b: TCandidate) = 
   a.exactMatches = b.exactMatches
   a.subtypeMatches = b.subtypeMatches
@@ -864,22 +861,16 @@ proc matchesAux(c: PContext, n, nOrig: PNode,
       else:
         m.state = csNoMatch
         return
-
-  var
-    # iterates over formal parameters
-    f = if m.callee.kind != tyGenericBody: 1
-        else: 0
-    # iterates over the actual given arguments
-    a = 1
-
-  m.state = csMatch # until proven otherwise
+  
+  var f = 1 # iterates over formal parameters
+  var a = 1 # iterates over the actual given arguments
+  m.state = csMatch           # until proven otherwise
   m.call = newNodeI(n.kind, n.info)
   m.call.typ = base(m.callee) # may be nil
-  var formalLen = m.callee.n.len
+  var formalLen = sonsLen(m.callee.n)
   addSon(m.call, copyTree(n.sons[0]))
   var container: PNode = nil # constructed container
   var formal: PSym = nil
-
   while a < n.len:
     if n.sons[a].kind == nkExprEqExpr:
       # named param
21 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067