From ef96f57ce264c8e0bd98f6e8622d1c1e2eceafb2 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Sun, 15 Nov 2015 00:37:29 -0800 Subject: 2441 - never miss any specializations I was failing to specialize calls containing literals. And then I had to deal with whether literals should map to numbers or characters. (Answer: both.) One of the issues that still remains: shape-shifting recipes can't be called with literals for addresses, even if it's 0. --- 021check_instruction.cc | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to '021check_instruction.cc') diff --git a/021check_instruction.cc b/021check_instruction.cc index 1d831369..fc1f0a1f 100644 --- a/021check_instruction.cc +++ b/021check_instruction.cc @@ -81,11 +81,18 @@ bool types_match(reagent lhs, reagent rhs) { if (is_raw(rhs)) return true; // allow writing 0 to any address if (rhs.name == "0" && is_mu_address(lhs)) return true; - if (is_literal(rhs)) return !is_mu_array(lhs) && !is_mu_address(lhs) && size_of(rhs) == size_of(lhs); + if (is_literal(rhs)) return valid_type_for_literal(lhs) && size_of(rhs) == size_of(lhs); if (!lhs.type) return !rhs.type; return types_match(lhs.type, rhs.type); } +bool valid_type_for_literal(const reagent& r) { + if (is_mu_array(r)) return false; + if (is_mu_address(r)) return false; + // End valid_type_for_literal Special-cases + return true; +} + // two types match if the second begins like the first // (trees perform the same check recursively on each subtree) bool types_match(type_tree* lhs, type_tree* rhs) { @@ -95,6 +102,8 @@ bool types_match(type_tree* lhs, type_tree* rhs) { if (lhs->value == get(Type_ordinal, "address")) return false; return size_of(rhs) == size_of(lhs); } + if (lhs->value == get(Type_ordinal, "character") && rhs->value == get(Type_ordinal, "number")) return true; + if (lhs->value == get(Type_ordinal, "number") && rhs->value == get(Type_ordinal, "character")) return true; if (lhs->value != rhs->value) return false; return types_match(lhs->left, rhs->left) && types_match(lhs->right, rhs->right); } -- cgit 1.4.1-2-gfad0
path: root/html/309stream.subx.html
blob: e950cd8e97789fe3cfb5453669f080fafc483ef1 (plain) (tree) 
9cbd4199 ^




























































68df24fa ^



























































































































































9cbd4199 ^




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




























































                                                                                                                                                     


























































































































































                                                                                                                                                                                                                                                                             



                                     
r  Kartik K. Agaram <vc@akkartik.com>  2016-10-19 22:10:35 -0700
committer  Kartik K. Agaram <vc@akkartik.com>  2016-10-19 22:10:35 -0700

3522' href='/akkartik/mu/commit/023boolean.cc?h=main&id=6c96a437cef5140197660a0903309f11c364bf78'>6c96a437 ^

ce9b2b05 ^

0487a30e ^

827898fc ^

98f7918b ^



88be3dbc ^

1ead3562 ^

dd660682 ^


d52406cc ^

98f7918b ^

57699011 ^

98f7918b ^

051c4738 ^

1ead3562 ^

dd660682 ^

0487a30e ^




1ead3562 ^

dd660682 ^

0487a30e ^



051c4738 ^

1ead3562 ^

dd660682 ^

0487a30e ^



1848b18f ^


98f7918b ^

795f5244 ^

e236973b ^

4e49b29e ^

6c96a437 ^

4e49b29e ^

9dcbec39 ^

4e49b29e ^



bff0fa45 ^

2b250717 ^

bff0fa45 ^



9dcbec39 ^

bff0fa45 ^


4e49b29e ^


98f7918b ^


0487a30e ^

6c96a437 ^

ce9b2b05 ^

0487a30e ^

827898fc ^

98f7918b ^



88be3dbc ^

1ead3562 ^

dd660682 ^


d52406cc ^

98f7918b ^

57699011 ^

d7e11237 ^

051c4738 ^

1ead3562 ^

dd660682 ^

0487a30e ^




1ead3562 ^

dd660682 ^

0487a30e ^



051c4738 ^

1ead3562 ^

dd660682 ^

0487a30e ^



1848b18f ^


d7e11237 ^

795f5244 ^

e236973b ^

4e49b29e ^

67a180e3 ^

2b250717 ^

4e49b29e ^


6c96a437 ^

ce9b2b05 ^


4e49b29e ^



6c96a437 ^

bff0fa45 ^


9dcbec39 ^

bff0fa45 ^



4e49b29e ^


d7e11237 ^


e4630643 ^

6c96a437 ^

ce9b2b05 ^

0487a30e ^

d7e11237 ^



88be3dbc ^

1ead3562 ^

dd660682 ^

d52406cc ^

d7e11237 ^

57699011 ^

0487a30e ^


1ead3562 ^

dd660682 ^

0487a30e ^




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