This repository has been archived by the owner on Jul 30, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path0001-k.patch
4310 lines (3684 loc) · 439 KB
/
0001-k.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
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
From fdf988657c2d32fb41217b4994e00f9c67bd11fc Mon Sep 17 00:00:00 2001
From: € <k>
Date: Sat, 2 Jan 2021 13:37:16 +0200
Subject: [PATCH] k
---
README.md | 13 +++++++++++++
all_needed_data.nim | 2 ++
common_utils.nim | 18 ++++++++++++++++++
constructs/cs_all_constructs.nim | 682 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------------------------------
constructs/justtypes.nim | 29 ++++++++++++++++++++---------
ideal.nim | 50 ++++++++++++++++++++++++++++++++++++++++++--------
parent_finder.nim | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------
tests/samples/biggerAvlTreeTest.cs | 272 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
tests/samples/biggerAvlTreeTest.csast | 1 +
tests/samples/binexp.csast | 213 +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
tests/samples/enums.csast | 2 +-
tests/samples/justClass.csast | 2 +-
tests/samples/many_namespaces.csast | 2 +-
tests/samples/one_namespace.csast | 2 +-
tests/samples/sample1.csast | 2 +-
tests/samples/sample10.csast | 2 +-
tests/samples/sample11.csast | 2 +-
tests/samples/sample12.csast | 2 +-
tests/samples/sample2.csast | 2 +-
tests/samples/sample3.csast | 2 +-
tests/samples/sample4.csast | 2 +-
tests/samples/sample5.csast | 219 +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
tests/samples/sample6.csast | 2 +-
tests/samples/sample7.csast | 2 +-
tests/samples/sample8.csast | 2 +-
tests/samples/sample9.csast | 2 +-
tests/samples/xwtButtonTests.csast | 2 +-
tests/tgen_tests.nim | 21 +++++++++++----------
type_creator.nim | 344 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
type_utils.nim | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
writer.nim | 2 +-
writer_utils.nim | 21 ++++++++++-----------
32 files changed, 1238 insertions(+), 845 deletions(-)
create mode 100644 common_utils.nim
create mode 100644 tests/samples/biggerAvlTreeTest.cs
create mode 100644 tests/samples/biggerAvlTreeTest.csast
create mode 100644 type_utils.nim
diff --git a/README.md b/README.md
index 12d9782..d3fad79 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,19 @@ To ease porting efforts of C# to Nim.
:: type, new, extract, add, gen, unit test.
- namespace
+- enum
+- class (basic)
+ - properties
+ - getters (partial)
+ - setters (partial)
+ - method (basic)
+ - method invocation
+ - assignment
+ - return
+ - ctor (partial)
+ - indexers
+ - object construction
+ - initializer expressions
### next
diff --git a/all_needed_data.nim b/all_needed_data.nim
index d83ba89..1163d5f 100644
--- a/all_needed_data.nim
+++ b/all_needed_data.nim
@@ -59,7 +59,9 @@ proc lastBlockType*(data: AllNeededData;typeStr:string):Option[UUID]=
return some(id)
return none(UUID)
+import common_utils
+import type_utils
proc makeNeededData*(root: var CsRoot; info: Info; src: string; upcoming: seq[string]): AllNeededData =
# echo "in makeNeededData"
result.sourceCode = src
diff --git a/common_utils.nim b/common_utils.nim
new file mode 100644
index 0000000..78173ef
--- /dev/null
+++ b/common_utils.nim
@@ -0,0 +1,18 @@
+# common_utils.nim
+
+
+proc last*[T](s: seq[T]): T =
+ result = s[s.len-1]
+
+proc isEmpty*[T](s: seq[T]): bool =
+ result = (s.len == 0)
+
+import tables
+
+proc pairs[A, B](t: TableRef[A, B]): seq[(A, B)] =
+ for p in pairs(t):
+ result.add p
+
+proc keys[A, B](t: TableRef[A, B]): seq[A] =
+ for k in keys(t):
+ result.add k
diff --git a/constructs/cs_all_constructs.nim b/constructs/cs_all_constructs.nim
index fe20feb..94ec67e 100644
--- a/constructs/cs_all_constructs.nim
+++ b/constructs/cs_all_constructs.nim
@@ -1,3 +1,4 @@
+import ../state_utils
import nre, sequtils, strutils, sets, re, uuids, options, tables, hashes
# {.experimental: "codeReordering".}
import ../types
@@ -40,7 +41,9 @@ method add*(parent: var CsAccessorList; item: CsAccessor) =
# proc add*(parent: var CsAccessorList; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsAccessorList): string = assert false
+proc gen*(c: var CsAccessorList): string =
+ assert false
+ echo "--> in gen*(c: var CsAccessorList)"
# ============= CsAccessor ========
@@ -66,7 +69,9 @@ method add*(parent: var CsAccessor; item: Dummy) =
# proc add*(parent: var CsAccessor; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsAccessor): string = assert false
+proc gen*(c: var CsAccessor): string =
+ assert false
+ echo "--> in gen*(c: var CsAccessor)"
# ============= CsAliasQualifiedName ========
@@ -83,7 +88,9 @@ method add*(parent: var CsAliasQualifiedName; item: Dummy) =
# proc add*(parent: var CsAliasQualifiedName; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsAliasQualifiedName): string = assert false
+proc gen*(c: var CsAliasQualifiedName): string =
+ assert false
+ echo "--> in gen*(c: var CsAliasQualifiedName)"
# ============= CsField ========
@@ -104,9 +111,11 @@ method add*(parent: var CsField; item: Dummy) =
# proc add*(parent: var CsField; item: Dummy; data: AllNeededData) = parent.add(item)
proc gen*(f: CsField): string =
+
+ echo "--> in gen*(f: CsField)"
result = f.name
if f.ispublic: result &= "*"
- result &= ": " & f.ttype
+ result &= ": " & f.thetype
# ============= CsAnonymousMethodExpression ========
@@ -123,7 +132,9 @@ method add*(parent: var CsAnonymousMethodExpression; item: Dummy) =
# proc add*(parent: var CsAnonymousMethodExpression; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsAnonymousMethodExpression): string = assert false
+proc gen*(c: var CsAnonymousMethodExpression): string =
+ assert false
+ echo "--> in gen*(c: var CsAnonymousMethodExpression)"
# ============= CsAnonymousObjectCreationExpression ========
@@ -140,24 +151,27 @@ method add*(parent: var CsAnonymousObjectCreationExpression; item: Dummy) =
# proc add*(parent: var CsAnonymousObjectCreationExpression; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsAnonymousObjectCreationExpression): string = assert false
+proc gen*(c: var CsAnonymousObjectCreationExpression): string =
+ assert false
+ echo "--> in gen*(c: var CsAnonymousObjectCreationExpression)"
# ============= CsAnonymousObjectMemberDeclarator ========
proc newCs*(t: typedesc[CsAnonymousObjectMemberDeclarator]; name: string): CsAnonymousObjectMemberDeclarator =
new result
result.typ = $typeof(t)
-#TODO(create:CsAnonymousObjectMemberDeclarator)
proc extract*(t: typedesc[CsAnonymousObjectMemberDeclarator]; info: Info): CsAnonymousObjectMemberDeclarator = assert false
method add*(parent: var CsAnonymousObjectMemberDeclarator; item: Dummy) =
echo "!!! ---->> unimplemented: method add*(parent: var CsAnonymousObjectMemberDeclarator; item: Dummy) "
if stopEarly: assert false
# proc add*(parent: var CsAnonymousObjectMemberDeclarator; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsAnonymousObjectMemberDeclarator): string = assert false
+proc gen*(c: var CsAnonymousObjectMemberDeclarator): string =
+ assert false
+ echo "--> in gen*(c: var CsAnonymousObjectMemberDeclarator)"
# ============= CsArgumentList ========
@@ -175,6 +189,8 @@ proc replacementGenericTypes (s:string): string =
else: result = s
proc gen*(c: var CsArgumentList): string =
+
+ echo "--> in gen*(c: var CsArgumentList)"
if not c.isNil:
result = c.args.join(", ").replacementGenericTypes()
@@ -191,7 +207,9 @@ proc extract*(t: typedesc[CsArgument]; info: Info): CsArgument =
# proc add*(parent: var CsArgument; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsArgument): string = assert false
+proc gen*(c: var CsArgument): string =
+ assert false
+ echo "--> in gen*(c: var CsArgument)"
# ============= CsArrayCreationExpression ========
@@ -208,7 +226,9 @@ method add*(parent: var CsArrayCreationExpression; item: Dummy) =
# proc add*(parent: var CsArrayCreationExpression; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsArrayCreationExpression): string = assert false
+proc gen*(c: var CsArrayCreationExpression): string =
+ assert false
+ echo "--> in gen*(c: var CsArrayCreationExpression)"
# ============= CsArrayRankSpecifier ========
@@ -225,7 +245,9 @@ method add*(parent: var CsArrayRankSpecifier; item: Dummy) =
# proc add*(parent: var CsArrayRankSpecifier; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsArrayRankSpecifier): string = assert false
+proc gen*(c: var CsArrayRankSpecifier): string =
+ assert false
+ echo "--> in gen*(c: var CsArrayRankSpecifier)"
# ============= CsArrayType ========
@@ -242,7 +264,9 @@ method add*(parent: var CsArrayType; item: Dummy) =
# proc add*(parent: var CsArrayType; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsArrayType): string = assert false
+proc gen*(c: var CsArrayType): string =
+ assert false
+ echo "--> in gen*(c: var CsArrayType)"
# ============= CsArrowExpressionClause ========
@@ -259,15 +283,19 @@ method add*(parent: var CsArrowExpressionClause; item: Dummy) =
# proc add*(parent: var CsArrowExpressionClause; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsArrowExpressionClause): string = assert false
+proc gen*(c: var CsArrowExpressionClause): string =
+ assert false
+ echo "--> in gen*(c: var CsArrowExpressionClause)"
# ============= CsAssignmentExpression ========
# TODO MAJOR TODO: instead of everyone matching bodyexpr and stored as a seq in various body fields, figure out which ones really do, maybe 3 types, then put these expressions in them accordingly.
# then these are just lines, where line is a statement terminating with ';'
# that is, create a more proper inheritence hierarchy. on paper, and code based on short unit tests.
-method gen*(c: CsAssignmentExpression): string = assert false #TODO(gen:CsAssignmentExpression)
+method gen*(c: CsAssignmentExpression): string =
+ assert false #TODO(gen:CsAssignmentExpression)
+ echo "--> in gen*(c: CsAssignmentExpression)"
# ============= CsAttributeArgumentList ========
@@ -284,7 +312,9 @@ method add*(parent: var CsAttributeArgumentList; item: Dummy) =
# proc add*(parent: var CsAttributeArgumentList; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsAttributeArgumentList): string = assert false
+proc gen*(c: var CsAttributeArgumentList): string =
+ assert false
+ echo "--> in gen*(c: var CsAttributeArgumentList)"
# ============= CsAttributeArgument ========
@@ -301,7 +331,9 @@ method add*(parent: var CsAttributeArgument; item: Dummy) =
# proc add*(parent: var CsAttributeArgument; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsAttributeArgument): string = assert false
+proc gen*(c: var CsAttributeArgument): string =
+ assert false
+ echo "--> in gen*(c: var CsAttributeArgument)"
proc newCs*(t: typedesc[CsAttributeList]; name: string): CsAttributeList =
new result
@@ -315,7 +347,9 @@ method add*(parent: var CsAttributeList; item: Dummy) =
if stopEarly: assert false
# proc add*(parent: var CsAttributeList; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsAttributeList): string = assert false
+proc gen*(c: var CsAttributeList): string =
+ assert false
+ echo "--> in gen*(c: var CsAttributeList)"
# ============= CsAttribute ========
@@ -332,7 +366,9 @@ method add*(parent: var CsAttribute; item: Dummy) =
# proc add*(parent: var CsAttribute; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsAttribute): string = assert false
+proc gen*(c: var CsAttribute): string =
+ assert false
+ echo "--> in gen*(c: var CsAttribute)"
# ============= CsAttributeTargetSpecifier ========
@@ -349,7 +385,9 @@ method add*(parent: var CsAttributeTargetSpecifier; item: Dummy) =
# proc add*(parent: var CsAttributeTargetSpecifier; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsAttributeTargetSpecifier): string = assert false
+proc gen*(c: var CsAttributeTargetSpecifier): string =
+ assert false
+ echo "--> in gen*(c: var CsAttributeTargetSpecifier)"
# ============= CsAwaitExpression ========
@@ -366,7 +404,9 @@ method add*(parent: var CsAwaitExpression; item: Dummy) =
# proc add*(parent: var CsAwaitExpression; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsAwaitExpression): string = assert false
+proc gen*(c: var CsAwaitExpression): string =
+ assert false
+ echo "--> in gen*(c: var CsAwaitExpression)"
# ============= CsBaseExpression ========
@@ -383,7 +423,9 @@ method add*(parent: var CsBaseExpression; item: Dummy) =
# proc add*(parent: var CsBaseExpression; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsBaseExpression): string = assert false
+proc gen*(c: var CsBaseExpression): string =
+ assert false
+ echo "--> in gen*(c: var CsBaseExpression)"
# ============= CsBaseList ========
@@ -402,7 +444,9 @@ method add*(parent: var CsBaseList; item: Dummy) =
# proc add*(parent: var CsBaseList; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsBaseList): string = assert false
+proc gen*(c: var CsBaseList): string =
+ assert false
+ echo "--> in gen*(c: var CsBaseList)"
# ============= CsBinaryExpression ========
@@ -425,7 +469,9 @@ method add*(parent: var CsBinaryExpression; item: Dummy) =
if stopEarly: assert false
# proc add*(parent: var CsBinaryExpression; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsBinaryExpression): string = assert false
+proc gen*(c: var CsBinaryExpression): string =
+ assert false
+ echo "--> in gen*(c: var CsBinaryExpression)"
# ============= CsBracketedArgumentList ========
@@ -442,7 +488,9 @@ method add*(parent: var CsBracketedArgumentList; item: Dummy) =
# proc add*(parent: var CsBracketedArgumentList; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsBracketedArgumentList): string = assert false
+proc gen*(c: var CsBracketedArgumentList): string =
+ assert false
+ echo "--> in gen*(c: var CsBracketedArgumentList)"
# ============= CsBracketedParameterList ========
@@ -461,7 +509,9 @@ method add*(parent: var CsBracketedParameterList; item: Dummy) =
# proc add*(parent: var CsBracketedParameterList; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsBracketedParameterList): string = assert false
+proc gen*(c: var CsBracketedParameterList): string =
+ assert false
+ echo "--> in gen*(c: var CsBracketedParameterList)"
# ============= CsBreakStatement ========
@@ -478,7 +528,9 @@ method add*(parent: var CsBreakStatement; item: Dummy) =
# proc add*(parent: var CsBreakStatement; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsBreakStatement): string = assert false
+proc gen*(c: var CsBreakStatement): string =
+ assert false
+ echo "--> in gen*(c: var CsBreakStatement)"
# ============= CsCasePatternSwitchLabel ========
@@ -495,7 +547,9 @@ method add*(parent: var CsCasePatternSwitchLabel; item: Dummy) =
# proc add*(parent: var CsCasePatternSwitchLabel; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsCasePatternSwitchLabel): string = assert false
+proc gen*(c: var CsCasePatternSwitchLabel): string =
+ assert false
+ echo "--> in gen*(c: var CsCasePatternSwitchLabel)"
# ============= CsCaseSwitchLabel ========
@@ -512,7 +566,9 @@ method add*(parent: var CsCaseSwitchLabel; item: Dummy) =
# proc add*(parent: var CsCaseSwitchLabel; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsCaseSwitchLabel): string = assert false
+proc gen*(c: var CsCaseSwitchLabel): string =
+ assert false
+ echo "--> in gen*(c: var CsCaseSwitchLabel)"
# ============= CsCastExpression ========
@@ -529,7 +585,9 @@ method add*(parent: var CsCastExpression; item: Dummy) =
# proc add*(parent: var CsCastExpression; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsCastExpression): string = assert false
+proc gen*(c: var CsCastExpression): string =
+ assert false
+ echo "--> in gen*(c: var CsCastExpression)"
# ============= CsCatchClause ========
@@ -546,7 +604,9 @@ method add*(parent: var CsCatchClause; item: Dummy) =
# proc add*(parent: var CsCatchClause; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsCatchClause): string = assert false
+proc gen*(c: var CsCatchClause): string =
+ assert false
+ echo "--> in gen*(c: var CsCatchClause)"
# ============= CsCatchFilterClause ========
@@ -563,7 +623,9 @@ method add*(parent: var CsCatchFilterClause; item: Dummy) =
# proc add*(parent: var CsCatchFilterClause; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsCatchFilterClause): string = assert false
+proc gen*(c: var CsCatchFilterClause): string =
+ assert false
+ echo "--> in gen*(c: var CsCatchFilterClause)"
# ============= CsCatch ========
@@ -580,7 +642,9 @@ method add*(parent: var CsCatch; item: Dummy) =
# proc add*(parent: var CsCatch; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsCatch): string = assert false
+proc gen*(c: var CsCatch): string =
+ assert false
+ echo "--> in gen*(c: var CsCatch)"
# ============= CsCheckedExpression ========
@@ -597,7 +661,9 @@ method add*(parent: var CsCheckedExpression; item: Dummy) =
# proc add*(parent: var CsCheckedExpression; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsCheckedExpression): string = assert false
+proc gen*(c: var CsCheckedExpression): string =
+ assert false
+ echo "--> in gen*(c: var CsCheckedExpression)"
# ============= CsCheckedStatement ========
@@ -614,31 +680,21 @@ method add*(parent: var CsCheckedStatement; item: Dummy) =
# proc add*(parent: var CsCheckedStatement; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsCheckedStatement): string = assert false
+proc gen*(c: var CsCheckedStatement): string =
+ assert false
+ echo "--> in gen*(c: var CsCheckedStatement)"
method add*(parent:var CsProperty, item:CsAccessorList) =
parent.acclist = item
method add*(parent:var CsMethod, item: CsAssignmentExpression)=
parent.body.add item
-proc `$`*(e:CsEnum):string=
- result = "enum: (name: " & e.name
- result &= "; items: " & $e.items.len
- result &= " )"
method add*(c:var CsIndexer, item: CsAccessorList) =
c.aclist=item
# ============= CsClass ========
-proc `$`*(c:CsClass) :string=
- result = "class: (name: " & c.name
- result &= "; methods: " & $c.methods.len
- result &= "; properties: " & $c.properties.len
- result &= ")"
-
-proc hasIndexer*(c: CsClass): bool = not c.indexer.isNil
-
proc newCs*(t: typedesc[CsClass]; name: string; base = ""; impls: seq[string] = @[]): CsClass =
new result
result.typ = $typeof(t)
@@ -659,22 +715,28 @@ method addSelfParam(m: var CsMethod) =
m.parameterList.parameters.insert(@[p], 0)
proc gen*(p: CsParameter): string =
+
+ echo "--> in gen*(p: CsParameter)"
result = p.name & ": "
if p.isRef:
result &= "var "
result &= p.ptype.strip
proc gen*(p: CsParameterList): string =
+
+ echo "--> in gen*(p: CsParameterList)"
result = p.parameters.mapIt(it.gen()).join("; ")
proc lowerFirst(s:string) : string =
if s.len == 0: return ""
if s.len == 1:
result = "" & s[0].toLowerAscii
if s.len > 1 :
- result = s[0].toLowerAscii & s[1..^1]
+ result = s.lowerFirst()
proc gen*(m: var CsMethod): string =
+
+ echo "--> in gen*(m: var CsMethod)"
echo "generating method (wip): " & m.name
if not m.isStatic: result = "method " else: result = "proc "
if not m.isStatic:
@@ -700,6 +762,8 @@ proc gen*(m: var CsMethod): string =
result &= body
method gen*(c: var CsConstructor): string =
+
+ echo "--> in gen*(c: var CsConstructor)"
echo "generating ctor (wip): (new)" & c.name
result = "proc "
@@ -717,6 +781,8 @@ method gen*(c: var CsConstructor): string =
result &= body
proc gen*(c: var CsIndexer): string =
+
+ echo "--> in gen*(c: var CsIndexer)"
echo "generating indexer"
let x = c.firstVarType.rsplit(".", 1)[^1]
var setPart, getPart : string
@@ -729,29 +795,35 @@ proc gen*(c: var CsIndexer): string =
result &= getPart & "\n" & setPart
proc gen*(c: CsProperty): string =
+ echo "--> in gen*(c: CsProperty)"
result = ""
if c.hasGet:
result &= # this is a getter
- "method " & c.name[0].toLowerAscii & c.name[1..^1] &
+ "method " & c.name.lowerFirst() &
"*(this: " & c.parentClass & "): " & c.retType & " = " &
"this.u_" & c.name
if c.hasSet:
result &=
- "method " & c.name[0].toLowerAscii & c.name[1..^1] &
+ "method " & c.name.lowerFirst &
"*(this: " & c.parentClass & ", value: " & c.retType & "): " & c.retType & " = " &
"this.u_" & c.name & " = value"
+# import ../type_utils
+
+proc hasIndexer*(c: CsClass): bool =
+ result = not c.indexer.isNil
+
proc gen*(c: CsClass): string =
+ echo "--> in gen*(c: CsClass)"
echo "generating class:" & c.name
if c.isNil: result = "" else: result &= "type " & c.name & "* = ref object"
if c.extends != "": result &= " of " & c.extends
result &= "\r\n\r\n"
echo "methods count: " & $c.methods.len
echo "generating methods:"
for m in c.methods.mitems:
-
result &= m.gen()
result &= "\r\n"
echo "ctors count: " & $c.ctors.len
@@ -778,11 +850,26 @@ method add*(parent: var CsClass; m: CsMethod) =
parent.lastAddedTo = some(Methods)
m.parentClass = parent.name
-method add*(parent: var CsClass; item: CsProperty) =
+proc addField(parent:CsClass; name, typ:string) =
+ var f = newCs(CsField)
+ f.name = name
+ f.thetype = typ
+ parent.fields.add f
+
+proc addFieldForProperty(parent:CsClass,item:CsProperty) =
+ let fieldName = "u_" & item.name
+ let fieldType = item.retType
+ parent.addField(fieldName, fieldType)
+
+
+method add*(parent: var CsClass; item: CsProperty) =
parent.properties.add item
parent.lastAddedTo = some(Properties)
item.parentClass = parent.name
+ if (item.hasGet or item.hasSet) and
+ item.bodyGet.len == 0 and item.bodySet.len == 0:
+ parent.addFieldForProperty(item)
# proc add*(parent: var CsClass; item: CsProperty; data: AllNeededData) = parent.add(item) # TODO
method add*(parent: var CsClass; item: CsIndexer) =
@@ -814,7 +901,9 @@ method add*(parent: var CsClassOrStructConstraint; item: Dummy) =
# proc add*(parent: var CsClassOrStructConstraint; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsClassOrStructConstraint): string = assert false
+proc gen*(c: var CsClassOrStructConstraint): string =
+ assert false
+ echo "--> in gen*(c: var CsClassOrStructConstraint)"
# ============= CsConditionalAccessExpression ========
@@ -831,7 +920,9 @@ method add*(parent: var CsConditionalAccessExpression; item: Dummy) =
# proc add*(parent: var CsConditionalAccessExpression; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsConditionalAccessExpression): string = assert false
+proc gen*(c: var CsConditionalAccessExpression): string =
+ assert false
+ echo "--> in gen*(c: var CsConditionalAccessExpression)"
# ============= CsConditionalExpression ========
@@ -848,7 +939,9 @@ method add*(parent: var CsConditionalExpression; item: Dummy) =
# proc add*(parent: var CsConditionalExpression; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsConditionalExpression): string = assert false
+proc gen*(c: var CsConditionalExpression): string =
+ assert false
+ echo "--> in gen*(c: var CsConditionalExpression)"
# ============= CsConstantPattern ========
@@ -865,7 +958,9 @@ method add*(parent: var CsConstantPattern; item: Dummy) =
# proc add*(parent: var CsConstantPattern; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsConstantPattern): string = assert false
+proc gen*(c: var CsConstantPattern): string =
+ assert false
+ echo "--> in gen*(c: var CsConstantPattern)"
# ============= CsConstructorConstraint ========
@@ -882,22 +977,26 @@ method add*(parent: var CsConstructorConstraint; item: Dummy) =
# proc add*(parent: var CsConstructorConstraint; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsConstructorConstraint): string = assert false
+proc gen*(c: var CsConstructorConstraint): string =
+ assert false
+ echo "--> in gen*(c: var CsConstructorConstraint)"
# ============= CsConstructorInitializer ========
-proc newCs*(t: typedesc[CsConstructorInitializer]; name: string): CsConstructorInitializer =
+proc newCs*(t: typedesc[CsConstructorInitializer]): CsConstructorInitializer =
new result
result.typ = $typeof(t)
-#TODO(create:CsConstructorInitializer)
+
proc extract*(t: typedesc[CsConstructorInitializer]; info: Info): CsConstructorInitializer =
echo info
- new result # TODO?
+ result = newCs(CsConstructorInitializer)
# proc add*(parent: var CsConstructorInitializer; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsConstructorInitializer): string = assert false
+proc gen*(c: var CsConstructorInitializer): string =
+ assert false
+ echo "--> in gen*(c: var CsConstructorInitializer)"
# ============= CsConstructor ========
@@ -937,7 +1036,9 @@ method add*(parent: var CsContinueStatement; item: Dummy) =
# proc add*(parent: var CsContinueStatement; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsContinueStatement): string = assert false
+proc gen*(c: var CsContinueStatement): string =
+ assert false
+ echo "--> in gen*(c: var CsContinueStatement)"
# ============= CsConversionOperator ========
@@ -954,7 +1055,9 @@ method add*(parent: var CsConversionOperator; item: Dummy) =
# proc add*(parent: var CsConversionOperator; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsConversionOperator): string = assert false
+proc gen*(c: var CsConversionOperator): string =
+ assert false
+ echo "--> in gen*(c: var CsConversionOperator)"
# ============= CsDeclarationExpression ========
@@ -971,7 +1074,9 @@ method add*(parent: var CsDeclarationExpression; item: Dummy) =
# proc add*(parent: var CsDeclarationExpression; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsDeclarationExpression): string = assert false
+proc gen*(c: var CsDeclarationExpression): string =
+ assert false
+ echo "--> in gen*(c: var CsDeclarationExpression)"
# ============= CsDeclarationPattern ========
@@ -988,7 +1093,9 @@ method add*(parent: var CsDeclarationPattern; item: Dummy) =
# proc add*(parent: var CsDeclarationPattern; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsDeclarationPattern): string = assert false
+proc gen*(c: var CsDeclarationPattern): string =
+ assert false
+ echo "--> in gen*(c: var CsDeclarationPattern)"
# ============= CsDefaultExpression ========
@@ -1005,7 +1112,9 @@ method add*(parent: var CsDefaultExpression; item: Dummy) =
# proc add*(parent: var CsDefaultExpression; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsDefaultExpression): string = assert false
+proc gen*(c: var CsDefaultExpression): string =
+ assert false
+ echo "--> in gen*(c: var CsDefaultExpression)"
# ============= CsDefaultSwitchLabel ========
@@ -1022,7 +1131,9 @@ method add*(parent: var CsDefaultSwitchLabel; item: Dummy) =
# proc add*(parent: var CsDefaultSwitchLabel; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsDefaultSwitchLabel): string = assert false
+proc gen*(c: var CsDefaultSwitchLabel): string =
+ assert false
+ echo "--> in gen*(c: var CsDefaultSwitchLabel)"
# ============= CsDelegate ========
@@ -1039,7 +1150,9 @@ method add*(parent: var CsDelegate; item: Dummy) =
# proc add*(parent: var CsDelegate; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsDelegate): string = assert false
+proc gen*(c: var CsDelegate): string =
+ assert false
+ echo "--> in gen*(c: var CsDelegate)"
# ============= CsDestructor ========
@@ -1056,7 +1169,9 @@ method add*(parent: var CsDestructor; item: Dummy) =
# proc add*(parent: var CsDestructor; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsDestructor): string = assert false
+proc gen*(c: var CsDestructor): string =
+ assert false
+ echo "--> in gen*(c: var CsDestructor)"
# ============= CsDiscardDesignation ========
@@ -1073,7 +1188,9 @@ method add*(parent: var CsDiscardDesignation; item: Dummy) =
# proc add*(parent: var CsDiscardDesignation; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsDiscardDesignation): string = assert false
+proc gen*(c: var CsDiscardDesignation): string =
+ assert false
+ echo "--> in gen*(c: var CsDiscardDesignation)"
# ============= CsDoStatement ========
@@ -1090,7 +1207,9 @@ method add*(parent: var CsDoStatement; item: Dummy) =
# proc add*(parent: var CsDoStatement; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsDoStatement): string = assert false
+proc gen*(c: var CsDoStatement): string =
+ assert false
+ echo "--> in gen*(c: var CsDoStatement)"
# ============= CsElementAccessExpression ========
@@ -1107,7 +1226,9 @@ method add*(parent: var CsElementAccessExpression; item: Dummy) =
# proc add*(parent: var CsElementAccessExpression; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsElementAccessExpression): string = assert false
+proc gen*(c: var CsElementAccessExpression): string =
+ assert false
+ echo "--> in gen*(c: var CsElementAccessExpression)"
# ============= CsElementBindingExpression ========
@@ -1124,7 +1245,9 @@ method add*(parent: var CsElementBindingExpression; item: Dummy) =
# proc add*(parent: var CsElementBindingExpression; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsElementBindingExpression): string = assert false
+proc gen*(c: var CsElementBindingExpression): string =
+ assert false
+ echo "--> in gen*(c: var CsElementBindingExpression)"
# ============= CsElseClause ========
@@ -1141,7 +1264,9 @@ method add*(parent: var CsElseClause; item: Dummy) =
# proc add*(parent: var CsElseClause; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsElseClause): string = assert false
+proc gen*(c: var CsElseClause): string =
+ assert false
+ echo "--> in gen*(c: var CsElseClause)"
# ============= CsEmptyStatement ========
@@ -1158,7 +1283,9 @@ method add*(parent: var CsEmptyStatement; item: Dummy) =
# proc add*(parent: var CsEmptyStatement; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsEmptyStatement): string = assert false
+proc gen*(c: var CsEmptyStatement): string =
+ assert false
+ echo "--> in gen*(c: var CsEmptyStatement)"
proc newCs*(t: typedesc[CsEnumMember]; name, value: auto): CsEnumMember =
new result
@@ -1182,6 +1309,8 @@ method add*(em: CsEnumMember; val: string) =
else: echo "value is already set:`", em.value, "`. got `",val ,"`;"
proc gen*(e: CsEnumMember): string =
+
+ echo "--> in gen*(e: CsEnumMember)"
result = e.name
if e.value != "": result &= " = " & $e.value
@@ -1202,6 +1331,8 @@ method add*(parent: var CsEnum; item: CsEnumMember) =
# proc add*(parent: var CsEnum; item: CsEnumMember; data: AllNeededData) = parent.add(item) # TODO
proc gen*(e: CsEnum): string =
+
+ echo "--> in gen*(e: CsEnum)"
echo "members count:" & $e.items.len
result = "type " & e.name & "* = enum"
@@ -1232,7 +1363,9 @@ method add*(parent: var CsEqualsValueClause; item: Dummy) =
# proc add*(parent: var CsEqualsValueClause; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsEqualsValueClause): string = assert false
+proc gen*(c: var CsEqualsValueClause): string =
+ assert false
+ echo "--> in gen*(c: var CsEqualsValueClause)"
# ============= CsEventField ========
@@ -1249,7 +1382,9 @@ method add*(parent: var CsEventField; item: Dummy) =
# proc add*(parent: var CsEventField; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsEventField): string = assert false
+proc gen*(c: var CsEventField): string =
+ assert false
+ echo "--> in gen*(c: var CsEventField)"
# ============= CsEvent ========
@@ -1266,7 +1401,9 @@ method add*(parent: var CsEvent; item: Dummy) =
# proc add*(parent: var CsEvent; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsEvent): string = assert false
+proc gen*(c: var CsEvent): string =
+ assert false
+ echo "--> in gen*(c: var CsEvent)"
# ============= CsExplicitInterfaceSpecifier ========
@@ -1322,30 +1459,40 @@ method add*(parent: var CsExpressionStatement; item: CsInvocationExpression) =
# proc add*(parent: var CsExpressionStatement; item: CsInvocationExpression; data: AllNeededData) = parent.add(item) # TODO
method gen*(c: CsExpressionStatement): string =
+
+ echo "--> in gen*(c: CsExpressionStatement)"
echo "generating for expression statement"
+ echo "source is: " & c.src.strip()
+ assert not c.call.isNil
result = c.call.gen() & "("
if c.args.args.len > 0:
result &= c.args.gen()
result &= ")"
if c.call.callName.contains(".") and c.call.callName.startsWith(re.re"[A-Z]"):
result &= " # " & c.call.callName.rsplit(".",1)[0]
+ echo "expression statement generated result: " & result
# ============= CsExternAliasDirective ========
proc newCs*(t: typedesc[CsExternAliasDirective]; name: string): CsExternAliasDirective =
new result
result.typ = $typeof(t)
#TODO(create:CsExternAliasDirective)
-proc extract*(t: typedesc[CsExternAliasDirective]; info: Info): CsExternAliasDirective = assert false
+proc extract*(t: typedesc[CsExternAliasDirective]; info: Info): CsExternAliasDirective =
+ echo info
+ let name = "" # info.essentials[0] # TODO!! cs environ got messed up after last extension update. after fixing, add name to info
+ result = newCs(t,name) # rare, it's a name for the dll when ns+class ambiguity occurs, should be in Namespace i think.
method add*(parent: var CsExternAliasDirective; item: Dummy) =
echo "!!! ---->> unimplemented: method add*(parent: var CsExternAliasDirective; item: Dummy) "
if stopEarly: assert false
# proc add*(parent: var CsExternAliasDirective; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsExternAliasDirective): string = assert false
+proc gen*(c: var CsExternAliasDirective): string =
+ assert false
+ echo "--> in gen*(c: var CsExternAliasDirective)"
# hmm, it's actually called a property.
# ============= CsFinallyClause ========
@@ -1363,7 +1510,9 @@ method add*(parent: var CsFinallyClause; item: Dummy) =
# proc add*(parent: var CsFinallyClause; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsFinallyClause): string = assert false
+proc gen*(c: var CsFinallyClause): string =
+ assert false
+ echo "--> in gen*(c: var CsFinallyClause)"
# ============= CsFixedStatement ========
@@ -1380,7 +1529,9 @@ method add*(parent: var CsFixedStatement; item: Dummy) =
# proc add*(parent: var CsFixedStatement; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsFixedStatement): string = assert false
+proc gen*(c: var CsFixedStatement): string =
+ assert false
+ echo "--> in gen*(c: var CsFixedStatement)"
# ============= CsForEachStatement ========
@@ -1397,7 +1548,9 @@ method add*(parent: var CsForEachStatement; item: Dummy) =
# proc add*(parent: var CsForEachStatement; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsForEachStatement): string = assert false
+proc gen*(c: var CsForEachStatement): string =
+ assert false
+ echo "--> in gen*(c: var CsForEachStatement)"
# ============= CsForEachVariableStatement ========
@@ -1414,7 +1567,9 @@ method add*(parent: var CsForEachVariableStatement; item: Dummy) =
# proc add*(parent: var CsForEachVariableStatement; item: Dummy; data: AllNeededData) = parent.add(item)
-proc gen*(c: var CsForEachVariableStatement): string = assert false
+proc gen*(c: var CsForEachVariableStatement): string =