Small fixes to stackmac.
catseye
12 years ago
| 703 | 703 |
The `+` operator is not string concatenation. `concat` is.
|
| 704 | 704 |
|
| 705 | 705 |
| fun main() {
|
| 706 | |
| "hello " + "world"
|
| 707 | |
| }
|
| 708 | |
? type mismatch
|
| 709 | |
|
| 710 | |
| fun main() {
|
| 711 | |
| concat("hello ", "world")
|
| 712 | |
| }
|
| 713 | |
= 'hello world'
|
|
706 |
| print("hello " + "world")
|
|
707 |
| }
|
|
708 |
? type mismatch
|
|
709 |
|
|
710 |
| fun main() {
|
|
711 |
| print(concat("hello ", "world"))
|
|
712 |
| }
|
|
713 |
= hello world
|
| 714 | 714 |
|
| 715 | 715 |
The builtin toplevels are functions and functions need parens.
|
| 716 | 716 |
|
| 11 | 11 |
|
| 12 | 12 |
Builtins: `int`, `str`, `chr`, `ord`.
|
| 13 | 13 |
|
|
14 |
Tests for empty structs. Demo of "typed enum" (union of empty structs.)
|
|
15 |
|
| 14 | 16 |
### Implementation ###
|
|
17 |
|
|
18 |
TaggedValue -> just a tuple.
|
|
19 |
|
|
20 |
stackmac: store tagged values as two values on the stack.
|
|
21 |
and void types in unions of (void, X) should only be one value.
|
|
22 |
(structs are still boxed though)
|
| 15 | 23 |
|
| 16 | 24 |
AST nodes should have source line numbers, it would be really nice.
|
| 17 | 25 |
|
| 49 | 49 |
a = strings[stack.pop()]
|
| 50 | 50 |
strings.append(builtin(a, b))
|
| 51 | 51 |
stack.append(len(strings) - 1)
|
| 52 | |
elif name == 'concat':
|
| 53 | |
b = strings[stack.pop()]
|
|
52 |
elif name == 'len':
|
| 54 | 53 |
a = strings[stack.pop()]
|
| 55 | |
strings.append(builtin(a, b))
|
| 56 | |
stack.append(len(strings) - 1)
|
|
54 |
strings.append(builtin(a))
|
| 57 | 55 |
elif name == 'substr':
|
| 58 | 56 |
k = stack.pop()
|
| 59 | 57 |
p = stack.pop()
|
|
| 62 | 60 |
stack.append(len(strings) - 1)
|
| 63 | 61 |
else:
|
| 64 | 62 |
raise NotImplementedError(name)
|
| 65 | |
if type.return_type != Void():
|
| 66 | |
stack.append(result)
|
| 67 | 63 |
elif op == 'rts':
|
| 68 | 64 |
ip = callstack.pop()
|
| 69 | 65 |
elif op == 'mul':
|
|
| 141 | 137 |
elif op == 'get_field':
|
| 142 | 138 |
obj = stack.pop()
|
| 143 | 139 |
stack.append(obj[arg])
|
|
140 |
elif op == 'get_tag':
|
|
141 |
stack.append(stack[-1].tag)
|
| 144 | 142 |
elif op.startswith('builtin_'):
|
| 145 | 143 |
(builtin, type) = BUILTINS[op[8:]]
|
| 146 | 144 |
stack.append((op[8:], builtin, type))
|