Skip to content

Commit 11a0f42

Browse files
committed
fix + 0.12.1
1 parent 328502c commit 11a0f42

File tree

7 files changed

+18
-18
lines changed

7 files changed

+18
-18
lines changed

source/app.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import callisto.backends.rm86;
1818
import callisto.backends.arm64;
1919
import callisto.backends.x86_64;
2020

21-
const static string appVersion = "Beta 0.12.0";
21+
const static string appVersion = "Beta 0.12.1";
2222

2323
const static string usage = "
2424
Callisto Compiler

source/backends/arm64.d

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,22 +80,22 @@ class BackendARM64 : CompilerBackend {
8080
NewConst("Array.length", 0);
8181
NewConst("Array.memberSize", 8);
8282
NewConst("Array.elements", 16);
83-
NewConst("Array.sizeof", 8 * 3);
83+
NewConst("Array.sizeOf", 8 * 3);
8484

8585
types ~= Type("Exception", 24 + 8, true, [
8686
StructEntry(UsedType(GetType("bool"), false), "error"),
8787
StructEntry(UsedType(GetType("Array"), false), "msg")
8888
]);
8989
NewConst("Exception.bool", 0);
9090
NewConst("Exception.msg", 8);
91-
NewConst("Exception.sizeof", 24 + 8);
91+
NewConst("Exception.sizeOf", 24 + 8);
9292

9393
globals ~= Global(
9494
"_cal_exception", UsedType(GetType("Exception"), false), false, 0
9595
);
9696

9797
foreach (ref type ; types) {
98-
NewConst(format("%s.sizeof", type.name), cast(long) type.size);
98+
NewConst(format("%s.sizeOf", type.name), cast(long) type.size);
9999
}
100100
}
101101

source/backends/lua.d

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,18 @@ class BackendLua : CompilerBackend {
6565
NewConst("Array.length", 0);
6666
NewConst("Array.memberSize", 1);
6767
NewConst("Array.elements", 2);
68-
NewConst("Array.sizeof", 3);
68+
NewConst("Array.sizeOf", 3);
6969

7070
types ~= Type("Exception", 3 + 1, true, [
7171
StructEntry(UsedType(GetType("bool"), false), "error"),
7272
StructEntry(UsedType(GetType("Array"), false), "msg")
7373
]);
7474
NewConst("Exception.bool", 0);
7575
NewConst("Exception.msg", 1);
76-
NewConst("Exception.sizeof", 3 + 1);
76+
NewConst("Exception.sizeOf", 3 + 1);
7777

7878
foreach (ref type ; types) {
79-
NewConst(format("%s.sizeof", type.name), cast(long) type.size);
79+
NewConst(format("%s.sizeOf", type.name), cast(long) type.size);
8080
}
8181

8282
globals ~= Global(

source/backends/rm86.d

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,18 @@ class BackendRM86 : CompilerBackend {
5555
NewConst("Array.length", 0);
5656
NewConst("Array.memberSize", 2);
5757
NewConst("Array.elements", 4);
58-
NewConst("Array.sizeof", 2 * 3);
58+
NewConst("Array.sizeOf", 2 * 3);
5959

6060
types ~= Type("Exception", 6 + 2, true, [
6161
StructEntry(UsedType(GetType("bool"), false), "error"),
6262
StructEntry(UsedType(GetType("Array"), false), "msg")
6363
]);
6464
NewConst("Exception.bool", 0);
6565
NewConst("Exception.msg", 2);
66-
NewConst("Exception.sizeof", 6 + 2);
66+
NewConst("Exception.sizeOf", 6 + 2);
6767

6868
foreach (ref type ; types) {
69-
NewConst(format("%s.sizeof", type.name), cast(long) type.size);
69+
NewConst(format("%s.sizeOf", type.name), cast(long) type.size);
7070
}
7171

7272
globals ~= Global(

source/backends/uxn.d

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,18 @@ class BackendUXN : CompilerBackend {
4949
NewConst("Array.length", 0);
5050
NewConst("Array.memberSize", 2);
5151
NewConst("Array.elements", 4);
52-
NewConst("Array.sizeof", 2 * 3);
52+
NewConst("Array.sizeOf", 2 * 3);
5353

5454
types ~= Type("Exception", 6 + 2, true, [
5555
StructEntry(UsedType(GetType("bool"), false), "error"),
5656
StructEntry(UsedType(GetType("Array"), false), "msg")
5757
]);
5858
NewConst("Exception.bool", 0);
5959
NewConst("Exception.msg", 2);
60-
NewConst("Exception.sizeof", 6 + 2);
60+
NewConst("Exception.sizeOf", 6 + 2);
6161

6262
foreach (ref type ; types) {
63-
NewConst(format("%s.sizeof", type.name), cast(long) type.size);
63+
NewConst(format("%s.sizeOf", type.name), cast(long) type.size);
6464
}
6565

6666
globals ~= Global(

source/backends/x86_64.d

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,18 +82,18 @@ class BackendX86_64 : CompilerBackend {
8282
NewConst("Array.length", 0);
8383
NewConst("Array.memberSize", 8);
8484
NewConst("Array.elements", 16);
85-
NewConst("Array.sizeof", 8 * 3);
85+
NewConst("Array.sizeOf", 8 * 3);
8686

8787
types ~= Type("Exception", 24 + 8, true, [
8888
StructEntry(UsedType(GetType("bool"), false), "error"),
8989
StructEntry(UsedType(GetType("Array"), false), "msg")
9090
]);
9191
NewConst("Exception.error", 0);
9292
NewConst("Exception.msg", 8);
93-
NewConst("Exception.sizeof", 24 + 8);
93+
NewConst("Exception.sizeOf", 24 + 8);
9494

9595
foreach (ref type ; types) {
96-
NewConst(format("%s.sizeof", type.name), cast(long) type.size);
96+
NewConst(format("%s.sizeOf", type.name), cast(long) type.size);
9797
}
9898

9999
globals ~= Global(

source/compiler.d

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ class CompilerBackend {
233233
}
234234

235235
types ~= Type(node.name, maxSize);
236-
NewConst(format("%s.sizeof", node.name), cast(long) maxSize);
236+
NewConst(format("%s.sizeOf", node.name), cast(long) maxSize);
237237
}
238238

239239
void CompileAlias(AliasNode node) {
@@ -248,7 +248,7 @@ class CompilerBackend {
248248
baseType.name = node.to;
249249
types ~= baseType;
250250

251-
NewConst(format("%s.sizeof", node.to), cast(long) GetType(node.to).size);
251+
NewConst(format("%s.sizeOf", node.to), cast(long) GetType(node.to).size);
252252
}
253253

254254
final void Error(Char, A...)(ErrorInfo error, in Char[] fmt, A args) {

0 commit comments

Comments
 (0)