cozis/Noja
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added sum types

Browse Source
This commit is contained in:
cozis
2022-12-05 11:36:19 +01:00
parent 7a07a1eb3c
commit ea428fdca2
13 changed files with 206 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/builtins/basic.c
+4 -3
View File
@@ -306,10 +306,9 @@ static int bin_istypeof(Runtime *runtime, Object **argv, unsigned int argc, Obje
UNUSED(runtime);
ASSERT(argc == 2);
bool yes = Object_IsTypeOf(argv[0], argv[1]);
Heap *heap = Runtime_GetHeap(runtime);
bool yes = Object_IsTypeOf(argv[0], argv[1], heap, error);
Object *o_yes = Object_FromBool(yes, heap, error);
if (o_yes == NULL)
return -1;
@@ -331,6 +330,7 @@ void bins_basic_init(StaticMapSlot slots[])
slots[8].as_type = Object_GetFileType();
slots[9].as_type = Object_GetDirType();
slots[10].as_type = Object_GetNullableType();
slots[11].as_type = Object_GetSumType();
}
StaticMapSlot bins_basic[] = {
@@ -345,6 +345,7 @@ StaticMapSlot bins_basic[] = {
{ TYPENAME_FILE, SM_TYPE, .as_type = NULL /* Until bins_basic_init is called */ },
{ TYPENAME_DIRECTORY, SM_TYPE, .as_type = NULL /* Until bins_basic_init is called */ },
{ TYPENAME_NULLABLE, SM_TYPE, .as_type = NULL },
{ TYPENAME_SUM, SM_TYPE, .as_type = NULL },
{ "math", SM_SMAP, .as_smap = bins_math, },
{ "files", SM_SMAP, .as_smap = bins_files, },
src/lib/common/defs.h
+2 -1
View File
@@ -14,4 +14,5 @@
#define TYPENAME_FILE "File"
#define TYPENAME_DIRECTORY "Directory"
#define TYPENAME_NULLABLE "NullableType"
#define TYPENAME_NULLABLE "NullableType"
#define TYPENAME_SUM "SumType"
src/lib/common/executable.c
+1
View File
@@ -83,6 +83,7 @@ static const InstrInfo instr_table[] = {
[OPCODE_LEQ] = {"LEQ", 0, NULL},
[OPCODE_GEQ] = {"GEQ", 0, NULL},
[OPCODE_NLB] = {"NLB", 0, NULL},
[OPCODE_STP] = {"STP", 0, NULL},
[OPCODE_ASS] = {"ASS", 1, (OperandType[]) {OPTP_STRING}},
[OPCODE_POP] = {"POP", 1, (OperandType[]) {OPTP_INT}},
[OPCODE_CALL] = {"CALL", 2, (OperandType[]) {OPTP_INT, OPTP_INT}},
src/lib/common/executable.h
+1
View File
@@ -68,6 +68,7 @@ typedef enum {
OPCODE_LEQ,
OPCODE_GEQ,
OPCODE_NLB,
OPCODE_STP,
OPCODE_ASS,
OPCODE_POP,
OPCODE_CALL,
src/lib/compiler/codegen.c
+2
View File
@@ -175,6 +175,7 @@ static Opcode exprkind_to_opcode(ExprKind kind)
switch(kind)
{
case EXPR_NULLABLETYPE: return OPCODE_NLB;
case EXPR_SUMTYPE: return OPCODE_STP;
case EXPR_NOT: return OPCODE_NOT;
case EXPR_POS: return OPCODE_POS;
case EXPR_NEG: return OPCODE_NEG;
@@ -483,6 +484,7 @@ static void emitInstrForExprNode(CodegenContext *ctx, ExprNode *expr,
return; // For the compiler warning.
case EXPR_NULLABLETYPE:
case EXPR_SUMTYPE:
case EXPR_NOT:
case EXPR_POS: case EXPR_NEG:
case EXPR_ADD: case EXPR_SUB:
src/lib/compiler/parse.c
+16 -9
View File
@@ -76,6 +76,7 @@ typedef enum {
TGRT = '>',
TASS = '=',
TSMT = '|',
TLBRK = '(',
TRBRK = ')',
@@ -144,7 +145,7 @@ static inline _Bool isoper(char c)
c == '*' || c == '/' ||
c == '<' || c == '>' ||
c == '!' || c == '=' ||
c == ',';
c == ',' || c == '|';
}
/* Symbol: tokenize
@@ -326,6 +327,7 @@ static Token *tokenize(Source *src, BPAlloc *alloc, Error *error)
{ TGEQ, 2, ">=" },
{ TASS, 1, "=" },
{ TCOMMA, 1, "," },
{ TSMT, 1, "|" },
};
_Bool found = 0;
@@ -1600,7 +1602,8 @@ static inline _Bool isbinop(Token *tok)
tok->kind == TLEQ || tok->kind == TGEQ ||
tok->kind == TEQL || tok->kind == TNQL ||
tok->kind == TKWAND || tok->kind == TKWOR ||
tok->kind == '=' || tok->kind == ',';
tok->kind == '=' || tok->kind == ',' ||
tok->kind == '|';
}
static inline _Bool isrightassoc(Token *tok)
@@ -1619,31 +1622,34 @@ static inline int precedenceof(Token *tok)
case '=':
return 0;
case TKWOR:
case '|':
return 1;
case TKWAND:
case TKWOR:
return 2;
case TKWAND:
return 3;
case '<':
case '>':
case TLEQ:
case TGEQ:
case TEQL:
case TNQL:
return 3;
return 4;
case '+':
case '-':
return 4;
return 5;
case '*':
case '/':
return 5;
case ',':
return 6;
case ',':
return 7;
default:
return -100000000;
}
@@ -1710,6 +1716,7 @@ static Node *parse_expression_2(Context *ctx, Node *left_expr, int min_prec, _Bo
case TKWAND: temp->base.kind = EXPR_AND; break;
case TKWOR: temp->base.kind = EXPR_OR; break;
case '=': temp->base.kind = EXPR_ASS; break;
case '|': temp->base.kind = EXPR_SUMTYPE; break;
case ',': temp->base.kind = EXPR_PAIR; break;
default:
src/lib/objects/o_list.c
+30
View File
@@ -47,6 +47,7 @@ static void walk(Object *self, void (*callback)(Object **referer, void *userp
static void walkexts(Object *self, void (*callback)(void **referer, unsigned int size, void *userp), void *userp);
static Object *copy(Object *self, Heap *heap, Error *err);
static int hash(Object *self);
static bool istypeof(Object *self, Object *other, Heap *heap, Error *error);
static TypeObject t_list = {
.base = (Object) { .type = &t_type, .flags = Object_STATIC },
@@ -58,10 +59,39 @@ static TypeObject t_list = {
.insert = insert,
.count = count,
.print = print,
.istypeof = istypeof,
.walk = walk,
.walkexts = walkexts,
};
static bool
istypeof(Object *self,
Object *other,
Heap *heap,
Error *error)
{
ListObject *list = (ListObject*) self;
if (!Object_IsList(other))
return false;
for (int i = 0; i < list->count; i++) {
Object *key = Object_FromInt(i, heap, error);
if (key == NULL)
return false;
Object *val = list->vals[i];
Object *val2 = Object_Select(other, key, heap, error);
if (val2 == NULL)
return false;
if (!Object_IsTypeOf(val, val2, heap, error))
return false;
}
return true;
}
static int hash(Object *self)
{
ASSERT(self != NULL);
src/lib/objects/o_map.c
+27
View File
@@ -48,6 +48,7 @@ static void walk(Object *self, void (*callback)(Object **referer, void *userp),
static void walkexts(Object *self, void (*callback)(void **referer, unsigned int size, void *userp), void *userp);
static Object *copy(Object *self, Heap *heap, Error *err);
static int hash(Object *self);
static bool istypeof(Object *self, Object *other, Heap *heap, Error *error);
static TypeObject t_map = {
.base = (Object) { .type = &t_type, .flags = Object_STATIC },
@@ -59,10 +60,36 @@ static TypeObject t_map = {
.insert = insert,
.count = count,
.print = print,
.istypeof = istypeof,
.walk = walk,
.walkexts = walkexts,
};
static bool
istypeof(Object *self,
Object *other,
Heap *heap,
Error *error)
{
MapObject *map = (MapObject*) self;
if (!Object_IsMap(other))
return false;
for (int i = 0; i < map->count; i++) {
Object *key = map->keys[i];
Object *val = map->vals[i];
Object *val2 = Object_Select(other, key, heap, error);
if (val2 == NULL)
return false;
if (!Object_IsTypeOf(val, val2, heap, error))
return false;
}
return true;
}
static inline int calc_capacity(int mapper_size)
{
return mapper_size * 2.0 / 3.0;
src/lib/objects/o_nullable.c
+6 -4
View File
@@ -2,7 +2,7 @@
#include "objects.h"
static void walk(Object *self, void (*callback)(Object **referer, void *userp), void *userp);
static bool istypeof(Object *self, Object *other);
static bool istypeof(Object *self, Object *other, Heap *heap, Error *error);
typedef struct {
Object base;
@@ -47,16 +47,18 @@ Object *Object_NewNullable(Object *item, Heap *heap, Error *error)
static bool
istypeof(Object *self,
Object *other)
Object *other,
Heap *heap,
Error *error)
{
NullableObject *nullable = (NullableObject*) self;
if (Object_IsNone(other))
return true;
return Object_IsTypeOf(nullable->item, other);
return Object_IsTypeOf(nullable->item, other, heap, error);
}
static void walk(Object *self, void (*callback)(Object **referer, void *userp), void *userp)
{
NullableObject *nullable = (NullableObject*) self;
callback(&nullable->item, userp);
}
}
src/lib/objects/o_sum.c
+66
View File
@@ -0,0 +1,66 @@
#include "../common/defs.h"
#include "objects.h"
static void walk(Object *self, void (*callback)(Object **referer, void *userp), void *userp);
static bool istypeof(Object *self, Object *other, Heap *heap, Error *error);
typedef struct {
Object base;
Object *items[2];
} SumObject;
static TypeObject t_sum = {
.base = (Object) { .type = &t_type, .flags = Object_STATIC },
.name = TYPENAME_SUM,
.size = sizeof(SumObject),
.init = NULL,
.free = NULL,
.hash = NULL,
.copy = NULL,
.call = NULL,
.print = NULL,
.select = NULL,
.delete = NULL,
.insert = NULL,
.count = NULL,
.istypeof = istypeof,
.op_eql = NULL,
.walk = walk,
.walkexts = NULL,
};
TypeObject *Object_GetSumType()
{
return &t_sum;
}
Object *Object_NewSum(Object *item0, Object *item1, Heap *heap, Error *error)
{
SumObject *sum = (SumObject*) Heap_Malloc(heap, &t_sum, error);
if (sum != NULL) {
sum->items[0] = item0;
sum->items[1] = item1;
}
return (Object*) sum;
}
static bool
istypeof(Object *self,
Object *other,
Heap *heap,
Error *error)
{
SumObject *sum = (SumObject*) self;
return Object_IsTypeOf(sum->items[0], other, heap, error)
|| Object_IsTypeOf(sum->items[1], other, heap, error);
}
static void walk(Object *self, void (*callback)(Object **referer, void *userp), void *userp)
{
SumObject *sum = (SumObject*) self;
callback(sum->items + 0, userp);
callback(sum->items + 1, userp);
}
src/lib/objects/objects.c
+20 -5
View File
@@ -33,7 +33,7 @@
#include "../common/defs.h"
static _Bool op_eql(Object *self, Object *other);
static bool istypeof(Object *self, Object *other);
static bool istypeof(Object *self, Object *other, Heap *heap, Error *error);
TypeObject t_type = {
.base = (Object) { .type = &t_type, .flags = Object_STATIC },
@@ -43,8 +43,10 @@ TypeObject t_type = {
.op_eql = op_eql,
};
static bool istypeof(Object *self, Object *other)
static bool istypeof(Object *self, Object *other, Heap *heap, Error *error)
{
UNUSED(heap);
UNUSED(error);
return other->type == (TypeObject*) self;
}
@@ -78,11 +80,14 @@ const TypeObject *Object_GetType(const Object *obj)
return obj->type;
}
bool Object_IsTypeOf(Object *typ, Object *obj)
bool Object_IsTypeOf(Object *typ,
Object *obj,
Heap *heap,
Error *error)
{
if (typ->type->istypeof == NULL)
return false;
return typ->type->istypeof(typ, obj);
return typ->type->istypeof(typ, obj, heap, error);
}
int Object_Hash(Object *obj)
@@ -230,6 +235,16 @@ _Bool Object_IsString(Object *obj)
return Object_GetType(obj) == Object_GetStringType();
}
bool Object_IsMap(Object *obj)
{
return Object_GetType(obj) == Object_GetMapType();
}
bool Object_IsList(Object *obj)
{
return Object_GetType(obj) == Object_GetListType();
}
_Bool Object_Compare(Object *obj1, Object *obj2, Error *error)
{
ASSERT(obj1 != NULL);
@@ -260,4 +275,4 @@ void Object_WalkExtensions(Object *parent, void (*callback)(void **referer, unsi
ASSERT(parent != NULL);
if(parent->type->walkexts != NULL)
parent->type->walkexts(parent, callback, userp);
}
}
src/lib/objects/objects.h
+6 -2
View File
@@ -73,7 +73,7 @@ struct TypeObject {
int (*count)(Object *self);
// Types.
bool (*istypeof)(Object *self, Object *other);
bool (*istypeof)(Object *self, Object *other, Heap *heap, Error *error);
bool (*op_eql)(Object *self, Object *other);
void (*walk) (Object *self, void (*callback)(Object **referer, void *userp), void *userp);
@@ -103,7 +103,7 @@ int Object_Hash (Object *obj);
Object* Object_Copy (Object *obj, Heap *heap, Error *err);
int Object_Call (Object *obj, Object **argv, unsigned int argc, Object *rets[static MAX_RETS], Heap *heap, Error *err);
void Object_Print(Object *obj, FILE *fp);
bool Object_IsTypeOf(Object *typ, Object *obj);
bool Object_IsTypeOf(Object *typ, Object *obj, Heap *heap, Error *error);
Object* Object_Select(Object *coll, Object *key, Heap *heap, Error *err);
Object* Object_Delete(Object *coll, Object *key, Heap *heap, Error *err);
bool Object_Insert(Object *coll, Object *key, Object *val, Heap *heap, Error *err);
@@ -119,6 +119,7 @@ Object* Object_NewBuffer(size_t size, Heap *heap, Error *error);
Object* Object_NewClosure(Object *parent, Object *new_map, Heap *heap, Error *error);
Object* Object_SliceBuffer(Object *obj, size_t offset, size_t length, Heap *heap, Error *error);
Object* Object_NewNullable(Object *item, Heap *heap, Error *error);
Object* Object_NewSum(Object *item0, Object *item1, Heap *heap, Error *error);
Object* Object_FromInt (long long int val, Heap *heap, Error *error);
Object* Object_FromBool (bool val, Heap *heap, Error *error);
@@ -139,6 +140,7 @@ TypeObject *Object_GetBufferType();
TypeObject *Object_GetFileType();
TypeObject *Object_GetDirType();
TypeObject *Object_GetNullableType();
TypeObject *Object_GetSumType();
bool Object_IsNone(Object *obj);
bool Object_IsInt(Object *obj);
@@ -148,6 +150,8 @@ bool Object_IsString(Object *obj);
bool Object_IsBuffer(Object *obj);
bool Object_IsFile(Object *obj);
bool Object_IsDir(Object *obj);
bool Object_IsMap(Object *obj);
bool Object_IsList(Object *obj);
long long int Object_GetInt (Object *obj);
bool Object_GetBool (Object *obj);
src/lib/runtime/runtime.c
+25 -1
View File
@@ -667,7 +667,7 @@ static _Bool step(Runtime *runtime, Error *error)
if(!Runtime_Pop(runtime, error, 1))
return 0;
ASSERT(top != NULL);
Object *nullable = Object_NewNullable(top, runtime->heap, error);
@@ -679,6 +679,30 @@ static _Bool step(Runtime *runtime, Error *error)
return 1;
}
case OPCODE_STP:
{
ASSERT(opc == 0);
Object *rop = Stack_Top(runtime->stack, 0);
Object *lop = Stack_Top(runtime->stack, -1);
if(!Runtime_Pop(runtime, error, 2))
return 0;
// We managed to pop rop and lop,
// so we know they're not NULL.
ASSERT(rop != NULL);
ASSERT(lop != NULL);
Object *res = Object_NewSum(lop, rop, runtime->heap, error);
if(res == NULL)
return 0;
if(!Runtime_Push(runtime, error, res))
return 0;
return 1;
}
case OPCODE_ADD:
case OPCODE_SUB:
case OPCODE_MUL: