wip

diff --git a/Makefile b/Makefile
index 13dd6df87d3e269c87fe99426188d0f51f64d632..ab7cf9aa357f88aaef4a55ee47abf3d50f025e1d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,7 @@ SLIDES+= borrow-nonmut
 
 SLIDES+= tour-61
 SLIDES+= tour-62
+SLIDES+= tour-63
 
 SLIDES+= bck-lifetimes
 SLIDES+= macros

diff --git a/tour-main.fig b/tour-main.fig
index e2e7bad4a589fe6aef34521d29112185126ad3a6..194c060dcc6a5d83753180f56eece46fea5f0526 100644 (file)
--- a/tour-main.fig
+++ b/tour-main.fig
@@ -17,15 +17,27 @@ Single
         -1530 -1170 450 -1170 450 -540 -1530 -540 -1530 -1170
 2 2 0 2 1 7 62 -1 -1 0.000 0 0 -1 0 0 5
         990 -1170 4050 -1170 4050 -540 990 -540 990 -1170
-2 1 0 2 1 7 62 -1 -1 0.000 0 0 -1 0 0 3
-        990 2700 1620 2880 990 3240
+2 1 0 2 1 7 62 -1 -1 0.000 0 0 -1 0 0 2
+        4140 2250 4770 2250
+2 1 0 2 1 7 63 -1 -1 0.000 0 0 -1 0 0 2
+        3240 2070 4140 1710
 2 5 0 1 0 -1 90 -1 -1 0.000 0 0 -1 0 0 5
        0 tour-example.txt.eps
         -1530 2106 9900 2106 9900 6300 -1530 6300 -1530 2106
 2 1 0 2 1 7 62 -1 -1 0.000 0 0 -1 0 0 3
-        3690 5580 3420 4500 3780 4860
+        990 2700 1620 2880 990 3240
+2 1 0 2 1 7 63 -1 -1 0.000 0 0 -1 0 0 3
+        990 2700 1620 2880 990 3240
+2 2 0 2 12 7 63 -1 -1 0.000 0 0 7 0 0 5
+        990 -540 4050 -540 4050 0 990 0 990 -540
+2 2 0 2 1 7 63 -1 -1 0.000 0 0 7 0 0 5
+        990 90 4500 90 4500 1170 990 1170 990 90
+2 1 0 2 12 7 63 -1 -1 0.000 0 0 -1 0 0 3
+        900 5130 1710 4230 900 5580
 2 1 0 2 1 7 62 -1 -1 0.000 0 0 -1 0 0 2
-        4140 2250 4770 2250
+        3690 5580 3420 4500
+2 1 0 2 1 7 62 -1 -1 0.000 0 0 -1 0 0 2
+        3780 4500 3870 4860
 4 0 0 50 -1 2 30 0.0000 4 435 1335 4860 -720 Safety\001
 4 0 0 50 -1 2 30 0.0000 4 330 795 7650 -720 FFI\001
 4 0 0 50 -1 2 30 0.0000 4 435 1470 -1260 -720 Syntax\001
@@ -35,7 +47,13 @@ Single
 4 0 0 50 -1 2 27 0.0000 4 300 1245 4950 270 escape\001
 4 0 0 50 -1 2 27 0.0000 4 300 1605 7830 270 to C etc.\001
 4 0 0 50 -1 2 27 0.0000 4 390 1350 7830 -180 talking\001
-4 0 1 62 -1 1 27 0.0000 4 405 4500 5040 2340 definition of a struct type\001
-4 0 1 62 -1 1 27 0.0000 4 405 7365 1890 2970 definition of the members and their types\001
 4 0 1 62 -1 1 27 0.0000 4 405 6480 1980 4320 by specifying values of the members\001
+4 0 1 63 -1 1 27 0.0000 4 405 4680 4230 1710 struct type is polymorphic\001
 4 0 1 62 -1 1 27 0.0000 4 405 5100 1710 3870 construction of struct values\001
+4 0 12 63 -1 1 27 0.0000 4 405 5760 2160 4500 compiler infers, eg, Point<f64>\001
+4 0 12 63 -1 1 27 0.0000 4 405 7995 1800 4140 types of i and f not specified by programmer\001
+4 0 1 63 -1 1 27 0.0000 4 300 2430 1890 3330 whatever T is\001
+4 0 1 63 -1 1 27 0.0000 4 405 4050 1800 2880 members are of type T\001
+4 0 1 62 -1 1 27 0.0000 4 405 4500 5040 2340 definition of a struct type\001
+4 0 1 63 -1 1 27 0.0000 4 405 4905 4320 2160 there's Point<T> for any T\001
+4 0 1 62 -1 1 27 0.0000 4 405 7365 1890 2970 definition of the members and their types\001