krgamestudios/Toy
1
0
Fork 0
mirror of https://github.com/krgamestudios/Toy.git synced 2026-04-15 23:04:08 +10:00
Code Issues Packages Projects Releases Wiki Activity

Got literal types represented correctly

Browse Source
This commit is contained in:
Kayne Ruse
2022-08-12 11:10:52 +01:00
parent 2f18989f25
commit 998b913fc9
3 changed files with 126 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
source/literal.c
View File

@@ -32,6 +32,9 @@ static void printToBuffer(const char* str) {
globalPrintCount += strlen(str); globalPrintCount += strlen(str);
} }
//BUGFIX: <array | dictionary> is handled oddly for specific reasons, so this flag is for the debug output of the type
bool printTypeMarker = true;
//hash util functions //hash util functions
static unsigned int hashString(const char* string, int length) { static unsigned int hashString(const char* string, int length) {
unsigned int hash = 2166136261u; unsigned int hash = 2166136261u;
@@ -202,12 +205,36 @@ void printLiteralCustom(Literal literal, void (printFn)(const char*)) {
//print the type //print the type
int iterations = 0; int iterations = 0;
printToBuffer("<"); if (printTypeMarker) {
printToBuffer("<");
}
for (int i = 1; i < 8; i ++) { //0th bit is const for (int i = 1; i < 8; i ++) { //0th bit is const
if (AS_TYPE(literal).mask & MASK(i)) { if (AS_TYPE(literal).mask & MASK(i)) {
//pretty print //pretty print
if (iterations++ > 0) { if (iterations++ > 0) {
printToBuffer(","); printToBuffer(" | ");
}
//special case for array & dictionary
if (i == TYPE_ARRAY) {
if ((AS_TYPE(literal).mask & (MASK_ARRAY|MASK_DICTIONARY)) == (MASK_ARRAY|MASK_DICTIONARY)) {
int pCache = printTypeMarker;
printTypeMarker = false;
printLiteralCustom(((Literal*)(AS_TYPE(literal).subtypes))[0], printToBuffer);
printTypeMarker = pCache;
continue;
}
}
if (i == TYPE_DICTIONARY) {
if ((AS_TYPE(literal).mask & (MASK_ARRAY|MASK_DICTIONARY)) == (MASK_ARRAY|MASK_DICTIONARY)) {
int pCache = printTypeMarker;
printTypeMarker = false;
printLiteralCustom(((Literal*)(AS_TYPE(literal).subtypes))[1], printToBuffer);
printTypeMarker = pCache;
continue;
}
} }
switch(i) { switch(i) {
@@ -227,18 +254,34 @@ void printLiteralCustom(Literal literal, void (printFn)(const char*)) {
printToBuffer("string"); printToBuffer("string");
break; break;
case TYPE_ARRAY: case TYPE_ARRAY: {
//print all in the array
printToBuffer("["); printToBuffer("[");
printLiteralCustom(((Literal*)(AS_TYPE(literal).subtypes))[0], printToBuffer); int it = 0;
for (int a = 0; a < AS_TYPE(literal).count; a++) {
if (it++ > 0) {
printToBuffer("] | [");
}
printLiteralCustom(((Literal*)(AS_TYPE(literal).subtypes))[a], printToBuffer);
}
printToBuffer("]"); printToBuffer("]");
}
break; break;
case TYPE_DICTIONARY: case TYPE_DICTIONARY: {
printToBuffer("["); printToBuffer("[");
printLiteralCustom(((Literal*)(AS_TYPE(literal).subtypes))[0], printToBuffer);
printToBuffer(":"); int it = 0;
printLiteralCustom(((Literal*)(AS_TYPE(literal).subtypes))[1], printToBuffer); for (int a = 0; a < AS_TYPE(literal).count; a += 2) {
if (it++ > 0) {
printToBuffer("] | [");
}
printLiteralCustom(((Literal*)(AS_TYPE(literal).subtypes))[a], printToBuffer);
printToBuffer(":");
printLiteralCustom(((Literal*)(AS_TYPE(literal).subtypes))[a + 1], printToBuffer);
}
printToBuffer("]"); printToBuffer("]");
}
break; break;
//TODO: function //TODO: function
@@ -249,11 +292,14 @@ void printLiteralCustom(Literal literal, void (printFn)(const char*)) {
//const (printed last) //const (printed last)
if (AS_TYPE(literal).mask & MASK_CONST) { if (AS_TYPE(literal).mask & MASK_CONST) {
if (iterations++ > 0) { if (iterations++ > 0) {
printToBuffer(","); printToBuffer(" ");
} }
printToBuffer("const"); printToBuffer("const");
} }
printToBuffer(">");
if (printTypeMarker) {
printToBuffer(">");
}
//swap the parent-call buffer back into place //swap the parent-call buffer back into place
char* printBuffer = globalPrintBuffer; char* printBuffer = globalPrintBuffer;
@@ -309,7 +355,7 @@ Literal _toIdentifierLiteral(char* str) {
return ((Literal){LITERAL_IDENTIFIER,{.identifier.ptr = (char*)str,.identifier.length = strlen((char*)str), .identifier.hash=hashString(str, strlen((char*)str))}}); return ((Literal){LITERAL_IDENTIFIER,{.identifier.ptr = (char*)str,.identifier.length = strlen((char*)str), .identifier.hash=hashString(str, strlen((char*)str))}});
} }
void _typePushSubtype(Literal* lit, unsigned char submask) { Literal* _typePushSubtype(Literal* lit, unsigned char submask) {
if (AS_TYPE(*lit).count + 1 > AS_TYPE(*lit).capacity) { if (AS_TYPE(*lit).count + 1 > AS_TYPE(*lit).capacity) {
int oldCapacity = AS_TYPE(*lit).capacity; int oldCapacity = AS_TYPE(*lit).capacity;
@@ -319,6 +365,7 @@ void _typePushSubtype(Literal* lit, unsigned char submask) {
//actually push //actually push
((Literal*)(AS_TYPE(*lit).subtypes))[ AS_TYPE(*lit).count++ ] = TO_TYPE_LITERAL( submask ); ((Literal*)(AS_TYPE(*lit).subtypes))[ AS_TYPE(*lit).count++ ] = TO_TYPE_LITERAL( submask );
return &((Literal*)(AS_TYPE(*lit).subtypes))[ AS_TYPE(*lit).count - 1 ];
} }
char* copyString(char* original, int length) { char* copyString(char* original, int length) {
@@ -399,12 +446,60 @@ bool literalsAreEqual(Literal lhs, Literal rhs) {
if (AS_TYPE(lhs).mask != AS_TYPE(rhs).mask) { if (AS_TYPE(lhs).mask != AS_TYPE(rhs).mask) {
return false; return false;
} }
if (AS_TYPE(lhs).mask & MASK_ARRAY && !literalsAreEqual( ((Literal*)(AS_TYPE(lhs).subtypes))[0], ((Literal*)(AS_TYPE(rhs).subtypes))[0] )) {
if (AS_TYPE(lhs).count != AS_TYPE(rhs).count) {
return false; return false;
} }
if (AS_TYPE(lhs).mask & MASK_DICTIONARY && !literalsAreEqual( ((Literal*)(AS_TYPE(lhs).subtypes))[1], ((Literal*)(AS_TYPE(rhs).subtypes))[1] )) {
return false; //TODO: array & dictionaries (slot 0 is an array collection, slot 1 is a dictionary collection)
if ((AS_TYPE(lhs).mask & (MASK_ARRAY|MASK_DICTIONARY)) == (MASK_ARRAY|MASK_DICTIONARY)) {
//check arrays
if (!literalsAreEqual(((Literal*)(AS_TYPE(lhs).subtypes))[0], ((Literal*)(AS_TYPE(rhs).subtypes))[0])) {
return false;
}
//check dictionaries
if (!literalsAreEqual(((Literal*)(AS_TYPE(lhs).subtypes))[1], ((Literal*)(AS_TYPE(rhs).subtypes))[1])) {
return false;
}
} }
//TODO: arrays (out of order)
if (AS_TYPE(lhs).mask & MASK_ARRAY) {
for (int i = 0; i < AS_TYPE(lhs).count; i++) {
bool match = false;
for (int j = 0; j < AS_TYPE(rhs).count; j++) {
//compare
if (literalsAreEqual( ((Literal*)(AS_TYPE(lhs).subtypes))[i], ((Literal*)(AS_TYPE(rhs).subtypes))[j] )) {
match = true;
break;
}
}
if (!match) {
return false;
}
}
}
//TODO: dictionaries (out of order)
if (AS_TYPE(lhs).mask & MASK_DICTIONARY) {
for (int i = 0; i < AS_TYPE(lhs).count; i += 2) {
bool match = false;
for (int j = 0; j < AS_TYPE(rhs).count; j += 2) {
//compare
if (literalsAreEqual( ((Literal*)(AS_TYPE(lhs).subtypes))[i], ((Literal*)(AS_TYPE(rhs).subtypes))[j] ) && literalsAreEqual( ((Literal*)(AS_TYPE(lhs).subtypes))[i + 1], ((Literal*)(AS_TYPE(rhs).subtypes))[j + 1] )) {
match = true;
break;
}
}
if (!match) {
return false;
}
}
}
return true; return true;
default: default:

4
source/literal.h
View File

@@ -109,13 +109,13 @@ void freeLiteral(Literal literal);
#define STRLEN(lit) ((lit).as.string.length) #define STRLEN(lit) ((lit).as.string.length)
#define STRLEN_I(lit) ((lit).as.identifier.length) #define STRLEN_I(lit) ((lit).as.identifier.length)
#define HASH_I(lit) ((lit).as.identifier.hash) #define HASH_I(lit) ((lit).as.identifier.hash)
#define TYPE_PUSH_SUBTYPE(lit, submask) _typePushSubtype(&(lit), submask) #define TYPE_PUSH_SUBTYPE(lit, submask) _typePushSubtype(lit, submask)
//BUGFIX: macros are not functions //BUGFIX: macros are not functions
bool _isTruthy(Literal x); bool _isTruthy(Literal x);
Literal _toStringLiteral(char* str); Literal _toStringLiteral(char* str);
Literal _toIdentifierLiteral(char* str); Literal _toIdentifierLiteral(char* str);
void _typePushSubtype(Literal* lit, unsigned char submask); Literal* _typePushSubtype(Literal* lit, unsigned char submask);
//utils //utils
char* copyString(char* original, int length); char* copyString(char* original, int length);

41
source/repl_main.c
View File

@@ -249,36 +249,25 @@ int main(int argc, const char* argv[]) {
// repl(); // repl();
// Literal t = TO_TYPE_LITERAL(MASK_INTEGER | MASK_FLOAT | MASK_CONST); //testing the types, improving on them as I go
// printLiteral(t); Literal root = TO_TYPE_LITERAL( MASK_ARRAY | MASK_DICTIONARY );
// printf("\n"); Literal* arr = TYPE_PUSH_SUBTYPE(&root, MASK_ARRAY );
Literal* dict = TYPE_PUSH_SUBTYPE(&root, MASK_DICTIONARY );
// Literal c = TO_TYPE_LITERAL( MASK_ARRAY ); TYPE_PUSH_SUBTYPE(arr, MASK_INTEGER );
// c.as.type.subtypes = ALLOCATE(Literal, 8); TYPE_PUSH_SUBTYPE(arr, MASK_FLOAT );
// ((Literal*)(c.as.type.subtypes))[0] = TO_TYPE_LITERAL( MASK_INTEGER ); TYPE_PUSH_SUBTYPE(arr, MASK_INTEGER | MASK_FLOAT );
// c.as.type.capacity = 8;
// c.as.type.count = 1;
// printLiteral(c);
// printf("\n");
// freeLiteral(c); TYPE_PUSH_SUBTYPE(dict, MASK_STRING | MASK_CONST );
TYPE_PUSH_SUBTYPE(dict, MASK_BOOLEAN );
// Literal d = TO_TYPE_LITERAL( MASK_DICTIONARY ); TYPE_PUSH_SUBTYPE(dict, MASK_STRING | MASK_CONST );
// d.as.type.subtypes = ALLOCATE(Literal, 8); TYPE_PUSH_SUBTYPE(dict, MASK_INTEGER );
// ((Literal*)(d.as.type.subtypes))[0] = TO_TYPE_LITERAL( MASK_STRING );
// ((Literal*)(d.as.type.subtypes))[1] = TO_TYPE_LITERAL( MASK_INTEGER );
// d.as.type.capacity = 8;
// d.as.type.count = 2;
// printLiteral(d);
// printf("\n");
// freeLiteral(d); printLiteral(root);
printf("\n");
Literal e = TO_TYPE_LITERAL( MASK_DICTIONARY | MASK_CONST ); //output: <[int] | [float] | [int | float] | [string const:bool] | [string const:int]>
TYPE_PUSH_SUBTYPE(e, MASK_STRING | MASK_CONST );
TYPE_PUSH_SUBTYPE(e, MASK_INTEGER);
printLiteral(e);
return 0; return 0;
} }