Nested bootstrap, continuation test, cosmetic

jasonnyberg · jasonnyberg · commit 608c84147cb8 · 2022-03-27T17:07:57.000-04:00
diff --git a/bootstrap.edict b/bootstrap.edict
@@ -1,54 +1,56 @@
-[
-]@newline
+ROOT <
+    [
+    ]@newline
 
-[LTV_concat!]@concat
+    [LTV_concat!]@concat
 
-[compile_ltv(@code jit_edict code)]@compile
-[[a b c] compile compile!!! stack!]@test_compile
+    [compile_ltv(@code jit_edict code)]@compile
+    [[a b c] compile compile!!! stack!]@test.compile
 
-[vm_try(cif_preview_module!)]@preview
-[vm_try(cif_import_module())]@import
-[[preview(lib) import(lib) lib](@lib)]@loadlib
+    [vm_try(cif_preview_module!)]@preview
+    [vm_try(cif_import_module())]@import
+    [[preview(lib) import(lib) lib](@lib)]@loadlib
 
-[loadlib([../test/build/libtestlib.so]) @test test.y.1 stack!]@testimport
-[loadlib([../../htm/build/libhtmlib.so]) @htm htm.htm_main(int! '((char)*)*'!)]@testimport2
-[loadlib([../../htm/build/libhtmlib.so]) <htm_main(int! '((char)*)*'!)>]@testimport3
+    [loadlib([../test/build/libtestlib.so]) @test test.y.1 stack!]@test.import1
+    [loadlib([../../htm/build/libhtmlib.so]) @htm htm.htm_main(int! '((char)*)*'!)]@test.import2
+    [loadlib([../../htm/build/libhtmlib.so]) <htm_main(int! '((char)*)*'!)>]@test.import3
 
-[bench encaps! vm_while! | locals!]@fastbench
-[bench [dup! ! loop!]@loop loop! | locals!]@midbench
+    [bench encaps! vm_while! | locals!]@fastbench
+    [bench [dup! ! loop!]@loop loop! | locals!]@midbench
 
-[a b int_add! a@ limit int_nequal! slowloop!]@slowloop
-[int! @limit limit@ int! 0@ @a int! 1@ @b slowloop! | locals!]@slowbench
+    [a b int_add! a@ limit int_nequal! slowloop!]@slowloop
+    [int! @limit limit@ int! 0@ @a int! 1@ @b slowloop! | locals!]@slowbench
 
-[encaps! <RETURN>@]@return_tos
+    [encaps! <RETURN>@]@return_tos
+    [ROOT<ARG0 decaps! stack! ! return_tos!>]@std.thunk
 
-[square(3)]@square3
-[vm_eval(ROOT [ROOT<ARG0 decaps! stack! ! encaps! <RETURN>@] [square(3)]) stack!]@async_test1
+    [square(3)]@square3
+    [minus(1)]@decrement
 
-[vm_eval(ROOT [ROOT<ARG0 decaps! stack! ! encaps! <RETURN>@] [square3!]) stack!]@async_test2 [fails, can't inherit parent dict]/
+    [vm_eval(ROOT std.thunk [square(3)]) stack!]@test.async1
+    [vm_eval(ROOT std.thunk [square3!]) stack!]@test.async2
 
-[ROOT<ARG0 decaps! stack! ! encaps! <RETURN>@]@std_thunk
-[vm_eval(ROOT std_thunk [square3!]) stack!]@async_test3 [fails, can't inherit parent dict]/
+    [[]<@thunk @root @sig encaps(vm_continuation(encaps(sig) root thunk))>/]@continuation
+    [[]<@continuation @arg vm_async(continuation arg)@thread>]@async
+    [<vm_await(thread)>/]@await
 
-[[]<@thunk @root @sig encaps(vm_continuation(encaps(sig) root thunk))>/]@continuation
-[[]<@continuation @arg vm_async(continuation arg)@thread>]@async
-[<vm_await(thread)>/]@await
+    [await(async([square(3)] continuation('(LTV)*(*)((LTV)*)' ROOT std.thunk))) stack!]@test.async6
 
-[await(async([square(3)] continuation('(LTV)*(*)((LTV)*)' ROOT [ROOT<ARG0 decaps! stack! ! encaps! <RETURN>@>]))) stack!]@async_test6
+    [async(continuation('(LTV)*(*)((LTV)*)' ROOT std.thunk))]@std.thread
 
-[continuation('(LTV)*(*)((LTV)*)' ROOT [ROOT<ARG0 decaps! stack! ! encaps! <RETURN>@>])@C
- [square(2)] async(C) @T1
- [square(3)] async(C) @T2
- minus(await(T2) await(T1))
- stack!
-]@async_test7
+    [   std.thread([square(2)]) @T1
+        std.thread([square(3)]) @T2
+        minus(await(T2) await(T1))
+        stack!
+    ]@test.async7
 
-[vm_eval(ROOT [ROOT<ARG0 decaps! stack! ! encaps! <RETURN>@>] [testimport3!]) stack!]@async_test8
+    [vm_eval(ROOT std.thunk [testimport3!]) stack!]@test.async8
 
-[minus(1)]@decrement
-
-[[[repl(get_stdin!)|]! repeat!]@repeat repeat!]/
+    continuation('int(*)(int,int)' ROOT [ROOT <string(ARG0) string(ARG1) minus(ARG0 ARG1) return_tos!])@callback
+>
 
+[[[repl(get_stdin!)|]! repeat!]@repeat repeat!]/ [persistent]/
 repl(get_stdin!)
 
 [goodbye!] return_tos!
+
diff --git a/compile.c b/compile.c
@@ -135,6 +135,8 @@ int jit_edict(EMITTER emit,void *data,int len)
     return status;
 }
 
+int jit_edict2(EMITTER emit, void *data, int len) { return jit_edict(emit, data, len); }
+
 int jit_xml(EMITTER emit, void *data, int len) { printf("jit_xml not implemented\n"); }
 
 /*
@@ -254,76 +256,76 @@ int jit_json(EMITTER emit, void *data, int len)
  }
 */
 
-LTV *compile(COMPILER compiler,void *data,int len)
-{
-    TSTART(0,"compile");
-    char *buf=NULL;
-    size_t flen=0;
-    FILE *stream=open_memstream(&buf,&flen);
+LTV *compile(COMPILER compiler, void *data, int len) {
+    TSTART(0, "compile");
+    char  *buf    = NULL;
+    size_t flen   = 0;
+    FILE  *stream = open_memstream(&buf, &flen);
 
-    int emit(VM_CMD *cmd) {
+    int emit(VM_CMD * cmd) {
         unsigned unsigned_val;
-        fwrite(&cmd->op,1,1,stream);
-        if (cmd->op==VMOP_EXT) {
+        fwrite(&cmd->op, 1, 1, stream);
+        if (cmd->op == VMOP_EXT) {
             switch (cmd->len) {
                 case -1:
-                    cmd->len=strlen(cmd->data); // rewrite len and...
+                    cmd->len = strlen(cmd->data);  // rewrite len and...
                     // ...fall thru!
                 default:
-                    unsigned_val=htonl(cmd->len);
-                    fwrite(&unsigned_val,sizeof(unsigned),1,stream);
-                    unsigned_val=htonl(cmd->flags);
-                    fwrite(&unsigned_val,sizeof(unsigned),1,stream);
-                    fwrite(cmd->data,1,cmd->len,stream);
+                    unsigned_val = htonl(cmd->len);
+                    fwrite(&unsigned_val, sizeof(unsigned), 1, stream);
+                    unsigned_val = htonl(cmd->flags);
+                    fwrite(&unsigned_val, sizeof(unsigned), 1, stream);
+                    fwrite(cmd->data, 1, cmd->len, stream);
                     break;
             }
         }
     }
 
-    if (len==-1)
-        len=strlen((char *) data);
-    compiler(emit,data,len);
+    if (len == -1)
+        len = strlen((char *) data);
+    compiler(emit, data, len);
     fclose(stream);
-    TFINISH(0,"compile");
-    return LTV_init(NEW(LTV),buf,flen,LT_BC|LT_OWN|LT_BIN|LT_LIST);
+    TFINISH(0, "compile");
+    return LTV_init(NEW(LTV), buf, flen, LT_BC | LT_OWN | LT_BIN | LT_LIST);
 }
 
-LTV *compile_ltv(COMPILER compiler,LTV *ltv)
-{
+LTV *compile_ltv(COMPILER compiler, LTV *ltv) {
     // print_ltv(stdout,CODE_RED "compile: ",ltv,CODE_RESET "\n",0);
-    if (ltv->flags&(LT_CVAR|LT_BC))
-        return ltv; // FFI or pre-compiled
-    LTV *bc=compile(compiler,ltv->data,ltv->len);
+    if (ltv->flags & (LT_CVAR | LT_BC))
+        return ltv;  // FFI or pre-compiled
+    LTV *bc = compile(compiler, ltv->data, ltv->len);
     return bc;
 }
 
-char *opcode_name[] = { "RESET","YIELD","EXT","THROW","CATCH","PUSHEXT","EVAL","REF","DEREF","ASSIGN","REMOVE","CTX_PUSH","CTX_POP","FUN_PUSH","FUN_EVAL","FUN_POP",
-                       "S2S","D2S","E2S","F2S","S2D","S2E","S2F" };
-
-void disassemble(FILE *ofile,LTV *ltv)
-{
-    TSTART(0,"disassemble");
-    unsigned char *data,*code=(unsigned char *) ltv->data;
-    int i=0,length=0,flags=0;
-    fprintf(ofile,"BYTECODE: ");
-    while (i<ltv->len) {
-        unsigned char opcode=code[i++];
-        switch(opcode) {
+char *opcode_name[] = {"RESET", "YIELD", "EXT", "THROW", "CATCH", "PUSHEXT", "EVAL", "REF", "DEREF", "ASSIGN", "REMOVE", "CTX_PUSH", "CTX_POP", "FUN_PUSH", "FUN_EVAL", "FUN_POP",
+                       "S2S", "D2S", "E2S", "F2S", "S2D", "S2E", "S2F"};
+
+void disassemble(FILE *ofile, LTV *ltv) {
+    TSTART(0, "disassemble");
+    unsigned char *data, *code = (unsigned char *) ltv->data;
+    int            i = 0, length = 0, flags = 0;
+    fprintf(ofile, "BYTECODE: ");
+    while (i < ltv->len) {
+        unsigned char opcode = code[i++];
+        switch (opcode) {
             case VMOP_EXT:
-                length=ntohl(*(unsigned *) (code+i)); i+=sizeof(unsigned);
-                flags=ntohl(*(unsigned *)  (code+i)); i+=sizeof(unsigned);
-                data=code+i;                          i+=length;
-                //fprintf(ofile, "\n" CODE_BLUE);
+                length = ntohl(*(unsigned *) (code + i));
+                i += sizeof(unsigned);
+                flags = ntohl(*(unsigned *) (code + i));
+                i += sizeof(unsigned);
+                data = code + i;
+                i += length;
+                // fprintf(ofile, "\n" CODE_BLUE);
                 fprintf(ofile, CODE_BLUE);
-                fstrnprint(ofile,data,length);
+                fstrnprint(ofile, data, length);
                 fprintf(ofile, ":%x " CODE_RESET, flags);
                 break;
             case VMOP_RESET:
-                //fprintf(ofile,"\n");
+                // fprintf(ofile,"\n");
             default:
-                fprintf(ofile,"%s ",opcode_name[opcode]);
+                fprintf(ofile, "%s ", opcode_name[opcode]);
         }
     }
-    fprintf(ofile,"\n");
-    TFINISH(0,"disassemble");
+    fprintf(ofile, "\n");
+    TFINISH(0, "disassemble");
 }
diff --git a/compile.h b/compile.h
@@ -82,10 +82,12 @@ extern void disassemble(FILE *ofile,LTV *ltv);
 extern int jit_asm(EMITTER emit,void *data,int len);
 extern int jit_edict(EMITTER emit,void *data,int len);
 extern int jit_xml(EMITTER emit,void *data,int len);
-extern int jit_json(EMITTER emit,void *data,int len);
-extern int jit_yaml(EMITTER emit,void *data,int len);
-extern int jit_swagger(EMITTER emit,void *data,int len);
-extern int jit_lisp(EMITTER emit,void *data,int len);
-extern int jit_massoc(EMITTER emit,void *data,int len); // mathematica association
+extern int jit_edict2(EMITTER emit, void *data, int len);
+
+//extern int jit_json(EMITTER emit,void *data,int len);
+//extern int jit_yaml(EMITTER emit,void *data,int len);
+//extern int jit_swagger(EMITTER emit,void *data,int len);
+//extern int jit_lisp(EMITTER emit,void *data,int len);
+//extern int jit_massoc(EMITTER emit,void *data,int len); // mathematica association
 
 #endif // COMPILE_H
diff --git a/extensions.c b/extensions.c
@@ -168,3 +168,6 @@ extern void bench() {
     }
     return;
 }
+
+test_callback_sig callback_example=NULL;
+extern int test_callback(int a,int b) { return callback_example? callback_example(a,b):0; }
diff --git a/extensions.h b/extensions.h
@@ -37,5 +37,7 @@
 #define EXTENSIONS_H
 
 extern LTV *get_separated_debug_filename(char *filename);
+typedef int (*test_callback_sig)(int a,int b);
+extern test_callback_sig example_callback;
 
 #endif
diff --git a/listree.h b/listree.h
@@ -55,7 +55,7 @@ typedef enum {
     LT_BIN  =0x00000008, // data is binary/unprintable
     LT_REFS =0x00000010, // LTV holds a list of REFs (implies LT_LIST)
     LT_CVAR =0x00000020, // LTV data is a C variable
-    LT_TYPE =0x00000040, // CVAR of type TYPE_INFO (for reflection)
+    LT_TYPE =0x00000040, // CVAR of type TYPE_INFO_LTV (for reflection)
     LT_FFI  =0x00000080, // CVAR of type ffi_type (for reflection)
     LT_CIF  =0x00000100, // CVAR of type ffi_cif (for reflection)
     LT_NULL =0x00000200, // empty
diff --git a/makefile b/makefile
@@ -11,9 +11,9 @@ cmake: build; cd build && cmake ..
 compile: cmake; make -C build
 clean: cmake; make -C build clean
 distclean: ; rm -rf build
-run_lib: compile; MALLOC_CHECK=1 rlwrap -S "[]/ " build/libreflect.so
-run_bin: compile; MALLOC_CHECK=1 rlwrap -S "[]/ " build/jj
-run: run_lib
+runlib: compile; MALLOC_CHECK=1 rlwrap -S "[]/ " build/libreflect.so
+runbin: compile; MALLOC_CHECK=1 rlwrap -S "[]/ " build/jj
+run: runbin
 compilerun: compile run
 install: cmake; sudo make -C build install
 fastbench: cmake; rm callgrind.out.*; echo "fastbench!" | (valgrind --tool=callgrind build/jj)
diff --git a/reflect.c b/reflect.c
diff --git a/vm.c b/vm.c

Original file line number	Diff line number	Diff line change
`@@ -168,3 +168,6 @@ extern void bench() {`
`168`	`168`	`}`
`169`	`169`	`return;`
`170`	`170`	`}`
	`171`	`+`
	`172`	`+test_callback_sig callback_example=NULL;`
	`173`	`+extern int test_callback(int a,int b) { return callback_example? callback_example(a,b):0; }`