fabricate

commit ea613a3fd4863c1776c591a98531bc9fc70327d0

Author: PQCraft <0456523@gmail.com>

Progress

 Makefile | 2 
 src/builtins.c | 1 
 src/builtins.h | 6 ++++
 src/crc.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++
 src/crc.h | 12 ++++++++
 src/filesystem.c | 2 
 src/filesystem.h | 10 ++++--
 src/main.c | 18 ++----------
 src/object.c | 1 
 src/object.h | 55 +++++++++++++++++++++++++++++++++++++++
 src/state.c | 44 +++++++++++++++++++++++++++++++
 src/state.h | 69 +++++++++++++++++++++++++++++++++++++++++++++++++


diff --git a/Makefile b/Makefile
index abb5b71cf554a93f30698c4f2ffc902c0ca4050a..add0287e3b02897a230b81b86a2f9cdae19659f7 100644
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,7 @@
 $(BIN): $(OBJECTS) | $(OUTDIR)
 	@echo Linking $@...
 	@$(_LD) $(_LDFLAGS) $^ $(_LDLIBS) -o $@
-	-@cd -- $(OUTDIR) && [ -e fab ] || ln -s -- fabricate fab
+	-@cd -- $(OUTDIR); [ -e fab ] || ln -s -- fabricate fab
 	@echo Linked $@
 
 clean:




diff --git a/src/builtins.c b/src/builtins.c
new file mode 100644
index 0000000000000000000000000000000000000000..237e7205517435f6b75e830d40dbc5fc46c3eb0a
--- /dev/null
+++ b/src/builtins.c
@@ -0,0 +1 @@
+#include "builtins.h"




diff --git a/src/builtins.h b/src/builtins.h
new file mode 100644
index 0000000000000000000000000000000000000000..546342526d9df00fc53e780926be6ec611cadd94
--- /dev/null
+++ b/src/builtins.h
@@ -0,0 +1,6 @@
+#ifndef FAB_BUILTINS_H
+#define FAB_BUILTINS_H
+
+#include "state.h"
+
+#endif




diff --git a/src/crc.c b/src/crc.c
new file mode 100644
index 0000000000000000000000000000000000000000..4fac7f01f14c71aa823a39304793f8979fa8d258
--- /dev/null
+++ b/src/crc.c
@@ -0,0 +1,70 @@
+#include "crc.h"
+
+#include <ctype.h>
+
+static const uint32_t crc32Table[] = {
+	0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
+	0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
+	0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
+	0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
+	0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
+	0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
+	0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
+	0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
+	0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
+	0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
+	0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
+	0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
+	0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
+	0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
+	0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
+	0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
+	0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
+	0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
+	0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
+	0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
+	0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
+	0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
+	0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
+	0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
+	0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
+	0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
+	0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
+	0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
+	0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
+	0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
+	0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
+	0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
+};
+
+uint32_t Crc32(const char* d, size_t l) {
+	uint32_t crc = 0;
+	for (size_t i = 0; i < l; ++i) {
+		crc = crc32Table[(crc ^ ((unsigned char*)d)[i]) & 0xFF] ^ (crc >> 8);
+	}
+	return crc;
+}
+
+uint32_t CaseCrc32(const char* d, size_t l) {
+	uint32_t crc = 0;
+	for (size_t i = 0; i < l; ++i) {
+		char c = tolower(d[i]);
+		crc = crc32Table[(crc ^ c) & 0xFF] ^ (crc >> 8);
+	}
+	return crc;
+}
+
+uint32_t ContCrc32(uint32_t crc, const char* d, size_t l) {
+	for (size_t i = 0; i < l; ++i) {
+		crc = crc32Table[(crc ^ ((unsigned char*)d)[i]) & 0xFF] ^ (crc >> 8);
+	}
+	return crc;
+}
+
+uint32_t ContCaseCrc32(uint32_t crc, const char* d, size_t l) {
+	for (size_t i = 0; i < l; ++i) {
+		char c = tolower(d[i]);
+		crc = crc32Table[(crc ^ c) & 0xFF] ^ (crc >> 8);
+	}
+	return crc;
+}




diff --git a/src/crc.h b/src/crc.h
new file mode 100644
index 0000000000000000000000000000000000000000..f6b0c7933e537644a82c98304a3f6e1e7f9f195b
--- /dev/null
+++ b/src/crc.h
@@ -0,0 +1,12 @@
+#ifndef FAB_CRC_H
+#define FAB_CRC_H
+
+#include <stdint.h>
+#include <stddef.h>
+
+uint32_t Crc32(const char*, size_t);
+uint32_t CaseCrc32(const char*, size_t);
+uint32_t ContCrc32(uint32_t, const char*, size_t);
+uint32_t ContCaseCrc32(uint32_t, const char*, size_t);
+
+#endif




diff --git a/src/filesystem.c b/src/filesystem.c
index 5966d86bf499febe0331e97b137133e19a18b069..5391c482a59652de83dea95ca0d8121427bdd1c5 100644
--- a/src/filesystem.c
+++ b/src/filesystem.c
@@ -1,6 +1,6 @@
 #include "filesystem.h"
 
-FileInfo* Ls(const char* path, size_t* count) {
+FileInfo* Ls(const char* path, const char* wildcard, bool excldDirs, size_t* count) {
 	// TODO
 	return NULL;
 }




diff --git a/src/filesystem.h b/src/filesystem.h
index f11e296748172cad3890fbf65d8ad10303b3cb61..df48e0f5513662cfa85fce880782f573dbb6ade7 100644
--- a/src/filesystem.h
+++ b/src/filesystem.h
@@ -36,14 +36,16 @@
 FileType ProbeFileType(const char* name); // Windows already has GetFileType
 bool ProbeFileInfo(const char* name, FileInfo*);
 
-bool BeginLs(const char*, LsState*);
+bool BeginLs(const char* path, LsState*);
 const FileInfo* ReadLs(LsState*);
 void EndLs(LsState*);
 
-FileInfo* Ls(const char*, size_t* count);
+FileInfo* Ls(const char* path, const char* wildcard, bool excldDirs, size_t* count);
 void FreeLs(FileInfo*);
 
-bool Rm(const char*);
-bool RmDir(const char*);
+bool MkDir(const char* path);
+
+bool Rm(const char* path);
+bool RmDir(const char* path);
 
 #endif




diff --git a/src/main.c b/src/main.c
index 40a8de452041be3badd9f634d15b44e3a6049c74..58cb6ecbe5ff9f5118d07f29411416ed15933f0b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -27,23 +27,13 @@ 	return strcmp(((const FileInfo*)a)->name, ((const FileInfo*)b)->name);
 }
 static int UseFirstFabFile(void) {
 	size_t count;
-	FileInfo* ls = Ls(".", &count);
+	FileInfo* ls = Ls(".", "*.fab", true, &count);
 	if (!ls) {ERR_INT(); return 2;}
-
+	if (!count) {ERR_NOFAB(); return 1;}
 	qsort(ls, count, sizeof(*ls), UseFirstFabFile_Cmp);
-
-	for (size_t i = 0; i < count; ++i) {
-		if (ls[i].type != FILETYPE_DIR && MatchWildcard("*.fab", ls[i].name)) {
-			filename = DupStr(ls[i].name);
-			if (!filename) {ERR_INT(); return 2;}
-			FreeLs(ls);
-			return 0;
-		}
-	}
-
+	filename = DupStr(ls[0].name);
 	FreeLs(ls);
-	ERR_NOFAB();
-	return 1;
+	return 0;
 }
 
 int main(int argc, char** argv) {




diff --git a/src/object.c b/src/object.c
new file mode 100644
index 0000000000000000000000000000000000000000..4d0c57b76d10362d0bf32c607c88d5d4f3282fa2
--- /dev/null
+++ b/src/object.c
@@ -0,0 +1 @@
+#include "object.h"




diff --git a/src/object.h b/src/object.h
new file mode 100644
index 0000000000000000000000000000000000000000..9f9e3399a47262e04267fd852d28c7b2de3c81cc
--- /dev/null
+++ b/src/object.h
@@ -0,0 +1,55 @@
+#ifndef FAB_OBJECT_H
+#define FAB_OBJECT_H
+
+#include "vlb.h"
+
+#include <stdint.h>
+#include <stdbool.h>
+
+typedef unsigned ObjectType;
+enum {
+	OBJECTTYPE_NULL,
+	OBJECTTYPE_STRING,
+	OBJECTTYPE_ARRAY,
+	OBJECTTYPE_COW
+};
+
+typedef struct Object Object;
+typedef union {
+	struct {
+		struct VLB(char) text;
+		unsigned free : 1;
+		unsigned dup : 1;
+	} string;
+	struct VLB(Object) array;
+	struct {
+		Object* obj;
+		size_t off;
+		size_t len;
+	} cow;
+} ObjectData;
+struct Object {
+	ObjectData data;
+	ObjectType type;
+	unsigned refcount;
+	struct VLB(Object*) cow;
+};
+
+typedef unsigned ObjStrStorType;
+enum {
+	OBJSTRSTOR_STATIC, // String is read-only but always available, CoW
+	OBJSTRSTOR_XFER,   // Transfer ownership of string
+	OBJSTRSTOR_DUP     // String will not always be available, dup immediately
+};
+
+Object* NewObject(ObjectType);
+Object* NewObjectFromStr(const char* str, size_t len, ObjStrStorType);
+#define NewObjectFromLitStr(STR) (NewObjectFromStr(("" STR), sizeof(STR) - 1, OBJSTRSTOR_STATIC))
+void DelObject(Object*);
+
+bool SetObject(Object* dest, Object* src);
+bool CatObject(Object* dest, Object* src);
+bool CatStrToObject(Object*, const char* str, size_t len, ObjStrStorType);
+#define CatLitStrToObject(OBJ, STR) (CatStrToObject((OBJ), ("" STR), sizeof(STR) - 1, OBJSTRSTOR_STATIC))
+
+#endif




diff --git a/src/state.c b/src/state.c
new file mode 100644
index 0000000000000000000000000000000000000000..12c994642be74a39d11db824a93d04c7e6032e01
--- /dev/null
+++ b/src/state.c
@@ -0,0 +1,44 @@
+#include "state.h"
+
+static inline void iDelVar(Var* var) {
+	free(var->name);
+	//DelObject(var->obj);
+}
+static inline void iDelFunc(Func* func) {
+	free(func->name);
+	for (size_t i = 0; i < func->stmts.count; ++i) {
+		//DelStmts(func->stmts.data[i]);
+	}
+}
+
+bool InitState(State* state, const State* parent) {
+	VLB_INIT(state->stack, 8, goto emem_1;);
+	state->stack.top = NULL;
+
+	VLB_ZINIT(state->frames);
+	state->frames.cur = NULL;
+
+	state->parent = parent;
+
+	return true;
+
+	emem_1:
+	return false;
+}
+void FreeState(State* state) {
+	for (size_t i = 0; i < state->stack.len; ++i) {
+		//DelObject(state->stack.data[i]);
+	}
+	for (size_t i = 0; i < state->frames.len; ++i) {
+		Frame* frame = &state->frames.data[i];
+		for (size_t j = 0; j < frame->scopes.len; ++j) {
+			Scope* scope = &frame->scopes.data[j];
+			for (size_t k = 0; k < scope->vars.len; ++k) {
+				iDelVar(&scope->vars.data[i]);
+			}
+		}
+	}
+	for (size_t i = 0; i < state->funcs.len; ++i) {
+		iDelFunc(&state->funcs.data[i]);
+	}
+}




diff --git a/src/state.h b/src/state.h
new file mode 100644
index 0000000000000000000000000000000000000000..2a0939331ba32084398f02bb3a7d4090b859d846
--- /dev/null
+++ b/src/state.h
@@ -0,0 +1,69 @@
+#ifndef FAB_STATE_H
+#define FAB_STATE_H
+
+#include "object.h"
+//#include "lexer.h"
+#include "crc.h"
+
+typedef struct {
+	uint32_t namecrc;
+	char* name;
+	Object* obj;
+} Var;
+typedef struct {
+	uint32_t namecrc;
+	char* name;
+	struct {
+		//Statement* data;
+		size_t count;
+	} stmts;
+} Func;
+typedef struct {
+	struct VLB(Var) vars;
+} Scope;
+typedef struct {
+	size_t argv;
+	size_t argc;
+	struct {
+		Scope* cur;
+		Scope* data;
+		size_t len;
+		size_t size;
+	} scopes;
+} Frame;
+typedef struct State State;
+struct State {
+	struct {
+		Object* top;
+		Object** data;
+		size_t len;
+		size_t size;
+	} stack;
+	struct {
+		Frame* cur;
+		Frame* data;
+		size_t len;
+		size_t size;
+	} frames;
+	struct VLB(Func) funcs;
+	const State* parent;
+};
+
+bool InitState(State*, const State* parent);
+void FreeState(State*);
+
+bool PushFrame(State*);
+bool PushArg(State*, Object*);
+bool ExpArg(State*);
+
+bool CallBuiltin(State*, const char* name);
+bool CallUserFunc(State*, const char* name);
+
+Object* GetVar(State*, const char* name);
+bool SetVar(State*, const char* name, Object*);
+void DelVar(State*, const char* name);
+
+//bool SetFunc(State*, const char* name, Statements*, size_t count);
+void DelFunc(State*, const char* name);
+
+#endif