From f474c25dc35bfd8346f2ec71382afc6677d208f2 Mon Sep 17 00:00:00 2001 From: Allen Webster Date: Sun, 9 Jul 2017 00:28:33 -0400 Subject: [PATCH] got string build working again --- .DS_Store | Bin 0 -> 12292 bytes build.bat | 2 +- build.sh | 2 +- meta/.DS_Store | Bin 0 -> 6148 bytes meta/{build.cpp => 4ed_build.cpp} | 8 ++-- meta/4ed_file_moving.h | 10 ++--- ...erator.cpp => 4ed_fsm_table_generator.cpp} | 0 meta/{meta_parser.cpp => 4ed_meta_parser.cpp} | 0 meta/4ed_metagen.cpp | 4 +- meta/{out_context.cpp => 4ed_out_context.cpp} | 0 site/.DS_Store | Bin 0 -> 6148 bytes ...document.cpp => 4ed_abstract_document.cpp} | 0 site/{sitegen.cpp => 4ed_sitegen.cpp} | 23 ++++------- string/.DS_Store | Bin 0 -> 6148 bytes string/4coder_string_build_num.txt | 2 +- ...ard_preamble.h => 4ed_standard_preamble.h} | 0 ...ing_builder.cpp => 4ed_string_builder.cpp} | 36 +++++++++--------- string/build.bat | 2 +- string/build.sh | 2 +- 19 files changed, 41 insertions(+), 50 deletions(-) create mode 100644 .DS_Store create mode 100644 meta/.DS_Store rename meta/{build.cpp => 4ed_build.cpp} (98%) rename meta/{fsm_table_generator.cpp => 4ed_fsm_table_generator.cpp} (100%) rename meta/{meta_parser.cpp => 4ed_meta_parser.cpp} (100%) rename meta/{out_context.cpp => 4ed_out_context.cpp} (100%) create mode 100644 site/.DS_Store rename site/{abstract_document.cpp => 4ed_abstract_document.cpp} (100%) rename site/{sitegen.cpp => 4ed_sitegen.cpp} (97%) create mode 100644 string/.DS_Store rename string/{4tech_standard_preamble.h => 4ed_standard_preamble.h} (100%) rename string/{string_builder.cpp => 4ed_string_builder.cpp} (98%) diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..d28716910fb5fee96c293ddc7fb3308e81089ad7 GIT binary patch literal 12292 zcmeHN&2Ah;5U#N|#IYUcj}QV1^3j)A{0T)u2qz?mNI($bkPBMY|4zm`tKDpDbMgi8 z3OoXc7vaWhaOVNw`>JPls(N~2amj(qM6*4a?XRl3x~jUW)*_PKn{Iy~vL+%6xH(>4 z#>dYht4kQo#qW7Hu6ex4aDR^*&zD8ErH{Liscbf8H($)*74bdX@5slpI^I~f=FUSkb=LR6R@Q+@2Gi;kDzu{XhxVt(HbQw;v+XE_+TP@up7H8ZJRonXs4DHZjY6%aq zzC)~apgW@4^`51kX|Zq3_|Y=@&`tpgBYmp;lUA9KT`k(uy4IjI)gBxvQl^pacccNK z?fqr!xt3@I%or4QO1Xk>97Fpp)~3E;Y1JM&0;K|0`;w@owrbHAXX}a4(Hb(^t3}p) zX>mi?9%ECB9@XM3`t2FtCb}>Cpp`?Hq?oiq^#x0>UI%^nq&;q{{aR%0tri)rUTxT- z>QiC@ZbZ^5o3>9owz%4U!r8#6LZ7Q*Omekq(UwZhoe_#X<}{A+*y3vLN5G76E`|N- zs|B`rJgs-`iLu@b=w~yo<>0)IXGrfokUDmV1&5fVB7~cN&CF*!AE|y0!ShGxxrHk& z)KOV+R3<=kmy#0Go*edK3$`IUE!!cl8sr3e3Rc{gWBCL&pXAO{*U`9g291Ukv=B$3 zU5Y!9BPj)Aoujd=K24qRJgLsr25+^GKa71W0vCRn;29dC(ZpK_qu89qTu?7y44%TC znCnCcMlOd~k}u_%b;yXg>G`NlSUx>?=?-QNqIul^=2`uTir4+A?h%n8kc8RF1go=+NI^SlE8%(PUYBR)gmo6#gpg%R)nJ!THM71Pe#3i zm?Q0Q{*JN3l(a{{4do;G&~v3dI_x=cEs!PS1oAU!hi)dh@Z7CzVI5x13`5Vu2#W~i zu#567EcdS5m#*)FVUHj$&&e&7nI}@jP3`YjV}IvyS{*>QNqwrt+1br%w0rZaHE;_IS)I)M z7dw7ezLAICKDpDfW_FtSyu}RQSD_XS*2Da`ExXd+-wiEh#+DZItGYfoM671zvyFGj zoR9Iz$#%0rugcx3O6V+#h+2*!t9mQpmY#AWoQDNu8$-6VWQb&r&btvEMojhurl7}s zW3%)0&3I2@nykMIWYaBs!kFmjoh2hz zOs!7!6iI56XS1Uj%NTbrLN3CXo218B>FBYdvU)T%nfC@pO^3V@A)jI$q28{l-LRuc zIn=j)G5)~5nw6uXR?&zmHO5u3_}HJBuWb4isLxnTY?=Oq|1W-Hsj?eqS3<9*zii?B zO6r1DiCaq?XSkc}RXsxu+D8Tw^qi!neqyDG;cHVi+ z3sqdAo2He)6SM#4X0xN6){4N+tUIWo55pcI?T)z;vjfK9Gb(NMDl2Q<)g?{#j1J-H z^#5GFJ(5Yi$l|Y-(udv<@swe#6;7Kc(w{7iy7$Gpdl&y&`y$j{wqUeZ^S4;LibnLK z2Ra&cr-#;CpFl~g;I6cwsWnQmr&>(*OSH>m<*)lXA?DKSk>|l*BF$?@$Rb5nlw0Ui zFmroJ{SS?w!;Ncg2_Fy8&TskqKb_QlbQd4bK06 E0b}T^egFUf literal 0 HcmV?d00001 diff --git a/build.bat b/build.bat index 9c47c1af..773c5089 100644 --- a/build.bat +++ b/build.bat @@ -9,7 +9,7 @@ SET BUILD_MODE=%1 if "%BUILD_MODE%" == "" (SET BUILD_MODE="/DDEV_BUILD") pushd ..\build -cl %OPTS% kernel32.lib ..\code\meta\build.cpp /Zi /Febuild %BUILD_MODE% +cl %OPTS% kernel32.lib ..\code\meta\4ed_build.cpp /Zi /Febuild %BUILD_MODE% if %ERRORLEVEL% neq 0 (set FirstError=1) if %ERRORLEVEL% neq 0 (goto END) popd diff --git a/build.sh b/build.sh index e4ee756b..10c61be5 100755 --- a/build.sh +++ b/build.sh @@ -39,7 +39,7 @@ fi FLAGS="-D_GNU_SOURCE -fPIC -fpermissive $BUILD_MODE" # Execute -g++ $WARNINGS $FLAGS $CODE_HOME/meta/build.cpp -g -o ../build/build +g++ $WARNINGS $FLAGS $CODE_HOME/meta/4ed_build.cpp -g -o ../build/build ../build/build diff --git a/meta/.DS_Store b/meta/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..05640d8be5bb4c5d69e725a7e3739bad1bbf7782 GIT binary patch literal 6148 zcmeHKOHRWu6dZ?26d^FfhL~c4Wo@<& z{6z<3@4B#9bJtefweS7Q@WTED_j88XZ9W~Q`84Hh{#2rO;`yfwx2OYLA;XC5lq%22 z*=}T-*9x;+G9Mf-qsExItl693kt$D{@5XgS;p~UPg4~2z512>Jj1nqj)X6aC*pj;Q zEqQ%ZRF6v4G1;P+a7`H`OVL|2WcF6kIBw9GQE5)LWYp+TG^nT?)>QnO8rkNg!e&=P z9Z(016$5RMHP2P{1D z3B!0Q(Nj&hVi-^7xDE5-fQ3g-hY6Pt6W(mX4aK;(Q{TGjFtJCi)d6*2(}5k|?a29m zv;F?RNz$G=pbq>i2TZGf*Y9yj;cTrfPR?4(a?c_m^9qk8g$;KUbFLi4rz|cwZlytt U0~Q`R!q7hg&IYa2fnRmt3q|>Z9RL6T literal 0 HcmV?d00001 diff --git a/meta/build.cpp b/meta/4ed_build.cpp similarity index 98% rename from meta/build.cpp rename to meta/4ed_build.cpp index 327426e8..ec17efd9 100644 --- a/meta/build.cpp +++ b/meta/4ed_build.cpp @@ -419,7 +419,7 @@ build(u32 flags, u32 arch, char *code_path, char *code_file, char *out_path, cha static void site_build(char *cdir, u32 flags){ { - char *file = fm_str("site/sitegen.cpp"); + char *file = fm_str("site/4ed_sitegen.cpp"); char *dir = fm_str(BUILD_DIR); BEGIN_TIME_SECTION(); build(OPTS | flags, Arch_X64, cdir, file, dir, "sitegen", get_defines_from_flags(flags), 0, includes); @@ -460,7 +460,7 @@ build_and_run(char *cdir, char *filename, char *name, u32 flags){ static void fsm_generator(char *cdir){ - build_and_run(cdir, "meta/fsm_table_generator.cpp", "fsmgen", OPTS | DEBUG_INFO); + build_and_run(cdir, "meta/4ed_fsm_table_generator.cpp", "fsmgen", OPTS | DEBUG_INFO); } static void @@ -568,7 +568,7 @@ package(char *cdir){ char *tier = tiers[tier_index]; u32 flags = base_flags | tier_flags[tier_index]; - Temp_Memory temp = fm_begin_temp(); + String_Temp temp = fm_begin_temp(); char *tier_package_root = fm_str(base_package_root, "_", tier); for (u32 arch = 0; arch < Arch_COUNT; ++arch){ char *par_dir = fm_str(tier_package_root, "_", arch_names[arch]); @@ -622,7 +622,7 @@ package(char *cdir){ // NOTE(allen): power { - Temp_Memory temp = fm_begin_temp(); + String_Temp temp = fm_begin_temp(); char *pack_power_par_dir = fm_str("../current_dist_power"); char *pack_power_dir = fm_str(pack_power_par_dir, "/power"); diff --git a/meta/4ed_file_moving.h b/meta/4ed_file_moving.h index 8ed07b3c..a9105a55 100644 --- a/meta/4ed_file_moving.h +++ b/meta/4ed_file_moving.h @@ -76,9 +76,9 @@ internal char **fm_prepare_list_internal(char **l1, ...); internal char **fm_list_one_item(char *item); // File System Navigation -typedef umem Temp_Memory; -internal Temp_Memory fm_begin_temp(); -internal void fm_end_temp(Temp_Memory temp); +typedef umem String_Temp; +internal String_Temp fm_begin_temp(); +internal void fm_end_temp(String_Temp temp); internal i32 fm_get_current_directory(char *buffer, i32 max); @@ -186,13 +186,13 @@ fm__init_memory(){ fm_arena_memory = (char*)malloc(fm_arena_max); } -internal Temp_Memory +internal String_Temp fm_begin_temp(){ return(fm_arena_pos); } internal void -fm_end_temp(Temp_Memory temp){ +fm_end_temp(String_Temp temp){ fm_arena_pos = temp; } diff --git a/meta/fsm_table_generator.cpp b/meta/4ed_fsm_table_generator.cpp similarity index 100% rename from meta/fsm_table_generator.cpp rename to meta/4ed_fsm_table_generator.cpp diff --git a/meta/meta_parser.cpp b/meta/4ed_meta_parser.cpp similarity index 100% rename from meta/meta_parser.cpp rename to meta/4ed_meta_parser.cpp diff --git a/meta/4ed_metagen.cpp b/meta/4ed_metagen.cpp index b7ddc884..6dcf33fa 100644 --- a/meta/4ed_metagen.cpp +++ b/meta/4ed_metagen.cpp @@ -28,8 +28,8 @@ #include #include -#include "meta_parser.cpp" -#include "out_context.cpp" +#include "4ed_meta_parser.cpp" +#include "4ed_out_context.cpp" ////////////////////////////////////////////////////////////////////////////////////////////////// char *keys_that_need_codes[] = { diff --git a/meta/out_context.cpp b/meta/4ed_out_context.cpp similarity index 100% rename from meta/out_context.cpp rename to meta/4ed_out_context.cpp diff --git a/site/.DS_Store b/site/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..d8dfa09634312963748e466b9ca59431dcf36710 GIT binary patch literal 6148 zcmeHKJx{|h5Pb(7DlxPhuz6%cLSkcysxmP1145Ek6;f!bhV1z}{7QItHbtRfMF`zV z_H)kn&i0ey4*;_0RyV*Lz?4N%v@v4p9_>0w!KXyA90f|Wc*P#YNTR>!(z##a7Hh1K zbJkz;uegq!-Ubyqyf9)*&o#ex*ge!uRn|>Own}%$a`kS;7BD+xZ1GIi8XMz}v)_)` zEl2IBVntTYu?x$wXRZSEaBMmM#@6xOTme_W6>tSyfu9xNnXNWGi|Dm0;0m|`2L*J0 z2rPcount != 0); - // NOTE(allen): Compute and store variations of the custom function names - *custom_func_names = allocate_app_api(part, custom_funcs_unit->set.count); + Alternate_Names_Array *custom_func_names = push_struct(part, Alternate_Names_Array); + i32 name_count = custom_funcs_unit->set.count; + custom_func_names->names = push_array(part, Alternate_Name, name_count); + memset(custom_func_names->names, 0, sizeof(*custom_func_names->names)*name_count); for (i32 i = 0; i < custom_funcs_unit->set.count; ++i){ String name_string = custom_funcs_unit->set.items[i].name; diff --git a/string/.DS_Store b/string/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..a499b661ffc51b6e75305b4e877bb82761efae1c GIT binary patch literal 6148 zcmeHKJxc>Y5PcJaB-o@fqRo|70m07Z2(hsC2gH1#fy)Q^0LyFqG5$V(fWDbsLT+O^ z5tJF2eY>+ebF*)cn_B?V-Hva77Jvp-vDResjp)4Ufz+bqlqeQsf))B$V?%WL3k>Ml zUEvlZEHK9Y`Asp$Gf#7fEv6_q+oxrV89F@QS8N`N#b{V8hK!)E&mHyp(}X>s&8QRe z()VFN-!a>jS(d~JM>9q**z4dWiT0jEJFi4rF{3m)&Ar2YEU~P{stuA@&AmN!*dL^O zk#^$IsCcZ?Y~?Lke`)z`jL$ja7v%0Z$KPfxA4yCOU7P`Dz!~@<23WII8fO8$bq1UP zXJE&GejhTbVji&!XrB%?b_F2TX*OYBe+Jbjizv|>8XTTZwR}4tK_t@)l zOR=^dY))%!Mt!2H=(;lC&V?N-#ayeU_=0Led!`*?9 #include @@ -37,7 +37,8 @@ Created 21.01.2017 (dd.mm.yyyy) #define V_MAJ STR_(V_MAJ_NUM) #define V_MIN STR_(V_MIN_NUM) -#include "../meta/meta_parser.cpp" +#include "../meta/4ed_meta_parser.cpp" +#include "../meta/4ed_out_context.cpp" static b32 parse_build_number(char *file_name, i32 *major_out, i32 *minor_out, i32 *build_out){ @@ -96,8 +97,6 @@ save_build_number(char *file_name, i32 major, i32 minor, i32 build){ /////////////////////////////// -#include "../meta/out_context.cpp" - // // Meta Parse Rules // @@ -158,12 +157,14 @@ print_function_body_code(String *out, Parse_Context *context, int32_t start){ internal void file_move(char *path, char *file_name){ - copy_file(0, file_name, path, 0, file_name); + fm_copy_file(fm_str(file_name), fm_str(path, "/", file_name)); } int main(){ META_BEGIN(); + fm_init_system(); + i32 size = (512 << 20); void *mem = malloc(size); memset(mem, 0, size); @@ -467,11 +468,11 @@ int main(){ // NOTE(allen): Publish the new file. (Would like to be able to automatically test the result before publishing). { - make_folder_if_missing(BACKUP_FOLDER SLASH V_MAJ SLASH V_MIN, 0); + fm_make_folder_if_missing(BACKUP_FOLDER SLASH V_MAJ SLASH V_MIN); file_move(BACKUP_FOLDER SLASH V_MAJ SLASH V_MIN, INTERNAL_STRING); file_move(BACKUP_FOLDER SLASH V_MAJ SLASH V_MIN, GENERATED_FILE); //file_move(PUBLISH_FOLDER, GENERATED_FILE); - delete_file(GENERATED_FILE); + fm_delete_file(GENERATED_FILE); printf("published "GENERATED_FILE": v%d.%d.%d\n", major_number, minor_number, build_number); save_build_number(BUILD_NUMBER_FILE, major_number, minor_number, build_number + 1); } @@ -479,8 +480,5 @@ int main(){ META_FINISH(); } -#define FTECH_FILE_MOVING_IMPLEMENTATION -#include "../meta/4ed_file_moving.h" - // BOTTOM diff --git a/string/build.bat b/string/build.bat index 4da879ec..d4299d9d 100644 --- a/string/build.bat +++ b/string/build.bat @@ -6,7 +6,7 @@ SET OPTS=%OPTS% -wd4611 -GR- -EHa- -nologo -FC SET FirstError=0 pushd ..\build -cl %OPTS% ..\code\string\string_builder.cpp /Zi /Festring_builder +cl %OPTS% ..\code\string\4ed_string_builder.cpp /Zi /Festring_builder if %ERRORLEVEL% neq 0 (set FirstError=1) if %ERRORLEVEL% neq 0 (goto END) popd diff --git a/string/build.sh b/string/build.sh index b56cb914..2832e70c 100755 --- a/string/build.sh +++ b/string/build.sh @@ -3,7 +3,7 @@ WARNINGS="-Wno-write-strings -Wno-comment -Wno-logical-op-parentheses -Wno-null-dereference -Wno-switch" FLAGS="-D_GNU_SOURCE -fPIC -fpermissive" -g++ $WARNINGS $FLAGS ../code/string/string_builder.cpp -g -o ../build/string_builder +g++ $WARNINGS $FLAGS ../code/string/4ed_string_builder.cpp -g -o ../build/string_builder pushd string ../../build/string_builder