From 38622ccbec590e4f6b578460e3a4b1649796cc97 Mon Sep 17 00:00:00 2001 From: Bruce Hill Date: Thu, 4 Jul 2024 13:40:09 -0400 Subject: [PATCH] Change metamethod names --- ast.c | 6 +++--- test/metamethods.tm | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ast.c b/ast.c index 2d5d8a8..1592ea0 100644 --- a/ast.c +++ b/ast.c @@ -18,9 +18,9 @@ static const char *OP_NAMES[] = { }; const char *binop_method_names[BINOP_XOR+1] = { - [BINOP_POWER]="__pow", [BINOP_MULT]="__mul", [BINOP_DIVIDE]="__div", - [BINOP_MOD]="__mod", [BINOP_MOD1]="__mod1", [BINOP_PLUS]="__add", [BINOP_MINUS]="__sub", - [BINOP_CONCAT]="__concat", [BINOP_LSHIFT]="__lshift", [BINOP_RSHIFT]="__rshift", + [BINOP_POWER]="__power", [BINOP_MULT]="__multiply", [BINOP_DIVIDE]="__divide", + [BINOP_MOD]="__mod", [BINOP_MOD1]="__mod1", [BINOP_PLUS]="__add", [BINOP_MINUS]="__subtract", + [BINOP_CONCAT]="__concatenate", [BINOP_LSHIFT]="__left_shift", [BINOP_RSHIFT]="__right_shift", [BINOP_AND]="__and", [BINOP_OR]="__or", [BINOP_XOR]="__xor", }; diff --git a/test/metamethods.tm b/test/metamethods.tm index 26a5abd..6a870ee 100644 --- a/test/metamethods.tm +++ b/test/metamethods.tm @@ -2,19 +2,19 @@ struct Vec2(x,y:Int): func __add(a,b:Vec2; inline)->Vec2: return Vec2(a.x+b.x, a.y+b.y) - func __sub(a,b:Vec2; inline)->Vec2: + func __subtract(a,b:Vec2; inline)->Vec2: return Vec2(a.x-b.x, a.y-b.y) - func __mul(a,b:Vec2; inline)->Int: + func __multiply(a,b:Vec2; inline)->Int: return a.x*b.x + a.y*b.y - func __mul2(a:Vec2,b:Int; inline)->Vec2: + func __multiply2(a:Vec2,b:Int; inline)->Vec2: return Vec2(a.x*b, a.y*b) - func __mul3(a:Int,b:Vec2; inline)->Vec2: + func __multiply3(a:Int,b:Vec2; inline)->Vec2: return Vec2(a*b.x, a*b.y) - func __mul4(a,b:Vec2; inline)->Vec2: + func __multiply4(a,b:Vec2; inline)->Vec2: return Vec2(a.x*b.x, a.y*b.y) func __negative(v:Vec2; inline)->Vec2: